Browse Source

More layout and font fixes

ChrisTerBeke 7 years ago
parent
commit
4f77b2ea6d

+ 1 - 1
resources/qml/Settings/SettingComboBox.qml

@@ -96,7 +96,7 @@ SettingItem
             {
                 text: modelData.value
                 color: control.contentItem.color
-                font: control.font
+                font: UM.Theme.getFont("default")
                 elide: Text.ElideRight
                 verticalAlignment: Text.AlignVCenter
             }

+ 1 - 1
resources/qml/Settings/SettingExtruder.qml

@@ -156,7 +156,7 @@ SettingItem
             {
                 text: model.name
                 color: UM.Theme.getColor("setting_control_text")
-                font: control.font
+                font: UM.Theme.getFont("default")
                 elide: Text.ElideRight
                 verticalAlignment: Text.AlignVCenter
             }

+ 1 - 1
resources/qml/Settings/SettingOptionalExtruder.qml

@@ -175,7 +175,7 @@ SettingItem
             {
                 text: model.name
                 color: UM.Theme.getColor("setting_control_text")
-                font: control.font
+                font: UM.Theme.getFont("default")
                 elide: Text.ElideRight
                 verticalAlignment: Text.AlignVCenter
             }

+ 1 - 4
resources/qml/Sidebar.qml

@@ -175,13 +175,10 @@ Rectangle
                 anchors.leftMargin: model.index * Math.floor(settingsModeSelection.width / 2)
                 anchors.verticalCenter: parent.verticalCenter
 
-                text: model.text
-
                 ButtonGroup.group: modeMenuGroup
 
                 checkable: true
                 checked: base.currentModeIndex == index
-
                 onClicked: base.currentModeIndex = index
 
                 onHoveredChanged:
@@ -201,7 +198,7 @@ Rectangle
 
                 contentItem: Text
                 {
-                    text: control.text
+                    text: model.text
                     color: (control.checked || control.pressed) ? UM.Theme.getColor("action_button_active") : control.hovered ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("action_button")
                     font: control.font
                     horizontalAlignment: Text.AlignHCenter