From ff824b718c451e59ec0410dd6acdb1826b6fc2b9 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Mon, 14 Mar 2022 16:14:57 +0100 Subject: [PATCH] Replace burger buttons with generic BurgerButton.qml component. Move comment onto newline (Comments on the same line as component names break text folding) Update burger menu margins in SettingView to match design CURA-9007 --- resources/qml/Preferences/ProfilesPage.qml | 5 ++++- resources/qml/Settings/SettingView.qml | 12 ++---------- 2 files changed, 6 insertions(+), 11 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 ecafd25913..56588ca6ca 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 @@ -142,22 +141,15 @@ 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: {