diff --git a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml index 0e2985ae32..bcace5a8b1 100644 --- a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml +++ b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml @@ -93,8 +93,8 @@ UM.Dialog leftButtons: [ Cura.ComboBox { - implicitHeight: UM.Theme.getSize("combobox_wide").height - implicitWidth: UM.Theme.getSize("combobox_wide").width + implicitHeight: UM.Theme.getSize("combobox").height + implicitWidth: UM.Theme.getSize("combobox").width id: discardOrKeepProfileChangesDropDownButton textRole: "text" diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index 9bb99f23cf..d321a67ce9 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -215,7 +215,7 @@ UM.PreferencesPage textRole: "text" model: languageList - implicitWidth: UM.Theme.getSize("combobox_wide").width + implicitWidth: UM.Theme.getSize("combobox").width implicitHeight: currencyField.height function setCurrentIndex() { @@ -255,7 +255,7 @@ UM.PreferencesPage id: currencyField selectByMouse: true 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) } @@ -284,7 +284,7 @@ UM.PreferencesPage model: themeList textRole: "text" - implicitWidth: UM.Theme.getSize("combobox_wide").width + implicitWidth: UM.Theme.getSize("combobox").width implicitHeight: currencyField.height currentIndex: @@ -554,8 +554,8 @@ UM.PreferencesPage model: comboBoxList textRole: "text" - width: UM.Theme.getSize("combobox_wide").width - height: UM.Theme.getSize("combobox_wide").height + width: UM.Theme.getSize("combobox").width + height: UM.Theme.getSize("combobox").height currentIndex: { @@ -711,8 +711,8 @@ UM.PreferencesPage Cura.ComboBox { id: choiceOnOpenProjectDropDownButton - width: UM.Theme.getSize("combobox_wide").width - height: UM.Theme.getSize("combobox_wide").height + width: UM.Theme.getSize("combobox").width + height: UM.Theme.getSize("combobox").height model: ListModel { diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 5583053ea2..86af42d187 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -593,7 +593,8 @@ "checkbox_radius": [0.25, 0.25], "spinbox": [6.0, 3.0], - "combobox_wide": [14, 2], + "combobox": [14, 2], + "combobox_wide": [22, 2], "tooltip": [20.0, 10.0], "tooltip_margins": [1.0, 1.0],