فهرست منبع

sliding panel handles 12dp

Milan Jurkulak 3 ماه پیش
والد
کامیت
e672622a88

+ 22 - 22
shared/src/commonMain/kotlin/org/mjdev/desktop/data/DesktopConfigData.kt

@@ -24,14 +24,14 @@ data class DesktopConfigData(
     var backgroundRotationDelay: Long = 60_000L,
     // panel
     var panelLocation: String = PanelLocation.Bottom.name,
-    var panelDividerWidth: Float = 16f,
+    var panelDividerWidth: Float = 12f,
     var panelContentPadding: Float = 4f,
     var panelHideDelay: Long = 2_000L,
     // control center
     var controlCenterLocation: String = ControlCenterLocation.Right.name,
     var controlPanelHideDelay: Long = 2_000L,
     var controlCenterExpandedWidthPercent: Int = 25,
-    var controlCenterDividerWidth: Float = 4f,
+    var controlCenterDividerWidth: Float = 12f,
     var controlCenterIconSize: Float = 32f,
     var controlCenterBackgroundAlpha: Float = 0.6f,
     // app menu
@@ -63,32 +63,32 @@ data class DesktopConfigData(
     /** Builds the enabled background providers for this config. */
     fun buildProviders(user: IUser): List<ImagesProvider> = providers.mapNotNull { it.build(user) }
 
-    private inline fun <reified T : Enum<T>> String.toEnum(default: T): T = enumValues<T>().firstOrNull { it.name == this } ?: default
+    private inline fun <reified T : Enum<T>> String.toEnum(default: T): T =
+        enumValues<T>().firstOrNull { it.name == this } ?: default
 
     companion object {
         /** Snapshots the current live [theme] into a persistable config, keeping [providers]. */
         fun fromTheme(
             theme: ITheme,
             providers: MutableList<ProviderConfig> = ProviderConfig.defaults(),
-        ): DesktopConfigData =
-            DesktopConfigData(
-                backgroundColorArgb = theme.backgroundColor.toArgbInt(),
-                backgroundRotationDelay = theme.backgroundRotationDelay,
-                panelLocation = theme.panelLocation.name,
-                panelDividerWidth = theme.panelDividerWidth.value,
-                panelContentPadding = theme.panelContentPadding.value,
-                panelHideDelay = theme.panelHideDelay,
-                controlCenterLocation = theme.controlCenterLocation.name,
-                controlPanelHideDelay = theme.controlPanelHideDelay,
-                controlCenterExpandedWidthPercent = theme.controlCenterExpandedWidthPercent,
-                controlCenterDividerWidth = theme.controlCenterDividerWidth.value,
-                controlCenterIconSize = theme.controlCenterIconSize.width.value,
-                controlCenterBackgroundAlpha = theme.controlCenterBackgroundAlpha,
-                appMenuMinWidthRatio = theme.appMenuMinWidthRatio,
-                appMenuMinHeightRatio = theme.appMenuMinHeightRatio,
-                appMenuOuterPadding = theme.appMenuOuterPadding.value,
-                providers = providers,
-            )
+        ): DesktopConfigData = DesktopConfigData(
+            backgroundColorArgb = theme.backgroundColor.toArgbInt(),
+            backgroundRotationDelay = theme.backgroundRotationDelay,
+            panelLocation = theme.panelLocation.name,
+            panelDividerWidth = theme.panelDividerWidth.value,
+            panelContentPadding = theme.panelContentPadding.value,
+            panelHideDelay = theme.panelHideDelay,
+            controlCenterLocation = theme.controlCenterLocation.name,
+            controlPanelHideDelay = theme.controlPanelHideDelay,
+            controlCenterExpandedWidthPercent = theme.controlCenterExpandedWidthPercent,
+            controlCenterDividerWidth = theme.controlCenterDividerWidth.value,
+            controlCenterIconSize = theme.controlCenterIconSize.width.value,
+            controlCenterBackgroundAlpha = theme.controlCenterBackgroundAlpha,
+            appMenuMinWidthRatio = theme.appMenuMinWidthRatio,
+            appMenuMinHeightRatio = theme.appMenuMinHeightRatio,
+            appMenuOuterPadding = theme.appMenuOuterPadding.value,
+            providers = providers,
+        )
 
         private fun Color.toArgbInt(): Int {
             val a = (alpha * 255f).roundToInt() and 0xFF

+ 2 - 2
shared/src/commonMain/kotlin/org/mjdev/desktop/interfaces/ITheme.kt

@@ -39,14 +39,14 @@ interface ITheme : IDisposable {
                 override var backgroundColor: Color = Color.SuperDarkGray
                 override var backgroundRotationDelay: Long = 60000
                 override var panelLocation: PanelLocation = PanelLocation.Bottom
-                override var panelDividerWidth: Dp = 2.dp
+                override var panelDividerWidth: Dp = 12.dp
                 override var panelContentPadding: Dp = 8.dp
                 override var panelHideDelay: Long = 0
                 override var controlCenterLocation: ControlCenterLocation = ControlCenterLocation.Right
                 override var controlPanelHideDelay: Long = 10000
                 override var controlCenterExpandedWidthPercent: Int = 35
                 override var controlCenterDividerColor: Color = Color.SuperDarkGray
-                override var controlCenterDividerWidth: Dp = 2.dp
+                override var controlCenterDividerWidth: Dp = 12.dp
                 override var controlCenterIconColor: Color = Color.White
                 override var controlCenterIconSize: DpSize = DpSize(32.dp, 32.dp)
                 override var controlCenterBackgroundAlpha: Float = 0.4f

+ 5 - 6
shared/src/desktopMain/kotlin/org/mjdev/desktop/data/Theme.kt

@@ -106,14 +106,14 @@ class Theme(
                 backgroundColor = Color.SuperDarkGray,
                 backgroundRotationDelay = 60000,
                 panelLocation = PanelLocation.Bottom,
-                panelDividerWidth = 16.dp,
+                panelDividerWidth = 12.dp,
                 panelContentPadding = 4.dp,
                 panelHideDelay = 2000L,
                 controlCenterLocation = ControlCenterLocation.Right,
                 controlPanelHideDelay = 2000L,
                 controlCenterExpandedWidthPercent = 25,
                 controlCenterDividerColor = Color.SuperDarkGray,
-                controlCenterDividerWidth = 4.dp,
+                controlCenterDividerWidth = 12.dp,
                 controlCenterIconColor = Color.White,
                 controlCenterIconSize = DpSize(32.dp, 32.dp),
                 controlCenterBackgroundAlpha = 0.6f,
@@ -123,9 +123,8 @@ class Theme(
             )
 
         // todo load from user settings
-        fun load(user: IUser): Theme =
-            themeCache[user.userName] ?: DEFAULT.apply {
-                themeCache[user.userName] = this
-            }
+        fun load(user: IUser): Theme = themeCache[user.userName] ?: DEFAULT.apply {
+            themeCache[user.userName] = this
+        }
     }
 }