diff --git a/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/IntUiBridge.kt b/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/IntUiBridge.kt index 18c12c71b2..1a6bf9c970 100644 --- a/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/IntUiBridge.kt +++ b/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/IntUiBridge.kt @@ -162,7 +162,7 @@ internal fun createSwingIntUiComponentStyling( radioButtonStyle = readRadioButtonStyle(theme.iconData, svgLoader), scrollbarStyle = readScrollbarStyle(theme.isDark), textAreaStyle = readTextAreaStyle(textAreaTextStyle, textFieldStyle.metrics), - circularProgressStyle = readCircularProgressStyle(svgLoader, theme.isDark), + circularProgressStyle = readCircularProgressStyle(theme.isDark), textFieldStyle = textFieldStyle, ) } @@ -886,13 +886,11 @@ private fun readEditorTabStyle(iconData: IntelliJThemeIconData, svgLoader: SvgLo } private fun readCircularProgressStyle( - svgLoader: SvgLoader, isDark: Boolean, ): IntUiCircularProgressStyle = IntUiCircularProgressStyle( - svgLoader = svgLoader, frameTime = 125.milliseconds, color = retrieveColorOrUnspecified("ProgressIcon.color") - .takeIf { it.isSpecified && it.alpha > 0f } + .takeIf { it.isSpecified } ?: if (isDark) Color(0xFF6F737A) else Color(0xFFA8ADBD), ) diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/IntUiTheme.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/IntUiTheme.kt index 0bbbc1bca4..8fc6c3a8ce 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/IntUiTheme.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/IntUiTheme.kt @@ -130,7 +130,7 @@ object IntUiTheme : BaseIntUiTheme { lazyTreeStyle: LazyTreeStyle = IntUiLazyTreeStyle.dark(svgLoader), defaultTabStyle: TabStyle = IntUiTabStyle.Default.dark(svgLoader), editorTabStyle: TabStyle = IntUiTabStyle.Editor.dark(svgLoader), - circularProgressStyle: CircularProgressStyle = IntUiCircularProgressStyle.dark(svgLoader), + circularProgressStyle: CircularProgressStyle = IntUiCircularProgressStyle.dark(), ) = IntelliJComponentStyling( checkboxStyle = checkboxStyle, @@ -173,7 +173,7 @@ object IntUiTheme : BaseIntUiTheme { lazyTreeStyle: LazyTreeStyle = IntUiLazyTreeStyle.light(svgLoader), defaultTabStyle: TabStyle = IntUiTabStyle.Default.light(svgLoader), editorTabStyle: TabStyle = IntUiTabStyle.Editor.light(svgLoader), - circularProgressStyle: CircularProgressStyle = IntUiCircularProgressStyle.light(svgLoader), + circularProgressStyle: CircularProgressStyle = IntUiCircularProgressStyle.light(), ) = IntelliJComponentStyling( checkboxStyle = checkboxStyle, chipStyle = chipStyle,