Avoid init bridge theme with unspecified fontSize

Fixes JetBrains#316
jrlogsdon · Mar 19, 2024 · f9f35ca · f9f35ca
1 parent a6b5a76
commit f9f35ca
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/SwingBridgeService.kt b/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/SwingBridgeService.kt
@@ -1,6 +1,7 @@
 package org.jetbrains.jewel.bridge
 
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.unit.sp
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.Service.Level
 import kotlinx.coroutines.CoroutineScope
@@ -49,20 +50,21 @@ internal class SwingBridgeService(scope: CoroutineScope) {
  val componentStyling: ComponentStyling,
  ) {
 
- public companion object {
+ companion object {
 
  val DEFAULT = run {
- val themeDefinition = createBridgeThemeDefinition(TextStyle.Default)
+ val textStyle = TextStyle.Default.copy(fontSize = 13.sp)
+ val themeDefinition = createBridgeThemeDefinition(textStyle)
 
  BridgeThemeData(
  themeDefinition = themeDefinition,
  componentStyling =
  createBridgeComponentStyling(
  theme = themeDefinition,
- textFieldTextStyle = TextStyle.Default,
- textAreaTextStyle = TextStyle.Default,
- dropdownTextStyle = TextStyle.Default,
- linkTextStyle = TextStyle.Default,
+ textFieldTextStyle = textStyle,
+ textAreaTextStyle = textStyle,
+ dropdownTextStyle = textStyle,
+ linkTextStyle = textStyle,
  ),
  )
  }

diff --git a/.../ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/ComponentShowcaseTab.kt b/.../ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/ComponentShowcaseTab.kt
@@ -47,6 +47,7 @@ import org.jetbrains.jewel.ui.component.Slider
 import org.jetbrains.jewel.ui.component.Text
 import org.jetbrains.jewel.ui.component.TextField
 import org.jetbrains.jewel.ui.component.Tooltip
+import org.jetbrains.jewel.ui.component.Typography
 
 @Composable
 internal fun ComponentShowcaseTab() {
@@ -78,6 +79,7 @@ private fun RowScope.ColumnOne() {
  Modifier.onActivated {
  activated = it
  },
+ style = Typography.h3TextStyle()
  )
 
  Row(