3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 02:37:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

More layout and font fixes

Browse source
This commit is contained in:
ChrisTerBeke 2018-01-03 13:50:06 +01:00
parent 1476e95adc
commit 4f77b2ea6d
4 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Settings/SettingComboBox.qml
View file

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

2
resources/qml/Settings/SettingExtruder.qml
View file

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

2
resources/qml/Settings/SettingOptionalExtruder.qml
View file

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

5
resources/qml/Sidebar.qml
View file

@ -175,13 +175,10 @@ Rectangle
anchors.leftMargin: model.index * Math.floor(settingsModeSelection.width / 2) anchors.leftMargin: model.index * Math.floor(settingsModeSelection.width / 2)
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
text: model.text
ButtonGroup.group: modeMenuGroup ButtonGroup.group: modeMenuGroup
checkable: true checkable: true
checked: base.currentModeIndex == index checked: base.currentModeIndex == index
onClicked: base.currentModeIndex = index onClicked: base.currentModeIndex = index
onHoveredChanged: onHoveredChanged:
@ -201,7 +198,7 @@ Rectangle
contentItem: Text 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") 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 font: control.font
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter