rename winOs* to windowsAndLinux* in IntUiScrollbarStyling

reference: #457 (comment)
JetBrains · Aug 6, 2024 · a37a196 · a37a196
1 parent e4afa7d
commit a37a196
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/...one/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiScrollbarStyling.kt b/...one/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiScrollbarStyling.kt
@@ -18,14 +18,14 @@ public fun ScrollbarStyle.Companion.dark(): ScrollbarStyle =
     if (hostOs.isMacOS) {
         ScrollbarStyle.macOsDark()
     } else {
-        ScrollbarStyle.winOsDark()
+        ScrollbarStyle.windowsAndLinuxDark()
     }
 
 public fun ScrollbarStyle.Companion.light(): ScrollbarStyle =
     if (hostOs.isMacOS) {
         ScrollbarStyle.macOsLight()
     } else {
-        ScrollbarStyle.winOsLight()
+        ScrollbarStyle.windowsAndLinuxLight()
     }
 
 public fun ScrollbarStyle.Companion.macOsLight(
@@ -54,8 +54,8 @@ public fun ScrollbarStyle.Companion.macOsDark(
         scrollbarVisibility = scrollbarVisibility,
     )
 
-public fun ScrollbarStyle.Companion.winOsDark(
-    colors: ScrollbarColors = ScrollbarColors.winOsDark(),
+public fun ScrollbarStyle.Companion.windowsAndLinuxDark(
+    colors: ScrollbarColors = ScrollbarColors.windowsAndLinuxDark(),
     metrics: ScrollbarMetrics = ScrollbarMetrics.windows(),
     trackClickBehavior: TrackClickBehavior = TrackClickBehavior.JumpToSpot,
     scrollbarVisibility: ScrollbarVisibility = ScrollbarVisibility.AlwaysVisible,
@@ -67,8 +67,8 @@ public fun ScrollbarStyle.Companion.winOsDark(
         scrollbarVisibility = scrollbarVisibility,
     )
 
-public fun ScrollbarStyle.Companion.winOsLight(
-    colors: ScrollbarColors = ScrollbarColors.winOsLight(),
+public fun ScrollbarStyle.Companion.windowsAndLinuxLight(
+    colors: ScrollbarColors = ScrollbarColors.windowsAndLinuxLight(),
     metrics: ScrollbarMetrics = ScrollbarMetrics.windows(),
     trackClickBehavior: TrackClickBehavior = TrackClickBehavior.JumpToSpot,
     scrollbarVisibility: ScrollbarVisibility = ScrollbarVisibility.AlwaysVisible,
@@ -116,7 +116,7 @@ public fun ScrollbarColors.Companion.macOsLight(
         trackBackgroundHovered,
     )
 
-public fun ScrollbarColors.Companion.winOsLight(
+public fun ScrollbarColors.Companion.windowsAndLinuxLight(
     thumbBackground: Color = Color(0x33737373),
     thumbBackgroundHovered: Color = Color(0x47737373),
     thumbBackgroundPressed: Color = thumbBackgroundHovered,
@@ -158,7 +158,7 @@ public fun ScrollbarColors.Companion.macOsDark(
         trackBackgroundHovered,
     )
 
-public fun ScrollbarColors.Companion.winOsDark(
+public fun ScrollbarColors.Companion.windowsAndLinuxDark(
     thumbBackground: Color = Color(0x47A6A6A6),
     thumbBackgroundHovered: Color = Color(0x59A6A6A6),
     thumbBackgroundPressed: Color = Color(0x59A6A6A6),
@@ -289,9 +289,9 @@ public fun ScrollbarStyle.Companion.tabStripMacOsLight(
         scrollbarVisibility = scrollbarVisibility,
     )
 
-public fun ScrollbarStyle.Companion.tabStripWinOsDark(
-    colors: ScrollbarColors = ScrollbarColors.winOsDark(),
-    metrics: ScrollbarMetrics = ScrollbarMetrics.tabStripWindows(),
+public fun ScrollbarStyle.Companion.tabStripWindowsAndLinuxDark(
+    colors: ScrollbarColors = ScrollbarColors.windowsAndLinuxDark(),
+    metrics: ScrollbarMetrics = ScrollbarMetrics.tabStripWindowsAndLinux(),
     trackClickBehavior: TrackClickBehavior = TrackClickBehavior.JumpToSpot,
     scrollbarVisibility: ScrollbarVisibility = ScrollbarVisibility.AlwaysVisible,
 ): ScrollbarStyle =
@@ -302,9 +302,9 @@ public fun ScrollbarStyle.Companion.tabStripWinOsDark(
         scrollbarVisibility = scrollbarVisibility,
     )
 
-public fun ScrollbarStyle.Companion.tabStripWinOsLight(
-    colors: ScrollbarColors = ScrollbarColors.winOsLight(),
-    metrics: ScrollbarMetrics = ScrollbarMetrics.tabStripWindows(),
+public fun ScrollbarStyle.Companion.tabStripWindowsAndLinuxLight(
+    colors: ScrollbarColors = ScrollbarColors.windowsAndLinuxLight(),
+    metrics: ScrollbarMetrics = ScrollbarMetrics.tabStripWindowsAndLinux(),
     trackClickBehavior: TrackClickBehavior = TrackClickBehavior.JumpToSpot,
     scrollbarVisibility: ScrollbarVisibility = ScrollbarVisibility.AlwaysVisible,
 ): ScrollbarStyle =
@@ -319,14 +319,14 @@ public fun ScrollbarStyle.Companion.tabStripDark(): ScrollbarStyle =
     if (hostOs.isMacOS) {
         ScrollbarStyle.tabStripMacOsDark()
     } else {
-        ScrollbarStyle.tabStripWinOsDark()
+        ScrollbarStyle.tabStripWindowsAndLinuxDark()
     }
 
 public fun ScrollbarStyle.Companion.tabStripLight(): ScrollbarStyle =
     if (hostOs.isMacOS) {
         ScrollbarStyle.tabStripMacOsLight()
     } else {
-        ScrollbarStyle.tabStripWinOsLight()
+        ScrollbarStyle.tabStripWindowsAndLinuxLight()
     }
 
 public fun ScrollbarMetrics.Companion.tabStripMacOs(
@@ -346,7 +346,7 @@ public fun ScrollbarMetrics.Companion.tabStripMacOs(
         trackPaddingExpanded,
     )
 
-public fun ScrollbarMetrics.Companion.tabStripWindows(
+public fun ScrollbarMetrics.Companion.tabStripWindowsAndLinux(
     thumbCornerSize: CornerSize = CornerSize(0),
     thumbThickness: Dp = 3.dp,
     minThumbLength: Dp = 16.dp,

diff --git a/...alone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/component/Scrollbars.kt b/...alone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/component/Scrollbars.kt
@@ -29,8 +29,8 @@ import org.jetbrains.jewel.foundation.theme.JewelTheme
 import org.jetbrains.jewel.intui.standalone.styling.defaults
 import org.jetbrains.jewel.intui.standalone.styling.macOsDark
 import org.jetbrains.jewel.intui.standalone.styling.macOsLight
-import org.jetbrains.jewel.intui.standalone.styling.winOsDark
-import org.jetbrains.jewel.intui.standalone.styling.winOsLight
+import org.jetbrains.jewel.intui.standalone.styling.windowsAndLinuxDark
+import org.jetbrains.jewel.intui.standalone.styling.windowsAndLinuxLight
 import org.jetbrains.jewel.samples.standalone.viewmodel.View
 import org.jetbrains.jewel.ui.Orientation
 import org.jetbrains.jewel.ui.component.CheckboxRow
@@ -154,13 +154,13 @@ fun readStyle(
         if (isMac) {
             ScrollbarStyle.macOsDark()
         } else {
-            ScrollbarStyle.winOsDark()
+            ScrollbarStyle.windowsAndLinuxDark()
         }
     } else {
         if (isMac) {
             ScrollbarStyle.macOsLight()
         } else {
-            ScrollbarStyle.winOsLight()
+            ScrollbarStyle.windowsAndLinuxLight()
         }
     }