From b4b39f0949fcea6a9d7e171a582542e3ea7a4830 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 20 Nov 2017 20:32:45 +0100 Subject: [PATCH] Tweak compatibility mode collapsed view panel --- plugins/SimulationView/SimulationView.qml | 7 +++++-- resources/themes/cura-light/theme.json | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/SimulationView/SimulationView.qml b/plugins/SimulationView/SimulationView.qml index 0387d0b85e..add8e6ebb0 100644 --- a/plugins/SimulationView/SimulationView.qml +++ b/plugins/SimulationView/SimulationView.qml @@ -21,6 +21,9 @@ Item } height: { if (viewSettings.collapsed) { + if (UM.SimulationView.compatibilityMode) { + return UM.Theme.getSize("layerview_menu_size_compatibility_collapsed").height; + } return UM.Theme.getSize("layerview_menu_size_collapsed").height; } else if (UM.SimulationView.compatibilityMode) { return UM.Theme.getSize("layerview_menu_size_compatibility").height; @@ -535,8 +538,8 @@ Item height: UM.Theme.getSize("layerview_menu_size").height anchors { - top: playButton.bottom - topMargin: UM.Theme.getSize("default_margin").height + top: !UM.SimulationView.compatibilityMode ? playButton.bottom : parent.top + topMargin: !UM.SimulationView.compatibilityMode ? UM.Theme.getSize("default_margin").height : 0 right: parent.right rightMargin: UM.Theme.getSize("slider_layerview_margin").width } diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 08ff3013c9..09f93d413e 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -350,6 +350,7 @@ "layerview_menu_size_material_color_mode": [15, 16], "layerview_menu_size_collapsed": [15, 6], "layerview_menu_size_compatibility": [22, 22.0], + "layerview_menu_size_compatibility_collapsed": [15, 3.5], "layerview_legend_size": [1.0, 1.0], "layerview_row": [11.0, 1.5], "layerview_row_spacing": [0.0, 0.5],