From aa75b64b5bf121c2908ebdf550e89969945e8fb0 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Tue, 30 Oct 2018 09:48:56 +0100 Subject: [PATCH 1/2] Use the lining color to the default ouline color for the account widget. Contributes to CURA-5784. --- resources/qml/Account/AccountDetails.qml | 2 +- resources/qml/Account/AccountWidget.qml | 2 +- resources/themes/cura-light/theme.json | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/resources/qml/Account/AccountDetails.qml b/resources/qml/Account/AccountDetails.qml index a88fb77956..c723ca20fb 100644 --- a/resources/qml/Account/AccountDetails.qml +++ b/resources/qml/Account/AccountDetails.qml @@ -22,7 +22,7 @@ Column height: UM.Theme.getSize("avatar_image").height anchors.horizontalCenter: parent.horizontalCenter source: loggedIn ? profile["profile_image_url"] : UM.Theme.getImage("avatar_no_user") - outlineColor: loggedIn ? UM.Theme.getColor("account_widget_outline_active") : UM.Theme.getColor("account_widget_outline_inactive") + outlineColor: loggedIn ? UM.Theme.getColor("account_widget_outline_active") : UM.Theme.getColor("lining") } Label diff --git a/resources/qml/Account/AccountWidget.qml b/resources/qml/Account/AccountWidget.qml index 46092e4153..cdae457ac8 100644 --- a/resources/qml/Account/AccountWidget.qml +++ b/resources/qml/Account/AccountWidget.qml @@ -26,7 +26,7 @@ Button anchors.horizontalCenter: accountWidget.horizontalCenter source: loggedIn ? profile["profile_image_url"] : UM.Theme.getImage("avatar_no_user") - outlineColor: loggedIn ? UM.Theme.getColor("account_widget_outline_active") : UM.Theme.getColor("account_widget_outline_inactive") + outlineColor: loggedIn ? UM.Theme.getColor("account_widget_outline_active") : UM.Theme.getColor("lining") } onClicked: popup.opened ? popup.close() : popup.open() diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 29e3774e1f..40c776ecf1 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -97,7 +97,6 @@ "main_window_header_secondary_button_outline_hovered": [255, 255, 255, 255], "account_widget_outline_active": [70, 66, 126, 255], - "account_widget_outline_inactive": [229, 229, 229, 255], "machine_selector_bar": [31, 36, 39, 255], "machine_selector_active": [68, 72, 75, 255], From b6ea0e638578daa32fcf383335b112e8efcce7e8 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Tue, 30 Oct 2018 10:38:53 +0100 Subject: [PATCH 2/2] Make the height of the stage buttons themable. Now the height has to be 28px as indicated by the UXers. Contributes to CURA-5784. --- resources/qml/MainWindow/MainWindowHeader.qml | 2 +- resources/themes/cura-light/theme.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/MainWindow/MainWindowHeader.qml b/resources/qml/MainWindow/MainWindowHeader.qml index 92d9d8ee26..3f088e782f 100644 --- a/resources/qml/MainWindow/MainWindowHeader.qml +++ b/resources/qml/MainWindow/MainWindowHeader.qml @@ -60,7 +60,7 @@ Rectangle anchors.verticalCenter: parent.verticalCenter exclusiveGroup: mainWindowHeaderMenuGroup style: UM.Theme.styles.main_window_header_tab - height: Math.round(0.56 * UM.Theme.getSize("main_window_header").height) + height: UM.Theme.getSize("main_window_header_button").height onClicked: UM.Controller.setActiveStage(model.id) iconSource: model.stage.iconSource diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 40c776ecf1..e8de7c98ac 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -361,7 +361,7 @@ "window_minimum_size": [106, 66], "main_window_header": [0.0, 4.5], - "main_window_header_button": [8, 4], + "main_window_header_button": [8, 2.35], "main_window_header_button_icon": [1.2, 1.2], "stage_menu": [0.0, 4.5],