From b14e29d214d15c5bdaf0f04f6e45c9af0ad1dd99 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Wed, 23 Feb 2022 15:13:36 +0100 Subject: [PATCH] Make general menu combox wider CURA-8688 --- .../Dialogs/DiscardOrKeepProfileChangesDialog.qml | 4 ++-- resources/qml/Preferences/GeneralPage.qml | 12 ++++++------ resources/themes/cura-light/theme.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml index 5c75993d39..11aeac1722 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_dialog").height - implicitWidth: UM.Theme.getSize("combobox_dialog").width + implicitHeight: UM.Theme.getSize("combobox_wide").height + implicitWidth: UM.Theme.getSize("combobox_wide").width id: discardOrKeepProfileChangesDropDownButton textRole: "text" diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index a91a888a12..2b340a7ab5 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -554,8 +554,8 @@ UM.PreferencesPage model: comboBoxList textRole: "text" - width: UM.Theme.getSize("setting_control").width - height: UM.Theme.getSize("setting_control").height + width: UM.Theme.getSize("combobox_wide").width + height: UM.Theme.getSize("combobox_wide").height currentIndex: { @@ -711,8 +711,8 @@ UM.PreferencesPage Cura.ComboBox { id: choiceOnOpenProjectDropDownButton - width: UM.Theme.getSize("setting_control").width - height: UM.Theme.getSize("setting_control").height + width: UM.Theme.getSize("combobox_wide").width + height: UM.Theme.getSize("combobox_wide").height model: ListModel { @@ -779,8 +779,8 @@ UM.PreferencesPage Cura.ComboBox { id: choiceOnProfileOverrideDropDownButton - width: UM.Theme.getSize("setting_control").width - height: UM.Theme.getSize("setting_control").height + width: UM.Theme.getSize("combobox_wide").width + height: UM.Theme.getSize("combobox_wide").height model: ListModel { id: discardOrKeepProfileListModel diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 2c23c0ed17..3754a0fb64 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -620,7 +620,7 @@ "checkbox_label_padding": [0.5, 0.5], "spinbox": [6.0, 3.0], - "combobox_dialog": [14, 2], + "combobox_wide": [14, 2], "tooltip": [20.0, 10.0], "tooltip_margins": [1.0, 1.0],