Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fluent] 1px gap. #45

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

[fluent] 1px gap. #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2afdc9
[fluent] remove dp convert twice.
Sanlorng Apr 17, 2024
0f26416
Update the way to eliminate gap
Konyaco Apr 18, 2024
7cdb0d3
Rollback main
Konyaco Apr 18, 2024
945f587
Update the way to eliminate gap
Konyaco Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 34 additions & 21 deletions fluent/src/commonMain/kotlin/com/konyaco/fluent/background/Layer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,18 @@ import androidx.compose.ui.geometry.Size
import androidx.compose.ui.geometry.translate
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Outline
import androidx.compose.ui.graphics.ShaderBrush
import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.unit.Density
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.dp
import com.konyaco.fluent.FluentTheme
import com.konyaco.fluent.LocalContentColor
import com.konyaco.fluent.ProvideTextStyle
import kotlin.math.ceil
import kotlin.math.floor
import kotlin.math.sqrt

/**
Expand Down Expand Up @@ -121,7 +125,17 @@ private fun Modifier.layer(
if (border != null) {
val backgroundShape =
if (backgroundSizing == BackgroundSizing.InnerBorderEdge && shape is CornerBasedShape) {
BackgroundPaddingShape(shape)
val brush = border.brush
// FIXME(Workaround): If the border color has alpha channel, shrink padding to not cover the content background
val hasAlpha = if (brush is SolidColor) {
brush.value.alpha < 1f
} else if (brush is ShaderBrush) {
// TODO: Detect if there are transparent colors in gradient.
true
} else {
false
}
BackgroundPaddingShape(shape, cover = !hasAlpha)
} else {
shape
}
Expand All @@ -138,16 +152,18 @@ private fun Modifier.layer(
* keep padding for background
*/
@Immutable
@JvmInline
private value class BackgroundPaddingShape(private val borderShape: CornerBasedShape) : Shape {
private class BackgroundPaddingShape(
private val borderShape: CornerBasedShape,
private val cover: Boolean
) : Shape {

override fun createOutline(size: Size, layoutDirection: LayoutDirection, density: Density): Outline {
return with(density) {
val circular = borderShape == CircleShape
val circular = borderShape == CircleShape && size.height == size.width
val paddingPx = when {
circular -> calcCircularPadding(density)
else -> calcPadding(density)
}.toPx()
circular -> calcCircularPadding(density, cover)
else -> calcPadding(density, cover)
}
createInnerOutline(size, density, layoutDirection, paddingPx)
}
}
Expand Down Expand Up @@ -202,28 +218,25 @@ private value class BackgroundPaddingShape(private val borderShape: CornerBasedS
}
}

/**
* This is a workaround solution to eliminate 1 pixel gap
* when density is not integer or `(density % 1) < 0.5`
*/
@Stable
private fun calcPadding(density: Density): Dp {
val remainder = density.density % 1f

private fun calcPadding(density: Density, cover: Boolean): Float {
return with(density) {
when {
remainder == 0f -> 1.dp
else -> (1.dp.toPx() - remainder + 1).toDp()
}
if (cover) ceil(1.dp.toPx()) - 0.5f // cover
else ceil(1.dp.toPx())// do not cover
}
}

@Stable
private fun calcCircularPadding(density: Density): Dp {
private fun calcCircularPadding(density: Density, cover: Boolean): Float {
val remainder = density.density % 1f

return with(density) {
if (remainder == 0f) 1.dp
else (1.dp.toPx() - remainder + 1).toDp()
if (remainder == 0f) {
if (cover) floor(1.dp.toPx()) - 0.5f // cover
else floor(1.dp.toPx()) - 0.15f// do not cover
} else {
if (cover) floor(1.dp.toPx()) // overlap
else floor(1.dp.toPx()) + 0.85f// do not cover
}
}
}
47 changes: 46 additions & 1 deletion gallery/src/commonMain/kotlin/com/konyaco/fluent/gallery/screen/settings/SettingsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,52 @@ private fun Content() {
},
backgroundSizing = BackgroundSizing.OuterBorderEdge
)

Layer(
modifier = Modifier.size(32.dp),
shape = CircleShape,
color = FluentTheme.colors.fillAccent.default,
border = BorderStroke(1.dp, FluentTheme.colors.fillAccent.default),
backgroundSizing = BackgroundSizing.InnerBorderEdge,
content = {}
)
Layer(
shape = CircleShape,
color = FluentTheme.colors.fillAccent.default,
border = BorderStroke(1.dp, FluentTheme.colors.fillAccent.default),
content = { Box(Modifier.size(height = 32.dp, width = 64.dp))},
backgroundSizing = BackgroundSizing.InnerBorderEdge
)
Layer(
shape = CircleShape,
// modifier = Modifier.size(32.dp),
color = FluentTheme.colors.controlStrong.default,
border = BorderStroke(1.dp, FluentTheme.colors.controlStrong.default),
backgroundSizing = BackgroundSizing.InnerBorderEdge,
content = { Box(Modifier.size(32.dp)) }
)
Layer(
shape = CircleShape,
modifier = Modifier.size(64.dp, 32.dp),
color = FluentTheme.colors.controlStrong.default,
border = BorderStroke(1.dp, FluentTheme.colors.controlStrong.default),
backgroundSizing = BackgroundSizing.InnerBorderEdge,
content = {}
)
Layer(
shape = RoundedCornerShape(4.dp),
color = FluentTheme.colors.fillAccent.default,
border = BorderStroke(1.dp, FluentTheme.colors.fillAccent.default),
content = { Box(Modifier.size(height = 32.dp, width = 64.dp))},
backgroundSizing = BackgroundSizing.InnerBorderEdge
)
Layer(
shape = RoundedCornerShape(4.dp),
modifier = Modifier.size(64.dp, 32.dp),
color = FluentTheme.colors.controlStrong.default,
border = BorderStroke(1.dp, FluentTheme.colors.controlStrong.default),
backgroundSizing = BackgroundSizing.InnerBorderEdge,
content = {}
)
Card(Modifier) {
Box(Modifier.size(32.dp))
}
Expand Down