fix(desktop, windows): drag and drop breaks when changing theme

Author: Irineu333

application/src/androidMain/kotlin/com/neoutils/neoregex/Main.android.kt

@@ -42,13 +42,13 @@ class MainActivity : ComponentActivity() {
     private fun setupSystemBars() {
 
         val style = when (colorTheme) {
-            ColorTheme.DARK -> {
+            ColorTheme.DARK, ColorTheme.DARK_SYSTEM -> {
                 SystemBarStyle.dark(
                     Color.BLACK,
                 )
             }
 
-            ColorTheme.LIGHT -> {
+            ColorTheme.LIGHT, ColorTheme.LIGHT_SYSTEM -> {
                 SystemBarStyle.light(
                     Color.WHITE,
                     Color.BLACK,

core/common/src/androidMain/kotlin/com/neoutils/neoregex/core/common/util/ColorTheme.android.kt

@@ -28,19 +28,19 @@ import androidx.compose.runtime.Composable
 actual fun rememberColorTheme(): ColorTheme {
 
     return if (isSystemInDarkTheme()) {
-        ColorTheme.DARK
+        ColorTheme.DARK_SYSTEM
     } else {
-        ColorTheme.LIGHT
+        ColorTheme.LIGHT_SYSTEM
     }
 }
 
 val Context.colorTheme
     get() = when (resources.configuration.uiMode and UI_MODE_NIGHT_MASK) {
         UI_MODE_NIGHT_YES -> {
-            ColorTheme.DARK
+            ColorTheme.DARK_SYSTEM
         }
 
         else -> {
-            ColorTheme.LIGHT
+            ColorTheme.LIGHT_SYSTEM
         }
     }

core/common/src/commonMain/kotlin/com/neoutils/neoregex/core/common/util/ColorTheme.kt

@@ -22,13 +22,15 @@ import androidx.compose.runtime.Composable
 
 enum class ColorTheme {
     LIGHT,
-    DARK;
+    DARK,
+    LIGHT_SYSTEM,
+    DARK_SYSTEM;
 
     val isLight: Boolean
-        get() = this == LIGHT
+        get() = this == LIGHT || this == LIGHT_SYSTEM
 
     val isDark: Boolean
-        get() = this == DARK
+        get() = this == DARK || this == DARK_SYSTEM
 }
 
 @Composable

core/common/src/desktopMain/kotlin/com/neoutils/neoregex/core/common/util/ColorTheme.desktop.kt

@@ -37,9 +37,9 @@ actual fun rememberColorTheme(): ColorTheme {
             }
 
             else -> when (currentSystemTheme) {
-                SystemTheme.LIGHT -> ColorTheme.LIGHT
-                SystemTheme.DARK -> ColorTheme.DARK
-                SystemTheme.UNKNOWN -> ColorTheme.LIGHT
+                SystemTheme.LIGHT -> ColorTheme.LIGHT_SYSTEM
+                SystemTheme.DARK -> ColorTheme.DARK_SYSTEM
+                SystemTheme.UNKNOWN -> ColorTheme.LIGHT_SYSTEM
             }
         }
     }

core/common/src/desktopMain/kotlin/com/neoutils/neoregex/core/common/util/XDGDesktopPortal.kt

@@ -45,9 +45,9 @@ class XDGDesktopPortal(
         )
 
         return when (theme.value.value) {
-            Theme.LIGHT.value -> ColorTheme.LIGHT
-            Theme.DARK.value -> ColorTheme.DARK
-            else -> ColorTheme.LIGHT
+            Theme.LIGHT.value -> ColorTheme.LIGHT_SYSTEM
+            Theme.DARK.value -> ColorTheme.DARK_SYSTEM
+            else -> ColorTheme.LIGHT_SYSTEM
         }
     }
 

core/common/src/webMain/kotlin/com/neoutils/neoregex/core/common/util/ColorTheme.web.kt

@@ -26,8 +26,8 @@ import org.jetbrains.skiko.currentSystemTheme
 actual fun rememberColorTheme(): ColorTheme {
 
     return when (currentSystemTheme) {
-        SystemTheme.LIGHT -> ColorTheme.LIGHT
-        SystemTheme.DARK -> ColorTheme.DARK
-        SystemTheme.UNKNOWN -> ColorTheme.DARK
+        SystemTheme.LIGHT -> ColorTheme.LIGHT_SYSTEM
+        SystemTheme.DARK -> ColorTheme.DARK_SYSTEM
+        SystemTheme.UNKNOWN -> ColorTheme.DARK_SYSTEM
     }
 }

core/design-system/src/commonMain/kotlin/com/neoutils/neoregex/core/designsystem/theme/Theme.kt

@@ -73,8 +73,8 @@ fun NeoTheme(
 ) {
     NeoBaseTheme(
         colorScheme = when (colorTheme) {
-            ColorTheme.LIGHT -> LightColors
-            ColorTheme.DARK -> DarkColors
+            ColorTheme.LIGHT, ColorTheme.LIGHT_SYSTEM -> LightColors
+            ColorTheme.DARK, ColorTheme.DARK_SYSTEM -> DarkColors
         },
         fontSizes = FontSizes(),
         dimensions = Dimensions(),

core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/component/DefaultHeader.kt

@@ -94,7 +94,7 @@ fun FrameWindowScope.NeoHeader(
             customTitleBar?.height = it.height.toFloat()
         }.run {
             customTitleBar?.let {
-                pointerInput(Unit) {
+                pointerInput(colorTheme) {
 
                     var inUserControl = false