Просмотр исходного кода

window manager reimplementation

milan jurkulák 2 лет назад
Родитель
Сommit
2bdcf7433e

+ 0 - 1
src/main/kotlin/eu/mjdev/desktop/windows/ChromeWindowState.kt

@@ -113,7 +113,6 @@ class ChromeWindowState(
             }
             }
         }
         }
 
 
-        @Suppress("UNUSED_PARAMETER")
         @Composable
         @Composable
         fun updateAnimState(
         fun updateAnimState(
             visible: Boolean,
             visible: Boolean,

+ 2 - 13
src/main/kotlin/eu/mjdev/desktop/windows/WindowEx.kt

@@ -1,20 +1,11 @@
 package eu.mjdev.desktop.windows
 package eu.mjdev.desktop.windows
 
 
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.desktop.ui.tooling.preview.Preview
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.awt.ComposeWindow
 import androidx.compose.ui.awt.ComposeWindow
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.input.key.KeyEvent
 import androidx.compose.ui.input.key.KeyEvent
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.FrameWindowScope
 import androidx.compose.ui.window.FrameWindowScope
-import eu.mjdev.desktop.extensions.Modifier.rectShadow
 import eu.mjdev.desktop.windows.ChromeWindowState.Companion.rememberChromeWindowState
 import eu.mjdev.desktop.windows.ChromeWindowState.Companion.rememberChromeWindowState
 
 
 @Suppress("FunctionName")
 @Suppress("FunctionName")
@@ -56,10 +47,8 @@ fun WindowEx(
     onPreviewKeyEvent = onPreviewKeyEvent,
     onPreviewKeyEvent = onPreviewKeyEvent,
     onKeyEvent = onKeyEvent,
     onKeyEvent = onKeyEvent,
     content = {
     content = {
+        stateHelper.register(window)
+        focusHelper.register(window)
         content()
         content()
-        with(window) {
-            stateHelper.register(this)
-            focusHelper.register(this)
-        }
     }
     }
 )
 )