BetterAndroid/FlexiUI
5
0
Fork 0
mirror of https://github.com/BetterAndroid/FlexiUI.git synced 2025-09-08 03:24:20 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: compare to use maxWidth or trackWidth in Slider

Browse Source
This commit is contained in:
fankesyooni
2024-01-18 22:50:34 +08:00
parent 1de9eea30a
commit 4cc36e4749
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Slider.kt
View File

@@ -61,7 +61,6 @@ import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.IntOffset
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.isUnspecified
import com.highcapable.betterandroid.compose.extension.ui.borderOrElse import com.highcapable.betterandroid.compose.extension.ui.borderOrElse
import com.highcapable.betterandroid.compose.extension.ui.componentState import com.highcapable.betterandroid.compose.extension.ui.componentState
import com.highcapable.flexiui.ColorsDescriptor import com.highcapable.flexiui.ColorsDescriptor
@@ -173,8 +172,8 @@ private fun SliderLayout(
) { ) {
val thumbDiameter = style.thumbRadius * 2 val thumbDiameter = style.thumbRadius * 2
val trackWidth = when { val trackWidth = when {
maxWidth > 0.dp && style.trackWidth.isUnspecified -> maxWidth style.trackWidth > maxWidth && maxWidth > 0.dp -> style.trackWidth
style.trackWidth.isUnspecified -> DefaultTrackWidth maxWidth > 0.dp -> maxWidth
else -> style.trackWidth else -> style.trackWidth
} }
val trackAdoptWidth = trackWidth - thumbDiameter val trackAdoptWidth = trackWidth - thumbDiameter
@@ -406,11 +405,9 @@ internal object SliderProperties {
val ThumbShape = ShapesDescriptor.Tertiary val ThumbShape = ShapesDescriptor.Tertiary
val StepShape = ShapesDescriptor.Tertiary val StepShape = ShapesDescriptor.Tertiary
val TrackShape = ShapesDescriptor.Primary val TrackShape = ShapesDescriptor.Primary
val TrackWidth = Dp.Unspecified val TrackWidth = 240.dp
val TrackHeight = 4.dp val TrackHeight = 4.dp
val ThumbBorderWidth = SizesDescriptor.BorderSizeTertiary val ThumbBorderWidth = SizesDescriptor.BorderSizeTertiary
val StepBorderWidth = SizesDescriptor.BorderSizeTertiary val StepBorderWidth = SizesDescriptor.BorderSizeTertiary
val TrackBorderWidth = SizesDescriptor.BorderSizeTertiary val TrackBorderWidth = SizesDescriptor.BorderSizeTertiary
} }
private val DefaultTrackWidth = 240.dp