-
Notifications
You must be signed in to change notification settings - Fork 42
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* iterate on scrollbars * update API files * add Scrollbars demo to Standalone * fix popup border width regression Reference #515 (comment) Signed-off-by: Ivan Morgillo <[email protected]> * remove unnecessary platform check in ScrollbarBridge Reference #515 (comment) Signed-off-by: Ivan Morgillo <[email protected]> * fix wrong thumb background color Reference #515 (comment) Signed-off-by: Ivan Morgillo <[email protected]> --------- Signed-off-by: Ivan Morgillo <[email protected]>
- Loading branch information
Showing
15 changed files
with
1,512 additions
and
176 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
230 changes: 230 additions & 0 deletions
230
ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/ScrollbarBridge.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,230 @@ | ||
| package org.jetbrains.jewel.bridge.theme | ||
|
|
||
| import androidx.compose.foundation.layout.PaddingValues | ||
| import androidx.compose.foundation.shape.CornerSize | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.graphics.takeOrElse | ||
| import androidx.compose.ui.unit.dp | ||
| import com.intellij.ui.mac.foundation.Foundation | ||
| import org.jetbrains.jewel.bridge.retrieveColorOrUnspecified | ||
| import org.jetbrains.jewel.ui.component.styling.ScrollbarColors | ||
| import org.jetbrains.jewel.ui.component.styling.ScrollbarMetrics | ||
| import org.jetbrains.jewel.ui.component.styling.ScrollbarStyle | ||
| import org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility | ||
| import org.jetbrains.jewel.ui.component.styling.TrackClickBehavior | ||
| import org.jetbrains.skiko.hostOs | ||
| import kotlin.time.Duration | ||
| import kotlin.time.Duration.Companion.milliseconds | ||
|
|
||
| internal fun readScrollbarStyle(isDark: Boolean): ScrollbarStyle = | ||
| ScrollbarStyle( | ||
| colors = readScrollbarColors(isDark), | ||
| metrics = readScrollbarMetrics(), | ||
| trackClickBehavior = readTrackClickBehavior(), | ||
| scrollbarVisibility = readScrollbarVisibility(), | ||
| ) | ||
|
|
||
| private fun readScrollbarVisibility() = | ||
| if (hostOs.isMacOS) { | ||
| readMacScrollbarStyle() | ||
| } else { | ||
| ScrollbarVisibility.AlwaysVisible | ||
| } | ||
|
|
||
| private fun readScrollbarColors(isDark: Boolean) = | ||
| if (hostOs.isMacOS) { | ||
| readScrollbarMacColors(isDark) | ||
| } else { | ||
| readScrollbarWinColors(isDark) | ||
| } | ||
|
|
||
| private fun readTrackClickBehavior() = | ||
| if (hostOs.isMacOS) { | ||
| readMacScrollbarBehavior() | ||
| } else { | ||
| TrackClickBehavior.JumpToSpot | ||
| } | ||
|
|
||
| private fun readScrollbarWinColors(isDark: Boolean): ScrollbarColors = | ||
| ScrollbarColors( | ||
| thumbBackground = | ||
| readScrollBarColorForKey( | ||
| isDark, | ||
| "ScrollBar.Transparent.thumbColor", | ||
| 0x33737373, | ||
| 0x47A6A6A6, | ||
| ), | ||
| thumbBackgroundHovered = | ||
| readScrollBarColorForKey( | ||
| isDark, | ||
| "ScrollBar.hoverThumbColor", | ||
| 0x47737373, | ||
| 0x59A6A6A6, | ||
| ), | ||
| thumbBackgroundPressed = | ||
| readScrollBarColorForKey( | ||
| isDark, | ||
| "ScrollBar.hoverThumbColor", | ||
| 0x47737373, | ||
| 0x59A6A6A6, | ||
| ), | ||
| thumbBorder = | ||
| readScrollBarColorForKey( | ||
| isDark, | ||
| "ScrollBar.thumbBorderColor", | ||
| 0x33595959, | ||
| 0x47383838, | ||
| ), | ||
| thumbBorderHovered = | ||
| readScrollBarColorForKey( | ||
| isDark, | ||
| "ScrollBar.hoverThumbBorderColor", | ||
| 0x47595959, | ||
| 0x59383838, | ||
| ), | ||
| thumbBorderPressed = | ||
| readScrollBarColorForKey( | ||
| isDark, | ||
| "ScrollBar.hoverThumbBorderColor", | ||
| 0x47595959, | ||
| 0x59383838, | ||
| ), | ||
| trackBackground = | ||
| readScrollBarColorForKey( | ||
| isDark, | ||
| "ScrollBar.Transparent.trackColor", | ||
| 0x00808080, | ||
| 0x00808080, | ||
| ), | ||
| trackBackgroundHovered = | ||
| readScrollBarColorForKey( | ||
| isDark, | ||
| "ScrollBar.Transparent.hoverTrackColor", | ||
| 0x1A808080, | ||
| 0x1A808080, | ||
| ), | ||
| ) | ||
|
|
||
| private fun readScrollbarMacColors(isDark: Boolean): ScrollbarColors = | ||
| ScrollbarColors( | ||
| thumbBackground = | ||
| readScrollBarColorForKey( | ||
| isDark, | ||
| "ScrollBar.Mac.Transparent.thumbColor", | ||
| 0x00000000, | ||
| 0x00808080, | ||
| ), | ||
| thumbBackgroundHovered = | ||
| readScrollBarColorForKey( | ||
| isDark, | ||
| "ScrollBar.Mac.hoverThumbColor", | ||
| 0x80000000, | ||
| 0x8C808080, | ||
| ), | ||
| thumbBackgroundPressed = | ||
| readScrollBarColorForKey( | ||
| isDark, | ||
| "ScrollBar.Mac.hoverThumbColor", | ||
| 0x80000000, | ||
| 0x8C808080, | ||
| ), | ||
| thumbBorder = | ||
| readScrollBarColorForKey( | ||
| isDark, | ||
| "ScrollBar.Mac.thumbBorderColor", | ||
| 0x33000000, | ||
| 0x59262626, | ||
| ), | ||
| thumbBorderHovered = | ||
| readScrollBarColorForKey( | ||
| isDark, | ||
| "ScrollBar.Mac.hoverThumbBorderColor", | ||
| 0x80000000, | ||
| 0x8C262626, | ||
| ), | ||
| thumbBorderPressed = | ||
| readScrollBarColorForKey( | ||
| isDark, | ||
| "ScrollBar.Mac.hoverThumbBorderColor", | ||
| 0x80000000, | ||
| 0x8C262626, | ||
| ), | ||
| trackBackground = | ||
| readScrollBarColorForKey( | ||
| isDark, | ||
| "ScrollBar.Mac.Transparent.trackColor", | ||
| 0x00808080, | ||
| 0x00808080, | ||
| ), | ||
| trackBackgroundHovered = | ||
| readScrollBarColorForKey( | ||
| isDark, | ||
| "ScrollBar.Mac.Transparent.hoverTrackColor", | ||
| 0x1A808080, | ||
| 0x1A808080, | ||
| ), | ||
| ) | ||
|
|
||
| private fun readScrollBarColorForKey( | ||
| isDark: Boolean, | ||
| colorKey: String, | ||
| fallbackLight: Long, | ||
| fallbackDark: Long, | ||
| ) = retrieveColorOrUnspecified(colorKey) | ||
| .takeOrElse { if (isDark) Color(fallbackDark) else Color(fallbackLight) } | ||
|
|
||
| private fun readScrollbarMetrics(): ScrollbarMetrics = | ||
| if (hostOs.isMacOS) { | ||
| ScrollbarMetrics( | ||
| thumbCornerSize = CornerSize(percent = 100), | ||
| thumbThickness = 8.dp, | ||
| thumbThicknessExpanded = 14.dp, | ||
| minThumbLength = 20.dp, | ||
| trackPadding = PaddingValues(2.dp), | ||
| trackPaddingExpanded = PaddingValues(2.dp), | ||
| ) | ||
| } else { | ||
| ScrollbarMetrics( | ||
| thumbCornerSize = CornerSize(0), | ||
| thumbThickness = 8.dp, | ||
| thumbThicknessExpanded = 8.dp, | ||
| minThumbLength = 16.dp, | ||
| trackPadding = PaddingValues(), | ||
| trackPaddingExpanded = PaddingValues(), | ||
| ) | ||
| } | ||
|
|
||
| private fun readMacScrollbarStyle(): ScrollbarVisibility { | ||
| val nsScroller = | ||
| Foundation | ||
| .invoke(Foundation.getObjcClass("NSScroller"), "preferredScrollerStyle") | ||
|
|
||
| val visibility: ScrollbarVisibility = | ||
| if (1 == nsScroller.toInt()) { | ||
| ScrollbarVisibility.WhenScrolling.Companion.defaults() | ||
| } else { | ||
| ScrollbarVisibility.AlwaysVisible | ||
| } | ||
| return visibility | ||
| } | ||
|
|
||
| private fun readMacScrollbarBehavior(): TrackClickBehavior { | ||
| val defaults = Foundation.invoke("NSUserDefaults", "standardUserDefaults") | ||
| Foundation.invoke(defaults, "synchronize") | ||
| return Foundation | ||
| .invoke(defaults, "boolForKey:", Foundation.nsString("AppleScrollerPagingBehavior")) | ||
| .run { if (toInt() == 1) TrackClickBehavior.JumpToSpot else TrackClickBehavior.NextPage } | ||
| } | ||
|
|
||
| public fun ScrollbarVisibility.WhenScrolling.Companion.defaults( | ||
| appearAnimationDuration: Duration = 125.milliseconds, | ||
| disappearAnimationDuration: Duration = 125.milliseconds, | ||
| expandAnimationDuration: Duration = 125.milliseconds, | ||
| lingerDuration: Duration = 700.milliseconds, | ||
| ): ScrollbarVisibility.WhenScrolling = | ||
| ScrollbarVisibility.WhenScrolling( | ||
| appearAnimationDuration = appearAnimationDuration, | ||
| disappearAnimationDuration = disappearAnimationDuration, | ||
| expandAnimationDuration = expandAnimationDuration, | ||
| lingerDuration = lingerDuration, | ||
| ) |
Oops, something went wrong.