mirrors/TachideskJUI
1
0
Fork 0
mirror of https://github.com/Suwayomi/TachideskJUI.git synced 2025-12-23 13:02:33 +01:00
Code Issues Projects Releases Wiki Activity

Scrollbar cleanup

Browse Source
This commit is contained in:
Syer10
2022-04-01 23:49:51 -04:00
parent 3b8ce04180
commit a5b9059af3
4 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/theme/ThemeScrollbarStyle.kt
View File

@@ -7,11 +7,15 @@
package ca.gosyer.jui.ui.base.theme package ca.gosyer.jui.ui.base.theme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.Stable
import ca.gosyer.jui.uicore.components.ScrollbarStyle import ca.gosyer.jui.uicore.components.ScrollbarStyle
actual object ThemeScrollbarStyle { actual object ThemeScrollbarStyle {
private val defaultScrollbarStyle = ScrollbarStyle()
@Stable
@Composable @Composable
actual fun getScrollbarStyle(): ScrollbarStyle { actual fun getScrollbarStyle(): ScrollbarStyle {
return ScrollbarStyle() return defaultScrollbarStyle
} }
} }

2
presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/theme/ThemeScrollbarStyle.kt
View File

@@ -7,9 +7,11 @@
package ca.gosyer.jui.ui.base.theme package ca.gosyer.jui.ui.base.theme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.Stable
import ca.gosyer.jui.uicore.components.ScrollbarStyle import ca.gosyer.jui.uicore.components.ScrollbarStyle
expect object ThemeScrollbarStyle { expect object ThemeScrollbarStyle {
@Stable
@Composable @Composable
fun getScrollbarStyle(): ScrollbarStyle fun getScrollbarStyle(): ScrollbarStyle
} }

2
presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/theme/ThemeScrollbarStyle.kt
View File

@@ -8,10 +8,12 @@ package ca.gosyer.jui.ui.base.theme
import androidx.compose.material.MaterialTheme import androidx.compose.material.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.Stable
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import ca.gosyer.jui.uicore.components.ScrollbarStyle import ca.gosyer.jui.uicore.components.ScrollbarStyle
actual object ThemeScrollbarStyle { actual object ThemeScrollbarStyle {
@Stable
@Composable @Composable
actual fun getScrollbarStyle(): ScrollbarStyle { actual fun getScrollbarStyle(): ScrollbarStyle {
return androidx.compose.foundation.ScrollbarStyle( return androidx.compose.foundation.ScrollbarStyle(

20
ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/components/AndroidScrollbar.kt
View File

@@ -10,18 +10,22 @@ import androidx.compose.foundation.ScrollState
import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.Immutable
import androidx.compose.runtime.ProvidableCompositionLocal import androidx.compose.runtime.ProvidableCompositionLocal
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.staticCompositionLocalOf import androidx.compose.runtime.staticCompositionLocalOf
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
actual interface ScrollbarAdapter { actual interface ScrollbarAdapter
fun noop()
}
object AndroidScrollbarAdapter : ScrollbarAdapter
@Immutable
actual class ScrollbarStyle actual class ScrollbarStyle
actual val LocalScrollbarStyle: ProvidableCompositionLocal<ScrollbarStyle> = staticCompositionLocalOf { ca.gosyer.jui.uicore.components.ScrollbarStyle() } private val scrollbarStyle = ScrollbarStyle()
actual val LocalScrollbarStyle: ProvidableCompositionLocal<ScrollbarStyle> = staticCompositionLocalOf { scrollbarStyle }
@Composable @Composable
internal actual fun RealVerticalScrollbar( internal actual fun RealVerticalScrollbar(
@@ -46,9 +50,7 @@ actual fun rememberScrollbarAdapter(
scrollState: ScrollState scrollState: ScrollState
): ScrollbarAdapter { ): ScrollbarAdapter {
return remember { return remember {
object : ScrollbarAdapter { AndroidScrollbarAdapter
override fun noop() {}
}
} }
} }
@@ -57,8 +59,6 @@ actual fun rememberScrollbarAdapter(
scrollState: LazyListState, scrollState: LazyListState,
): ScrollbarAdapter { ): ScrollbarAdapter {
return remember { return remember {
object : ScrollbarAdapter { AndroidScrollbarAdapter
override fun noop() {}
}
} }
} }