From 4f77b2ea6d4c6e4221abe0758ee70e19040f7d6c Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Wed, 3 Jan 2018 13:50:06 +0100 Subject: [PATCH] More layout and font fixes --- resources/qml/Settings/SettingComboBox.qml | 2 +- resources/qml/Settings/SettingExtruder.qml | 2 +- resources/qml/Settings/SettingOptionalExtruder.qml | 2 +- resources/qml/Sidebar.qml | 5 +---- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/resources/qml/Settings/SettingComboBox.qml b/resources/qml/Settings/SettingComboBox.qml index 2f3a13206c..6168668157 100644 --- a/resources/qml/Settings/SettingComboBox.qml +++ b/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 } diff --git a/resources/qml/Settings/SettingExtruder.qml b/resources/qml/Settings/SettingExtruder.qml index f7b0be69f6..3f7f20b2b5 100644 --- a/resources/qml/Settings/SettingExtruder.qml +++ b/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 } diff --git a/resources/qml/Settings/SettingOptionalExtruder.qml b/resources/qml/Settings/SettingOptionalExtruder.qml index b1b11f3b20..4fa7ac9c6c 100644 --- a/resources/qml/Settings/SettingOptionalExtruder.qml +++ b/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 } diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml index 03f5c5858e..60469e6238 100644 --- a/resources/qml/Sidebar.qml +++ b/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