diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/theme/TextStyles.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/theme/TextStyles.kt index c5560cc14..ab2aba7cd 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/theme/TextStyles.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/theme/TextStyles.kt @@ -54,7 +54,7 @@ public fun JewelTheme.Companion.createDefaultTextStyle( hyphens: Hyphens = Hyphens.Unspecified, textMotion: TextMotion? = null, ): TextStyle = - TextStyle.Default.copy( + TextStyle( color = color, fontSize = fontSize, fontWeight = fontWeight, @@ -108,7 +108,7 @@ public fun JewelTheme.Companion.createDefaultTextStyle( hyphens: Hyphens = Hyphens.Unspecified, textMotion: TextMotion? = null, ): TextStyle = - TextStyle.Default.copy( + TextStyle( brush = brush, alpha = alpha, fontSize = fontSize, @@ -162,7 +162,7 @@ public fun JewelTheme.Companion.createEditorTextStyle( hyphens: Hyphens = Hyphens.Unspecified, textMotion: TextMotion? = null, ): TextStyle = - TextStyle.Default.copy( + TextStyle( color = color, fontSize = fontSize, fontWeight = fontWeight, @@ -216,7 +216,7 @@ public fun JewelTheme.Companion.createEditorTextStyle( hyphens: Hyphens = Hyphens.Unspecified, textMotion: TextMotion? = null, ): TextStyle = - TextStyle.Default.copy( + TextStyle( brush = brush, alpha = alpha, fontSize = fontSize, 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 d962daf07..1e0ea86ad 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 @@ -7,15 +7,12 @@ import androidx.compose.ui.input.key.KeyEventType import androidx.compose.ui.input.key.isAltPressed import androidx.compose.ui.input.key.key import androidx.compose.ui.input.key.type -import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.unit.Density import androidx.compose.ui.window.application import org.jetbrains.compose.resources.ExperimentalResourceApi import org.jetbrains.compose.resources.decodeToSvgPainter import org.jetbrains.jewel.foundation.theme.JewelTheme import org.jetbrains.jewel.foundation.util.JewelLogger -import org.jetbrains.jewel.intui.standalone.Inter -import org.jetbrains.jewel.intui.standalone.JetBrainsMono import org.jetbrains.jewel.intui.standalone.theme.IntUiTheme import org.jetbrains.jewel.intui.standalone.theme.createDefaultTextStyle import org.jetbrains.jewel.intui.standalone.theme.createEditorTextStyle @@ -39,8 +36,8 @@ fun main() { val icon = svgResource("icons/jewel-logo.svg") application { - val textStyle = JewelTheme.createDefaultTextStyle(fontFamily = FontFamily.Inter) - val editorStyle = JewelTheme.createEditorTextStyle(fontFamily = FontFamily.JetBrainsMono) + val textStyle = JewelTheme.createDefaultTextStyle() + val editorStyle = JewelTheme.createEditorTextStyle() val themeDefinition = if (MainViewModel.theme.isDark()) {