diff --git a/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/DecoratedWindow.kt b/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/DecoratedWindow.kt index 4367b800a3..c840537e08 100644 --- a/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/DecoratedWindow.kt +++ b/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/DecoratedWindow.kt @@ -109,7 +109,7 @@ import javax.swing.JFrame Stroke.Alignment.Inside, style.metrics.borderWidth, style.colors.borderFor(decoratedWindowState).value, - RectangleShape + RectangleShape, ).padding(style.metrics.borderWidth) } else { Modifier diff --git a/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.kt b/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.kt index 73cdac679d..3fa4af0d0d 100644 --- a/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.kt +++ b/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.kt @@ -7,10 +7,8 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider -import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.Stable import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment @@ -49,8 +47,6 @@ import org.jetbrains.jewel.window.styling.TitleBarStyle import org.jetbrains.jewel.window.utils.DesktopPlatform import org.jetbrains.jewel.window.utils.macos.MacUtil import java.awt.Window -import java.awt.event.WindowAdapter -import java.awt.event.WindowEvent import kotlin.math.max internal const val TITLE_BAR_COMPONENT_LAYOUT_ID_PREFIX = "__TITLE_BAR_" diff --git a/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/styling/DecoratedWindowStyling.kt b/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/styling/DecoratedWindowStyling.kt index 61625b8614..3506a630b9 100644 --- a/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/styling/DecoratedWindowStyling.kt +++ b/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/styling/DecoratedWindowStyling.kt @@ -37,4 +37,4 @@ interface DecoratedWindowMetrics { val LocalDecoratedWindowStyle = staticCompositionLocalOf { error("No DecoratedWindowStyle provided") -} \ No newline at end of file +} diff --git a/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/IntUiTheme.kt b/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/IntUiTheme.kt index 379532ea2b..5047969f8d 100644 --- a/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/IntUiTheme.kt +++ b/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/IntUiTheme.kt @@ -36,6 +36,6 @@ fun IntUiThemeDefinition.withDecoratedWindow(lightHeaderInLight: Boolean = false return withExtensions( LocalDecoratedWindowStyle provides decoratedWindowStyle(), - LocalTitleBarStyle provides titleBarStyle(svgLoader, lightHeaderInLight) + LocalTitleBarStyle provides titleBarStyle(svgLoader, lightHeaderInLight), ) } diff --git a/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/styling/IntUiDecoratedWindowStyling.kt b/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/styling/IntUiDecoratedWindowStyling.kt index 1dfb8d542c..0d40ece7a7 100644 --- a/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/styling/IntUiDecoratedWindowStyling.kt +++ b/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/styling/IntUiDecoratedWindowStyling.kt @@ -5,7 +5,6 @@ import androidx.compose.runtime.Stable import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import org.jetbrains.jewel.SvgLoader import org.jetbrains.jewel.window.styling.DecoratedWindowColors import org.jetbrains.jewel.window.styling.DecoratedWindowMetrics import org.jetbrains.jewel.window.styling.DecoratedWindowStyle @@ -48,7 +47,7 @@ import org.jetbrains.jewel.window.styling.DecoratedWindowStyle inactiveBorderColor: Color = borderColor, ) = IntUiDecoratedWindowColors( borderColor, - inactiveBorderColor + inactiveBorderColor, ) @Composable fun dark( @@ -57,11 +56,11 @@ import org.jetbrains.jewel.window.styling.DecoratedWindowStyle inactiveBorderColor: Color = borderColor, ) = IntUiDecoratedWindowColors( borderColor, - inactiveBorderColor + inactiveBorderColor, ) } } @Stable data class IntUiDecoratedWindowMetrics( - override val borderWidth: Dp + override val borderWidth: Dp, ) : DecoratedWindowMetrics diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/Main.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/Main.kt index 8cf77f0b97..caa37dc95e 100644 --- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/Main.kt +++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/Main.kt @@ -85,10 +85,10 @@ fun main() { val svgLoader by rememberSvgLoader() DecoratedWindow( - onCloseRequest = { exitApplication() }, - title = "Jewel component catalog", - icon = icon, - ) { + onCloseRequest = { exitApplication() }, + title = "Jewel component catalog", + icon = icon, + ) { val windowBackground = if (isDark) { IntUiTheme.colorPalette.grey(1) } else {