Remove title bar background condition

Signed-off-by: denis0001-dev <denis0001.dev@ya.ru>
This commit is contained in:
2026-10-15 00:24:42 +03:00
Unverified
parent aaaed73298
commit 66077905ae
@@ -58,19 +58,9 @@ fun WindowScope.WindowsDesktopTitleBar(
val windowActive = rememberWindowsFrameActive(window)
val isMaximized = windowState.placement == WindowPlacement.Maximized
val scheme = MaterialTheme.colorScheme
val useWindowsCaptionColors = isWindowsOs()
val titleColor =
if (useWindowsCaptionColors) {
if (windowActive) Color.White else Color.White.copy(alpha = 0.63f)
} else {
if (windowActive) scheme.onSurface else scheme.onSurface.copy(alpha = 0.63f)
}
val barBackground =
if (useWindowsCaptionColors) {
Color.Transparent
} else {
scheme.surfaceContainerHigh
}
val titleColor = Color.White
val titleAlpha = if (windowActive) 1f else 0.63f
val barBackground = Color.Transparent
Row(
modifier
@@ -99,7 +89,7 @@ fun WindowScope.WindowsDesktopTitleBar(
Text(
text = title,
style = MaterialTheme.typography.titleSmall,
color = titleColor,
color = titleColor.copy(alpha = titleAlpha),
modifier = Modifier.padding(start = 8.dp),
)
}
@@ -108,7 +98,6 @@ fun WindowScope.WindowsDesktopTitleBar(
onClick = { window.desktopMinimize(windowState) },
windowActive = windowActive,
isClose = false,
useWindowsCaptionColors = useWindowsCaptionColors,
) {
TitleBarRemoveIcon(tint = it)
}
@@ -116,7 +105,6 @@ fun WindowScope.WindowsDesktopTitleBar(
onClick = { window.desktopToggleMaximize(windowState) },
windowActive = windowActive,
isClose = false,
useWindowsCaptionColors = useWindowsCaptionColors,
) {
if (isMaximized) {
TitleBarRestoreIcon(tint = it)
@@ -128,7 +116,6 @@ fun WindowScope.WindowsDesktopTitleBar(
onClick = onCloseRequest,
windowActive = windowActive,
isClose = true,
useWindowsCaptionColors = useWindowsCaptionColors,
) {
TitleBarCloseIcon(tint = it)
}
@@ -140,7 +127,6 @@ private fun TitleBarWindowButton(
onClick: () -> Unit,
windowActive: Boolean,
isClose: Boolean,
useWindowsCaptionColors: Boolean,
icon: @Composable (Color) -> Unit,
) {
val interactionSource = remember { MutableInteractionSource() }
@@ -149,10 +135,8 @@ private fun TitleBarWindowButton(
val scheme = MaterialTheme.colorScheme
val iconTint = when {
isClose && (hovered || pressed) -> scheme.onError
useWindowsCaptionColors && windowActive -> Color.White
useWindowsCaptionColors -> Color.White.copy(alpha = 0.63f)
windowActive -> scheme.onSurface
else -> scheme.onSurface.copy(alpha = 0.63f)
windowActive -> Color.White
else -> Color.White.copy(alpha = 0.63f)
}
val hoverAlpha = when {
isClose && (hovered || pressed) -> TitleBarCloseHoverAlpha