From 7d719c4ab56b44aa13e3cc0b08c53e597b81bb92 Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Tue, 12 Sep 2017 09:54:24 +0200 Subject: [PATCH] layer view toolbox height depending on color scheme mode --- plugins/LayerView/LayerView.qml | 2 ++ resources/themes/cura-light/theme.json | 1 + 2 files changed, 3 insertions(+) diff --git a/plugins/LayerView/LayerView.qml b/plugins/LayerView/LayerView.qml index 1f04be77d3..10a2b4c3cf 100755 --- a/plugins/LayerView/LayerView.qml +++ b/plugins/LayerView/LayerView.qml @@ -22,6 +22,8 @@ Item height: { if (UM.LayerView.compatibilityMode) { return UM.Theme.getSize("layerview_menu_size_compatibility").height; + } else if (UM.Preferences.getValue("layerview/layer_view_type") == 0) { + return UM.Theme.getSize("layerview_menu_size_material_color_mode").height + UM.LayerView.extruderCount * (UM.Theme.getSize("layerview_row").height + UM.Theme.getSize("layerview_row_spacing").height) } else { return UM.Theme.getSize("layerview_menu_size").height + UM.LayerView.extruderCount * (UM.Theme.getSize("layerview_row").height + UM.Theme.getSize("layerview_row_spacing").height) } diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 98afe76350..3b98ac1ae4 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -346,6 +346,7 @@ "slider_layerview_margin": [1.0, 1.0], "layerview_menu_size": [15, 19.5], + "layerview_menu_size_material_color_mode": [15, 15.5], "layerview_menu_size_compatibility": [22, 22.0], "layerview_legend_size": [1.0, 1.0], "layerview_row": [11.0, 1.5],