From 66077905ae794b3fc5ec981ec8a7cc24565bf83b Mon Sep 17 00:00:00 2001 From: denis0001-dev Date: Thu, 15 Oct 2026 00:24:42 +0300 Subject: [PATCH] Remove title bar background condition Signed-off-by: denis0001-dev --- .../desktop/WindowsDesktopTitleBar.kt | 28 ++++--------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/app/desktop/src/main/kotlin/ru/fromchat/desktop/WindowsDesktopTitleBar.kt b/app/desktop/src/main/kotlin/ru/fromchat/desktop/WindowsDesktopTitleBar.kt index 30ed6de..d3e8732 100644 --- a/app/desktop/src/main/kotlin/ru/fromchat/desktop/WindowsDesktopTitleBar.kt +++ b/app/desktop/src/main/kotlin/ru/fromchat/desktop/WindowsDesktopTitleBar.kt @@ -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