Repository navigation
Commit c732109
Avoid disposing current unique window (#1472)
Add a check to ensure windows[unique] != window before calling toFront() and disposing, preventing the code from disposing the active window. Also tidy imports: replace layout wildcard with explicit Box/fillMaxSize/fillMaxWidth/fillMaxHeight imports, consolidate androidx.compose.runtime imports, and remove unused imports.
Fixes #1471
Co-authored-by: Moon <catilac@users.noreply.github.com>1 parent 68c1e0c commit c732109
1 file changed
Lines changed: 6 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,13 +1,12 @@ | |||
| 1 | 1 | package processing.app.ui.theme | |
| 2 | 2 | ||
| 3 | 3 | import androidx.compose.foundation.background | |
| 4 | - import androidx.compose.foundation.layout.* | ||
| 4 | + import androidx.compose.foundation.layout.Box | ||
| 5 | + import androidx.compose.foundation.layout.fillMaxHeight | ||
| 6 | + import androidx.compose.foundation.layout.fillMaxSize | ||
| 7 | + import androidx.compose.foundation.layout.fillMaxWidth | ||
| 5 | 8 | import androidx.compose.material3.Text | |
| 6 | - import androidx.compose.runtime.Composable | ||
| 7 | - import androidx.compose.runtime.CompositionLocalProvider | ||
| 8 | - import androidx.compose.runtime.DisposableEffect | ||
| 9 | - import androidx.compose.runtime.compositionLocalOf | ||
| 10 | - import androidx.compose.runtime.remember | ||
| 9 | + import androidx.compose.runtime.* | ||
| 11 | 10 | import androidx.compose.ui.Alignment | |
| 12 | 11 | import androidx.compose.ui.Modifier | |
| 13 | 12 | import androidx.compose.ui.awt.ComposeWindow | |
@@ -21,9 +20,7 @@ import androidx.compose.ui.window.rememberWindowState | |||
| 21 | 20 | import com.formdev.flatlaf.util.SystemInfo | |
| 22 | 21 | import processing.app.ui.Toolkit | |
| 23 | 22 | import java.awt.Dimension | |
| 24 | - | ||
| 25 | 23 | import javax.swing.JFrame | |
| 26 | - import javax.swing.JRootPane | ||
| 27 | 24 | import kotlin.reflect.KClass | |
| 28 | 25 | ||
| 29 | 26 | val LocalWindow = compositionLocalOf<JFrame> { error("No Window Set") } | |
@@ -120,7 +117,7 @@ private fun PDEWindowContent( | |||
| 120 | 117 | window.rootPane.putClientProperty("apple.awt.transparentTitleBar", mac && fullWindowContent) | |
| 121 | 118 | Toolkit.setIcon(window) | |
| 122 | 119 | } | |
| 123 | - if(unique != null && windows.contains(unique) && windows[unique] != null){ | ||
| 120 | + if (unique != null && windows.contains(unique) && windows[unique] != null && windows[unique] != window) { | ||
| 124 | 121 | windows[unique]?.toFront() | |
| 125 | 122 | window.dispose() | |
| 126 | 123 | return | |
0 commit comments