Fixed text sizes causing weird behavior

tudo-aqua · Aug 29, 2024 · 2407b00 · 2407b00
1 parent 5724826
commit 2407b00
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 8 deletions.
diff --git a/bgw-gui/src/jsMain/kotlin/tools/aqua/bgw/elements/CSSBuilder.kt b/bgw-gui/src/jsMain/kotlin/tools/aqua/bgw/elements/CSSBuilder.kt
@@ -29,7 +29,6 @@ fun PropertiesBuilder.cssBuilder(componentViewData: ComponentViewData) {
 
 fun PropertiesBuilder.cssBuilder(componentViewData: UIComponentData) {
     cssBuilder(componentViewData as ComponentViewData)
-    fontBuilder(componentViewData)
 }
 
 fun PropertiesBuilder.cssBuilder(componentViewData: LabeledUIComponentData) {

diff --git a/bgw-gui/src/jsMain/kotlin/tools/aqua/bgw/elements/uicomponents/ColorPicker.kt b/bgw-gui/src/jsMain/kotlin/tools/aqua/bgw/elements/uicomponents/ColorPicker.kt
@@ -52,7 +52,6 @@ val ColorPicker = FC<ColorPickerProps> { props ->
             defaultValue = props.data.selectedColor
             value = props.data.selectedColor
             css {
-                fontBuilder(props.data)
                 position = Position.absolute
                 top = 0.px
                 left = 0.px

diff --git a/bgw-gui/src/jsMain/kotlin/tools/aqua/bgw/elements/uicomponents/PasswordField.kt b/bgw-gui/src/jsMain/kotlin/tools/aqua/bgw/elements/uicomponents/PasswordField.kt
@@ -58,7 +58,6 @@ val PasswordField = FC<PasswordFieldProps> { props ->
                     fontBuilder(props.data)
                     opacity = number(0.5)
                 }
-                textIndent = 20.em
             }
             onChange = {
                 val value = it.target.value

diff --git a/bgw-gui/src/jsMain/kotlin/tools/aqua/bgw/elements/uicomponents/ProgressBar.kt b/bgw-gui/src/jsMain/kotlin/tools/aqua/bgw/elements/uicomponents/ProgressBar.kt
@@ -40,6 +40,11 @@ val ProgressBar = FC<ProgressBarProps> { props ->
             cssBuilderIntern(props.data)
         }
 
+        bgwVisuals {
+            className = ClassName("visuals")
+            +VisualBuilder.build(props.data.visual)
+        }
+
         bgwProgressBar {
             id = "${props.data.id}--bar"
             className = ClassName("progress-bar")

diff --git a/bgw-gui/src/jsMain/kotlin/tools/aqua/bgw/elements/uicomponents/TextArea.kt b/bgw-gui/src/jsMain/kotlin/tools/aqua/bgw/elements/uicomponents/TextArea.kt
@@ -56,10 +56,6 @@ val TextArea = FC<TextAreaProps> { props ->
                 inputBuilder(props.data)
                 resize = None.none
                 boxSizing = BoxSizing.borderBox
-                paddingLeft = 20.em
-                paddingTop = 10.em
-                paddingRight = 20.em
-                paddingBottom = 10.em
 
                 placeholder {
                     fontBuilder(props.data)

diff --git a/bgw-gui/src/jsMain/kotlin/tools/aqua/bgw/elements/uicomponents/TextField.kt b/bgw-gui/src/jsMain/kotlin/tools/aqua/bgw/elements/uicomponents/TextField.kt
@@ -55,7 +55,6 @@ val TextField = FC<TextFieldProps> { props ->
                     fontBuilder(props.data)
                     opacity = number(0.5)
                 }
-                textIndent = 20.em
             }
             onChange = {
                 val value = it.target.value