From edc10e06307030bbf333ed325540ee6e662526b0 Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Tue, 3 Oct 2017 11:21:47 +0200 Subject: [PATCH] fix topbar colors in monitor mode for UM3 networking --- resources/qml/Topbar.qml | 2 -- resources/themes/cura-dark/theme.json | 2 +- resources/themes/cura-light/theme.json | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/resources/qml/Topbar.qml b/resources/qml/Topbar.qml index 152a677467..b3a5137111 100644 --- a/resources/qml/Topbar.qml +++ b/resources/qml/Topbar.qml @@ -18,8 +18,6 @@ Rectangle height: UM.Theme.getSize("sidebar_header").height color: base.monitoringPrint ? UM.Theme.getColor("topbar_background_color_monitoring") : UM.Theme.getColor("topbar_background_color") - Behavior on color { ColorAnimation { duration: 100; } } - property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0 property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands property bool monitoringPrint: false diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index f39fe96c37..e61c48bffd 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -16,7 +16,7 @@ "secondary": [241, 242, 242, 255], "topbar_background_color": [0, 0, 0, 0], - "topbar_background_color_monitoring": [0, 0, 0, 0], + "topbar_background_color_monitoring": [31, 36, 39, 255], "topbar_button_text_active": [255, 255, 255, 255], "topbar_button_text_inactive": [128, 128, 128, 255], diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 5d50618eea..96ccd469b6 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -68,7 +68,7 @@ "secondary": [245, 245, 245, 255], "topbar_background_color": [255, 255, 255, 0], - "topbar_background_color_monitoring": [255, 255, 255, 0], + "topbar_background_color_monitoring": [255, 255, 255, 255], "topbar_button_text_active": [0, 0, 0, 255], "topbar_button_text_inactive": [128, 128, 128, 255],