Переглянути джерело

style: ktlint format desktop state wiring

Milan Jurkulak 3 місяців тому
батько
коміт
56aca06c8a

+ 7 - 6
shared/src/commonMain/kotlin/org/mjdev/desktop/state/DesktopPolicy.kt

@@ -20,12 +20,13 @@ object DesktopPolicy {
         val controlCenter = input.controlCenterOpen
         // rule 3: the control center takes over — the menu steps aside while it is open
         val menu = input.menuOpen && !controlCenter
-        val bar = when {
-            controlCenter -> false // rule 3: control center hides the bar
-            menu -> true // rule 2: an open menu keeps the bar up
-            !input.barOverlapped -> true // rules 1 & 4: nothing covers it -> visible
-            else -> input.pointerInBarRevealZone // rule 1: covered -> reveal only on hover
-        }
+        val bar =
+            when {
+                controlCenter -> false // rule 3: control center hides the bar
+                menu -> true // rule 2: an open menu keeps the bar up
+                !input.barOverlapped -> true // rules 1 & 4: nothing covers it -> visible
+                else -> input.pointerInBarRevealZone // rule 1: covered -> reveal only on hover
+            }
         return DesktopDecision(
             bar = bar,
             menu = menu,

+ 15 - 11
shared/src/desktopMain/kotlin/org/mjdev/desktop/components/main/MainWindow.kt

@@ -26,16 +26,16 @@ import org.mjdev.desktop.components.sliding.base.VisibilityState.Companion.remem
 import org.mjdev.desktop.components.tooltip.TooltipState
 import org.mjdev.desktop.components.tooltip.TooltipWindow
 import org.mjdev.desktop.components.tooltip.rememberTooltipState
-import org.mjdev.desktop.state.DesktopState
-import org.mjdev.desktop.state.DesktopStateDriver
-import org.mjdev.desktop.data.PanelLocation
-import org.mjdev.desktop.state.SurfaceKind
 import org.mjdev.desktop.context.DesktopContextScope.Companion.withDesktopContext
+import org.mjdev.desktop.data.PanelLocation
 import org.mjdev.desktop.extensions.Compose.isDesign
 import org.mjdev.desktop.extensions.Compose.preview
 import org.mjdev.desktop.extensions.MutableStateExt.rememberCalculated
 import org.mjdev.desktop.helpers.system.shell.Shell
 import org.mjdev.desktop.log.Log
+import org.mjdev.desktop.state.DesktopState
+import org.mjdev.desktop.state.DesktopStateDriver
+import org.mjdev.desktop.state.SurfaceKind
 import org.mjdev.desktop.windows.ChromeWindowState.Companion.rememberChromeWindowState
 import org.mjdev.desktop.windows.DesktopWindow
 
@@ -84,13 +84,17 @@ fun MainWindow() = withDesktopContext {
         val cw = containerSize.width.value.toDouble()
         val ch = containerSize.height.value.toDouble()
         val edge = controlCenterDividerWidth.value.toDouble()
-        fun rectOf(state: org.mjdev.desktop.windows.ChromeWindowState) =
-            DesktopState.ScreenRect(
-                left = state.position.x.value.toDouble(),
-                top = state.position.y.value.toDouble(),
-                right = (state.position.x + state.size.width).value.toDouble(),
-                bottom = (state.position.y + state.size.height).value.toDouble(),
-            )
+
+        fun rectOf(state: org.mjdev.desktop.windows.ChromeWindowState) = DesktopState.ScreenRect(
+            left =
+                state.position.x.value
+                    .toDouble(),
+            top =
+                state.position.y.value
+                    .toDouble(),
+            right = (state.position.x + state.size.width).value.toDouble(),
+            bottom = (state.position.y + state.size.height).value.toDouble(),
+        )
         desktopState.register(
             kind = SurfaceKind.Bar,
             window = panelState,