From 25214f8b855b856780a5bac34162427b6be81767 Mon Sep 17 00:00:00 2001 From: Naotiki Date: Wed, 24 May 2023 21:56:31 +0900 Subject: [PATCH] Add: Icons --- client-app/src/main/kotlin/ControlWindow.kt | 6 ++++-- client-app/src/main/kotlin/main.kt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/client-app/src/main/kotlin/ControlWindow.kt b/client-app/src/main/kotlin/ControlWindow.kt index c509f43..709a56f 100644 --- a/client-app/src/main/kotlin/ControlWindow.kt +++ b/client-app/src/main/kotlin/ControlWindow.kt @@ -26,6 +26,8 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import kotlinx.datetime.* import org.jetbrains.compose.animatedimage.Blank +import org.jetbrains.compose.resources.ExperimentalResourceApi +import org.jetbrains.compose.resources.painterResource import org.jetbrains.exposed.sql.and import org.jetbrains.kotlinx.kandy.dsl.invoke import org.jetbrains.kotlinx.kandy.dsl.plot @@ -40,11 +42,11 @@ import kotlin.time.DurationUnit val startTime = Clock.System.now() const val areaScale = 300 -@OptIn(ExperimentalFoundationApi::class) +@OptIn(ExperimentalFoundationApi::class, ExperimentalResourceApi::class) @Composable fun ControlWindow(visible: Boolean = true, serverState: ServerState, onCloseRequest: () -> Unit, selectedTab: Int) { val statisticsState = rememberStatisticsState(serverState) - Window(onCloseRequest = onCloseRequest, visible = visible) { + Window(onCloseRequest = onCloseRequest, visible = visible, icon = painterResource("SUCIcon.png")) { Surface { val screenSize = rememberScreenSize() diff --git a/client-app/src/main/kotlin/main.kt b/client-app/src/main/kotlin/main.kt index 1bf9c63..7a194e6 100644 --- a/client-app/src/main/kotlin/main.kt +++ b/client-app/src/main/kotlin/main.kt @@ -252,7 +252,7 @@ fun main() = application { var exitCount by remember { mutableStateOf(0) } //Windowを表示 Window( - onCloseRequest ={exitCount=10}, + onCloseRequest = {exitCount=10}, state = windowState, focusable = false, resizable = false,