diff options
author | Remco Burema <41987080+rburema@users.noreply.github.com> | 2022-03-16 17:59:32 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-16 17:59:32 +0300 |
commit | 7dfcac7bbe57208537dbc6a58757c7f2210696ce (patch) | |
tree | c80631031ffb167e50f21c56a950ac781f903a05 | |
parent | f0bfe4f3a2ef274da8e3f7dad50c56817aa86cc6 (diff) | |
parent | 5fe6f0d1acd8a10ad5a706acb2ec7a1ed9dc0d91 (diff) |
Merge pull request #11663 from Ultimaker/CURA-9007_burger_menu
[CURA-9007] Update Burger Menus
-rw-r--r-- | resources/qml/Preferences/ProfilesPage.qml | 5 | ||||
-rw-r--r-- | resources/qml/Settings/SettingView.qml | 23 |
2 files changed, 14 insertions, 14 deletions
diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml index b25bad39fb..1b18cbce4c 100644 --- a/resources/qml/Preferences/ProfilesPage.qml +++ b/resources/qml/Preferences/ProfilesPage.qml @@ -303,6 +303,7 @@ UM.ManagementPage left: parent.left right: parent.right top: parent.top + topMargin: UM.Theme.getSize("narrow_margin").height } spacing: UM.Theme.getSize("default_margin").height @@ -364,7 +365,9 @@ UM.ManagementPage UM.TabRow { id: profileExtruderTabs - UM.TabRowButton // One extra tab for the global settings. + + // One extra tab for the global settings. + UM.TabRowButton { text: catalog.i18nc("@title:tab", "Global Settings") } diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml index 53706d6fbe..a327048f2e 100644 --- a/resources/qml/Settings/SettingView.qml +++ b/resources/qml/Settings/SettingView.qml @@ -25,7 +25,6 @@ Item top: parent.top left: parent.left right: settingVisibilityMenu.left - rightMargin: UM.Theme.getSize("default_margin").width } height: UM.Theme.getSize("print_setup_big_item").height @@ -131,8 +130,6 @@ Item SettingVisibilityPresetsMenu { id: settingVisibilityPresetsMenu - x: settingVisibilityMenu.x - y: settingVisibilityMenu.y onCollapseAllCategories: { settingsSearchTimer.stop() @@ -142,32 +139,32 @@ Item } } - UM.SimpleButton + UM.BurgerButton { id: settingVisibilityMenu anchors { - top: filterContainer.top - bottom: filterContainer.bottom + verticalCenter: filterContainer.verticalCenter right: parent.right - rightMargin: UM.Theme.getSize("wide_margin").width } - width: UM.Theme.getSize("medium_button_icon").width - height: UM.Theme.getSize("medium_button_icon").height - iconSource: UM.Theme.getIcon("Hamburger") - hoverColor: UM.Theme.getColor("small_button_text_hover") - color: UM.Theme.getColor("small_button_text") onClicked: { settingVisibilityPresetsMenu.popup( - settingVisibilityMenu, + popupContainer, -settingVisibilityPresetsMenu.width + UM.Theme.getSize("default_margin").width, settingVisibilityMenu.height ) } } + Item + { + // Work around to prevent the buttom from being rescaled if a popup is attached + id: popupContainer + anchors.bottom: settingVisibilityMenu.bottom + anchors.right: settingVisibilityMenu.right + } // Mouse area that gathers the scroll events to not propagate it to the main view. MouseArea |