Skip to content

Commit 3bdd00e

Browse files
committed
Set application window icon using Toolkit.setIcon
Added calls to Toolkit.setIcon(window) in Start.kt and Window.kt to ensure the application window icon is set consistent
1 parent 07e05be commit 3bdd00e

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

app/src/processing/app/ui/Start.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ class Start {
4646
var visible by remember { mutableStateOf(false) }
4747
val composition = rememberCoroutineScope()
4848
LaunchedEffect(Unit) {
49+
Toolkit.setIcon(window)
50+
4951
visible = true
5052
composition.launch {
5153
delay(duration.toLong() + timeMargin)

app/src/processing/app/ui/theme/Window.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ import androidx.compose.ui.window.WindowPosition
1919
import androidx.compose.ui.window.application
2020
import androidx.compose.ui.window.rememberWindowState
2121
import com.formdev.flatlaf.util.SystemInfo
22+
import processing.app.ui.Toolkit
2223
import java.awt.Dimension
2324

2425
import javax.swing.JFrame
26+
import javax.swing.JRootPane
2527
import kotlin.reflect.KClass
2628

2729
val LocalWindow = compositionLocalOf<JFrame> { error("No Window Set") }
@@ -116,6 +118,7 @@ private fun PDEWindowContent(
116118
remember {
117119
window.rootPane.putClientProperty("apple.awt.fullWindowContent", mac && fullWindowContent)
118120
window.rootPane.putClientProperty("apple.awt.transparentTitleBar", mac && fullWindowContent)
121+
Toolkit.setIcon(window)
119122
}
120123
if(unique != null && windows.contains(unique) && windows[unique] != null){
121124
windows[unique]?.toFront()

0 commit comments

Comments
 (0)