3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 23:53:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Make combobox_wide much wider and swap out existing uses of combobox_wide for combobox.

Browse source 
CURA-8890
This commit is contained in:
j.delarago 2022-03-14 13:13:30 +01:00
parent c6326eff64
commit 0ba4dbacc4
3 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
View file

@ -93,8 +93,8 @@ UM.Dialog
leftButtons: [ leftButtons: [
Cura.ComboBox Cura.ComboBox
{ {
implicitHeight: UM.Theme.getSize("combobox_wide").height implicitHeight: UM.Theme.getSize("combobox").height
implicitWidth: UM.Theme.getSize("combobox_wide").width implicitWidth: UM.Theme.getSize("combobox").width
id: discardOrKeepProfileChangesDropDownButton id: discardOrKeepProfileChangesDropDownButton
textRole: "text" textRole: "text"

14
resources/qml/Preferences/GeneralPage.qml
View file

@ -215,7 +215,7 @@ UM.PreferencesPage
textRole: "text" textRole: "text"
model: languageList model: languageList
implicitWidth: UM.Theme.getSize("combobox_wide").width implicitWidth: UM.Theme.getSize("combobox").width
implicitHeight: currencyField.height implicitHeight: currencyField.height
function setCurrentIndex() { function setCurrentIndex() {
@ -255,7 +255,7 @@ UM.PreferencesPage
id: currencyField id: currencyField
selectByMouse: true selectByMouse: true
text: UM.Preferences.getValue("cura/currency") text: UM.Preferences.getValue("cura/currency")
implicitWidth: UM.Theme.getSize("combobox_wide").width implicitWidth: UM.Theme.getSize("combobox").width
onTextChanged: UM.Preferences.setValue("cura/currency", text) onTextChanged: UM.Preferences.setValue("cura/currency", text)
} }
@ -284,7 +284,7 @@ UM.PreferencesPage
model: themeList model: themeList
textRole: "text" textRole: "text"
implicitWidth: UM.Theme.getSize("combobox_wide").width implicitWidth: UM.Theme.getSize("combobox").width
implicitHeight: currencyField.height implicitHeight: currencyField.height
currentIndex: currentIndex:
@ -554,8 +554,8 @@ UM.PreferencesPage
model: comboBoxList model: comboBoxList
textRole: "text" textRole: "text"
width: UM.Theme.getSize("combobox_wide").width width: UM.Theme.getSize("combobox").width
height: UM.Theme.getSize("combobox_wide").height height: UM.Theme.getSize("combobox").height
currentIndex: currentIndex:
{ {
@ -711,8 +711,8 @@ UM.PreferencesPage
Cura.ComboBox Cura.ComboBox
{ {
id: choiceOnOpenProjectDropDownButton id: choiceOnOpenProjectDropDownButton
width: UM.Theme.getSize("combobox_wide").width width: UM.Theme.getSize("combobox").width
height: UM.Theme.getSize("combobox_wide").height height: UM.Theme.getSize("combobox").height
model: ListModel model: ListModel
{ {

3
resources/themes/cura-light/theme.json
View file

@ -593,7 +593,8 @@
"checkbox_radius": [0.25, 0.25], "checkbox_radius": [0.25, 0.25],
"spinbox": [6.0, 3.0], "spinbox": [6.0, 3.0],
"combobox_wide": [14, 2], "combobox": [14, 2],
"combobox_wide": [22, 2],
"tooltip": [20.0, 10.0], "tooltip": [20.0, 10.0],
"tooltip_margins": [1.0, 1.0], "tooltip_margins": [1.0, 1.0],