Cleanup layout, finalizing

plugins/LayerView/LayerView.qml

@@ -10,111 +10,23 @@ import UM 1.0 as UM
 
 Item
 {
-    width: UM.Theme.getSize("button").width
+    width: UM.Theme.getSize("layerview_menu_size").width
-    height: UM.Theme.getSize("slider_layerview_size").height
+    height: {
+        if (UM.LayerView.compatibilityMode) {
+            return UM.Theme.getSize("layerview_menu_size").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)
+        }
+    }
 
     Rectangle {
         id: layerViewMenu
         anchors.left: parent.left
-        anchors.top: slider_background.top
+        anchors.top: parent.top
-        width: UM.Theme.getSize("layerview_menu_size").width
+        width: parent.width
-        height: slider.height + UM.Theme.getSize("default_margin").height * 2
+        height: parent.height
+        z: slider.z - 1
         color: UM.Theme.getColor("tool_panel_background");
-        border.width: UM.Theme.getSize("default_lining").width
-        border.color: UM.Theme.getColor("lining")
-
-        Label
-        {
-            id: layersLabel
-            anchors.top: parent.top
-            anchors.topMargin: UM.Theme.getSize("default_margin").height
-            anchors.left: parent.left
-            anchors.leftMargin: UM.Theme.getSize("default_margin").width
-            text: catalog.i18nc("@label","View Mode: Layers")
-            font.bold: true
-        }
-
-        Label
-        {
-            id: layerViewTypesLabel
-            anchors.top: layersLabel.bottom
-            anchors.topMargin: UM.Theme.getSize("default_margin").height
-            anchors.left: parent.left
-            anchors.leftMargin: UM.Theme.getSize("default_margin").width
-            text: catalog.i18nc("@label","Color scheme")
-        }
-
-        ListModel  // matches LayerView.py
-        {
-            id: layerViewTypes
-            ListElement {
-                text: "Material Color"
-                type_id: 0
-            }
-            ListElement {
-                text: "Line Type"
-                type_id: 1  // these ids match the switching in the shader
-            }
-        }
-
-        ComboBox
-        {
-            id: layerTypeCombobox
-            anchors.topMargin: UM.Theme.getSize("margin_small").height
-            anchors.top: layerViewTypesLabel.bottom
-            anchors.left: parent.left
-            anchors.leftMargin: UM.Theme.getSize("default_margin").width
-            anchors.right: parent.right
-            anchors.rightMargin: UM.Theme.getSize("default_margin").width
-            model: layerViewTypes
-            visible: !UM.LayerView.compatibilityMode
-            property int layer_view_type: UM.Preferences.getValue("layerview/layer_view_type")
-            currentIndex: layer_view_type  // index matches type_id
-            onActivated: {
-                // Combobox selection
-                var type_id = layerViewTypes.get(index).type_id;
-                UM.Preferences.setValue("layerview/layer_view_type", type_id);
-                updateLegend();
-            }
-            onModelChanged: {
-                updateLegend();
-            }
-            // Update visibility of legend.
-            function updateLegend() {
-                var type_id = layerViewTypes.get(currentIndex).type_id;
-                if (UM.LayerView.compatibilityMode || (type_id == 1)) {
-                    // Line type
-                    UM.LayerView.enableLegend();
-                } else {
-                    UM.LayerView.disableLegend();
-                }
-            }
-        }
-
-        Label
-        {
-            id: compatibilityModeLabel
-            anchors.top: parent.top
-            anchors.left: parent.left
-            text: catalog.i18nc("@label","Compatibility Mode")
-            visible: UM.LayerView.compatibilityMode
-        }
-
-        Connections {
-            target: UM.Preferences
-            onPreferenceChanged:
-            {
-                layerTypeCombobox.layer_view_type = UM.Preferences.getValue("layerview/layer_view_type");
-                view_settings.extruder0_checked = UM.Preferences.getValue("layerview/extruder0_opacity") > 0.5;
-                view_settings.extruder1_checked = UM.Preferences.getValue("layerview/extruder1_opacity") > 0.5;
-                view_settings.extruder2_checked = UM.Preferences.getValue("layerview/extruder2_opacity") > 0.5;
-                view_settings.extruder3_checked = UM.Preferences.getValue("layerview/extruder3_opacity") > 0.5;
-                view_settings.show_travel_moves = UM.Preferences.getValue("layerview/show_travel_moves");
-                view_settings.show_helpers = UM.Preferences.getValue("layerview/show_helpers");
-                view_settings.show_skin = UM.Preferences.getValue("layerview/show_skin");
-                view_settings.show_infill = UM.Preferences.getValue("layerview/show_infill");
-            }
-        }
 
         ColumnLayout {
             id: view_settings
@@ -128,19 +40,132 @@ Item
             property bool show_skin: UM.Preferences.getValue("layerview/show_skin")
             property bool show_infill: UM.Preferences.getValue("layerview/show_infill")
 
-            anchors.top: UM.LayerView.compatibilityMode ? compatibilityModeLabel.bottom : layerTypeCombobox.bottom
+            anchors.top: parent.top
             anchors.topMargin: UM.Theme.getSize("default_margin").height
             anchors.left: parent.left
             anchors.leftMargin: UM.Theme.getSize("default_margin").width
+            spacing: UM.Theme.getValue("layerview_row_spacing").height
+
+            Label
+            {
+                id: layersLabel
+                anchors.left: parent.left
+                text: catalog.i18nc("@label","View Mode: Layers")
+                font.bold: true
+            }
+
+            Label
+            {
+                id: spaceLabel
+                anchors.left: parent.left
+                text: " "
+                font.pointSize: 0.5
+            }
+
+            Label
+            {
+                id: layerViewTypesLabel
+                anchors.left: parent.left
+                text: catalog.i18nc("@label","Color scheme")
+                visible: !UM.LayerView.compatibilityMode
+                Layout.fillWidth: true
+            }
+
+            ListModel  // matches LayerView.py
+            {
+                id: layerViewTypes
+                ListElement {
+                    text: "Material Color"
+                    type_id: 0
+                }
+                ListElement {
+                    text: "Line Type"
+                    type_id: 1  // these ids match the switching in the shader
+                }
+            }
+
+            ComboBox
+            {
+                id: layerTypeCombobox
+                anchors.left: parent.left
+                Layout.fillWidth: true
+                Layout.preferredWidth: UM.Theme.getValue("layerview_row").width
+                model: layerViewTypes
+                visible: !UM.LayerView.compatibilityMode
+
+                property int layer_view_type: UM.Preferences.getValue("layerview/layer_view_type")
+                currentIndex: layer_view_type  // index matches type_id
+                onActivated: {
+                    // Combobox selection
+                    var type_id = layerViewTypes.get(index).type_id;
+                    UM.Preferences.setValue("layerview/layer_view_type", type_id);
+                    updateLegend();
+                }
+                onModelChanged: {
+                    updateLegend();
+                }
+
+                // Update visibility of legend.
+                function updateLegend() {
+                    var type_id = layerViewTypes.get(currentIndex).type_id;
+                    if (UM.LayerView.compatibilityMode || (type_id == 1)) {
+                        // Line type
+                        UM.LayerView.enableLegend();
+                    } else {
+                        UM.LayerView.disableLegend();
+                    }
+                }
+            }
+
+            Label
+            {
+                id: compatibilityModeLabel
+                //anchors.top: layersLabel.bottom
+                anchors.left: parent.left
+                text: catalog.i18nc("@label","Compatibility Mode")
+                visible: UM.LayerView.compatibilityMode
+                Layout.fillWidth: true
+                Layout.preferredHeight: UM.Theme.getSize("layerview_row").height
+                Layout.preferredWidth: UM.Theme.getValue("layerview_row").width
+            }
+
+            Label
+            {
+                id: space2Label
+                anchors.left: parent.left
+                text: " "
+                font.pointSize: 0.5
+            }
+
+            Connections {
+                target: UM.Preferences
+                onPreferenceChanged:
+                {
+                    layerTypeCombobox.layer_view_type = UM.Preferences.getValue("layerview/layer_view_type");
+                    view_settings.extruder0_checked = UM.Preferences.getValue("layerview/extruder0_opacity") > 0.5;
+                    view_settings.extruder1_checked = UM.Preferences.getValue("layerview/extruder1_opacity") > 0.5;
+                    view_settings.extruder2_checked = UM.Preferences.getValue("layerview/extruder2_opacity") > 0.5;
+                    view_settings.extruder3_checked = UM.Preferences.getValue("layerview/extruder3_opacity") > 0.5;
+                    view_settings.show_travel_moves = UM.Preferences.getValue("layerview/show_travel_moves");
+                    view_settings.show_helpers = UM.Preferences.getValue("layerview/show_helpers");
+                    view_settings.show_skin = UM.Preferences.getValue("layerview/show_skin");
+                    view_settings.show_infill = UM.Preferences.getValue("layerview/show_infill");
+                }
+            }
 
             CheckBox {
+                id: extruder0CheckBox
                 checked: view_settings.extruder0_checked
                 onClicked: {
                     UM.Preferences.setValue("layerview/extruder0_opacity", checked ? 1.0 : 0.0);
                 }
                 text: "Extruder 1"
                 visible: !UM.LayerView.compatibilityMode && (UM.LayerView.extruderCount >= 1)
+                Layout.fillWidth: true
+                Layout.preferredHeight: UM.Theme.getSize("layerview_row").height
+                Layout.preferredWidth: UM.Theme.getValue("layerview_row").width
             }
+
             CheckBox {
                 checked: view_settings.extruder1_checked
                 onClicked: {
@@ -148,6 +173,9 @@ Item
                 }
                 text: "Extruder 2"
                 visible: !UM.LayerView.compatibilityMode && (UM.LayerView.extruderCount >= 2)
+                Layout.fillWidth: true
+                Layout.preferredHeight: UM.Theme.getSize("layerview_row").height
+                Layout.preferredWidth: UM.Theme.getValue("layerview_row").width
             }
             CheckBox {
                 checked: view_settings.extruder2_checked
@@ -155,7 +183,9 @@ Item
                     UM.Preferences.setValue("layerview/extruder2_opacity", checked ? 1.0 : 0.0);
                 }
                 text: "Extruder 3"
-                visible: !UM.LayerView.compatibilityMode && (UM.LayerView.etruderCount >= 3)
+                visible: !UM.LayerView.compatibilityMode && (UM.LayerView.extruderCount >= 3)
+                Layout.preferredHeight: UM.Theme.getSize("layerview_row").height
+                Layout.preferredWidth: UM.Theme.getValue("layerview_row").width
             }
             CheckBox {
                 checked: view_settings.extruder3_checked
@@ -164,10 +194,14 @@ Item
                 }
                 text: "Extruder 4"
                 visible: !UM.LayerView.compatibilityMode && (UM.LayerView.extruderCount >= 4)
+                Layout.preferredHeight: UM.Theme.getSize("layerview_row").height
+                Layout.preferredWidth: UM.Theme.getValue("layerview_row").width
             }
             Label {
-                text: "Other extruders always visible"
+                text: "Other extr. always visible"
                 visible: !UM.LayerView.compatibilityMode && (UM.LayerView.extruderCount >= 5)
+                Layout.preferredHeight: UM.Theme.getSize("layerview_row").height
+                Layout.preferredWidth: UM.Theme.getValue("layerview_row").width
             }
             CheckBox {
                 checked: view_settings.show_travel_moves
@@ -175,6 +209,19 @@ Item
                     UM.Preferences.setValue("layerview/show_travel_moves", checked);
                 }
                 text: catalog.i18nc("@label", "Show Travels")
+                Rectangle {
+                    anchors.top: parent.top
+                    anchors.topMargin: 2
+                    anchors.right: parent.right
+                    width: UM.Theme.getSize("layerview_legend_size").width
+                    height: UM.Theme.getSize("layerview_legend_size").height
+                    color: "#00f"
+                    border.width: UM.Theme.getSize("default_lining").width
+                    border.color: UM.Theme.getColor("lining")
+                }
+                Layout.fillWidth: true
+                Layout.preferredHeight: UM.Theme.getSize("layerview_row").height
+                Layout.preferredWidth: UM.Theme.getValue("layerview_row").width
             }
             CheckBox {
                 checked: view_settings.show_helpers
@@ -182,6 +229,19 @@ Item
                     UM.Preferences.setValue("layerview/show_helpers", checked);
                 }
                 text: catalog.i18nc("@label", "Show Helpers")
+                Rectangle {
+                    anchors.top: parent.top
+                    anchors.topMargin: 2
+                    anchors.right: parent.right
+                    width: UM.Theme.getSize("layerview_legend_size").width
+                    height: UM.Theme.getSize("layerview_legend_size").height
+                    color: "#0ff"
+                    border.width: UM.Theme.getSize("default_lining").width
+                    border.color: UM.Theme.getColor("lining")
+                }
+                Layout.fillWidth: true
+                Layout.preferredHeight: UM.Theme.getSize("layerview_row").height
+                Layout.preferredWidth: UM.Theme.getValue("layerview_row").width
             }
             CheckBox {
                 checked: view_settings.show_skin
@@ -189,6 +249,19 @@ Item
                     UM.Preferences.setValue("layerview/show_skin", checked);
                 }
                 text: catalog.i18nc("@label", "Show Shell")
+                Rectangle {
+                    anchors.top: parent.top
+                    anchors.topMargin: 2
+                    anchors.right: parent.right
+                    width: UM.Theme.getSize("layerview_legend_size").width
+                    height: UM.Theme.getSize("layerview_legend_size").height
+                    color: "#f00"
+                    border.width: UM.Theme.getSize("default_lining").width
+                    border.color: UM.Theme.getColor("lining")
+                }
+                Layout.fillWidth: true
+                Layout.preferredHeight: UM.Theme.getSize("layerview_row").height
+                Layout.preferredWidth: UM.Theme.getValue("layerview_row").width
             }
             CheckBox {
                 checked: view_settings.show_infill
@@ -196,141 +269,177 @@ Item
                     UM.Preferences.setValue("layerview/show_infill", checked);
                 }
                 text: catalog.i18nc("@label", "Show Infill")
+                Rectangle {
+                    anchors.top: parent.top
+                    anchors.topMargin: 2
+                    anchors.right: parent.right
+                    width: UM.Theme.getSize("layerview_legend_size").width
+                    height: UM.Theme.getSize("layerview_legend_size").height
+                    color: "#f80"
+                    border.width: UM.Theme.getSize("default_lining").width
+                    border.color: UM.Theme.getColor("lining")
+                }
+                Layout.fillWidth: true
+                Layout.preferredHeight: UM.Theme.getSize("layerview_row").height
+                Layout.preferredWidth: UM.Theme.getValue("layerview_row").width
             }
-        }
-    }
 
-    Slider
+            Label
-    {
+            {
-        id: sliderMinimumLayer
+                id: topBottomLabel
-        width: UM.Theme.getSize("slider_layerview_size").width
+                anchors.left: parent.left
-        height: UM.Theme.getSize("slider_layerview_size").height
+                text: catalog.i18nc("@label","Top / Bottom")
-        anchors.left: layerViewMenu.right
+                Rectangle {
-        anchors.leftMargin: UM.Theme.getSize("slider_layerview_margin").width * 0.2
+                    anchors.top: parent.top
-        orientation: Qt.Vertical
+                    anchors.topMargin: 2
-        minimumValue: 0;
+                    anchors.right: parent.right
-        maximumValue: UM.LayerView.numLayers-1;
+                    width: UM.Theme.getSize("layerview_legend_size").width
-        stepSize: 1
+                    height: UM.Theme.getSize("layerview_legend_size").height
-
+                    color: "#ff0"
-        property real pixelsPerStep: ((height - UM.Theme.getSize("slider_handle").height) / (maximumValue - minimumValue)) * stepSize;
+                    border.width: UM.Theme.getSize("default_lining").width
-
+                    border.color: UM.Theme.getColor("lining")
-        value: UM.LayerView.minimumLayer
+                }
-        onValueChanged: {
+                Layout.fillWidth: true
-            UM.LayerView.setMinimumLayer(value)
+                Layout.preferredHeight: UM.Theme.getSize("layerview_row").height
-            if (value > UM.LayerView.currentLayer) {
+                Layout.preferredWidth: UM.Theme.getValue("layerview_row").width
-                UM.LayerView.setCurrentLayer(value);
             }
+
+            Label
+            {
+                id: innerWallLabel
+                anchors.left: parent.left
+                text: catalog.i18nc("@label","Inner Wall")
+                Rectangle {
+                    anchors.top: parent.top
+                    anchors.topMargin: 2
+                    anchors.right: parent.right
+                    width: UM.Theme.getSize("layerview_legend_size").width
+                    height: UM.Theme.getSize("layerview_legend_size").height
+                    color: "#0f0"
+                    border.width: UM.Theme.getSize("default_lining").width
+                    border.color: UM.Theme.getColor("lining")
+                }
+                Layout.fillWidth: true
+                Layout.preferredHeight: UM.Theme.getSize("layerview_row").height
+                Layout.preferredWidth: UM.Theme.getValue("layerview_row").width
+            }
+
         }
 
-        style: UM.Theme.styles.slider;
+        Slider
-    }
+        {
+            id: sliderMinimumLayer
+            width: UM.Theme.getSize("slider_layerview_size").width
+            height: parent.height - 2*UM.Theme.getSize("slider_layerview_margin").height // UM.Theme.getSize("slider_layerview_size").height
+            anchors.top: parent.top
+            anchors.topMargin: UM.Theme.getSize("slider_layerview_margin").height
+            anchors.right: layerViewMenu.right
+            anchors.rightMargin: UM.Theme.getSize("slider_layerview_margin").width * 0.8
+            orientation: Qt.Vertical
+            minimumValue: 0;
+            maximumValue: UM.LayerView.numLayers-1;
+            stepSize: 1
 
-    Slider
+            property real pixelsPerStep: ((height - UM.Theme.getSize("slider_handle").height) / (maximumValue - minimumValue)) * stepSize;
-    {
-        id: slider
-        width: UM.Theme.getSize("slider_layerview_size").width
-        height: UM.Theme.getSize("slider_layerview_size").height
-        anchors.left: layerViewMenu.right
-        anchors.leftMargin: UM.Theme.getSize("slider_layerview_margin").width * 0.8
-        orientation: Qt.Vertical
-        minimumValue: 0;
-        maximumValue: UM.LayerView.numLayers;
-        stepSize: 1
 
-        property real pixelsPerStep: ((height - UM.Theme.getSize("slider_handle").height) / (maximumValue - minimumValue)) * stepSize;
+            value: UM.LayerView.minimumLayer
-
+            onValueChanged: {
-        value: UM.LayerView.currentLayer
+                UM.LayerView.setMinimumLayer(value)
-        onValueChanged: {
+                if (value > UM.LayerView.currentLayer) {
-                UM.LayerView.setCurrentLayer(value);
+                    UM.LayerView.setCurrentLayer(value);
-                if (value < UM.LayerView.minimumLayer) {
-                    UM.LayerView.setMinimumLayer(value);
                 }
             }
 
-        style: UM.Theme.styles.slider;
+            style: UM.Theme.styles.slider;
+        }
 
-        Rectangle
+        Slider
         {
-            x: parent.width + UM.Theme.getSize("slider_layerview_background").width / 2;
+            id: slider
-            y: parent.height - (parent.value * parent.pixelsPerStep) - UM.Theme.getSize("slider_handle").height * 1.25;
+            width: UM.Theme.getSize("slider_layerview_size").width
+            height: parent.height - 2*UM.Theme.getSize("slider_layerview_margin").height  //UM.Theme.getSize("slider_layerview_size").height
+            anchors.top: parent.top
+            anchors.topMargin: UM.Theme.getSize("slider_layerview_margin").height
+            anchors.right: layerViewMenu.right
+            anchors.rightMargin: UM.Theme.getSize("slider_layerview_margin").width * 0.2
+            orientation: Qt.Vertical
+            minimumValue: 0;
+            maximumValue: UM.LayerView.numLayers;
+            stepSize: 1
 
-            height: UM.Theme.getSize("slider_handle").height + UM.Theme.getSize("default_margin").height
+            property real pixelsPerStep: ((height - UM.Theme.getSize("slider_handle").height) / (maximumValue - minimumValue)) * stepSize;
-            width: valueLabel.width + UM.Theme.getSize("default_margin").width
-            Behavior on height { NumberAnimation { duration: 50; } }
 
-            border.width: UM.Theme.getSize("default_lining").width
+            value: UM.LayerView.currentLayer
-            border.color: UM.Theme.getColor("slider_groove_border")
+            onValueChanged: {
-            color: UM.Theme.getColor("tool_panel_background")
+                    UM.LayerView.setCurrentLayer(value);
-
+                    if (value < UM.LayerView.minimumLayer) {
-            visible: UM.LayerView.layerActivity && Printer.platformActivity ? true : false
+                        UM.LayerView.setMinimumLayer(value);
-
-            TextField
-            {
-                id: valueLabel
-                property string maxValue: slider.maximumValue + 1
-                text: slider.value + 1
-                horizontalAlignment: TextInput.AlignRight;
-                onEditingFinished:
-                {
-                    // Ensure that the cursor is at the first position. On some systems the text isn't fully visible
-                    // Seems to have to do something with different dpi densities that QML doesn't quite handle.
-                    // Another option would be to increase the size even further, but that gives pretty ugly results.
-                    cursorPosition = 0;
-                    if(valueLabel.text != '')
-                    {
-                        slider.value = valueLabel.text - 1;
                     }
                 }
-                validator: IntValidator { bottom: 1; top: slider.maximumValue + 1; }
 
-                anchors.left: parent.left;
+            style: UM.Theme.styles.slider;
-                anchors.leftMargin: UM.Theme.getSize("default_margin").width / 2;
-                anchors.verticalCenter: parent.verticalCenter;
 
-                width: Math.max(UM.Theme.getSize("line").width * maxValue.length + 2, 20);
+            Rectangle
-                style: TextFieldStyle
+            {
+                x: parent.width + UM.Theme.getSize("slider_layerview_background").width / 2;
+                y: parent.height - (parent.value * parent.pixelsPerStep) - UM.Theme.getSize("slider_handle").height * 1.25;
+
+                height: UM.Theme.getSize("slider_handle").height + UM.Theme.getSize("default_margin").height
+                width: valueLabel.width + UM.Theme.getSize("default_margin").width
+                Behavior on height { NumberAnimation { duration: 50; } }
+
+                border.width: UM.Theme.getSize("default_lining").width
+                border.color: UM.Theme.getColor("slider_groove_border")
+                color: UM.Theme.getColor("tool_panel_background")
+
+                visible: UM.LayerView.layerActivity && Printer.platformActivity ? true : false
+
+                TextField
                 {
-                    textColor: UM.Theme.getColor("setting_control_text");
+                    id: valueLabel
-                    font: UM.Theme.getFont("default");
+                    property string maxValue: slider.maximumValue + 1
-                    background: Item { }
+                    text: slider.value + 1
+                    horizontalAlignment: TextInput.AlignRight;
+                    onEditingFinished:
+                    {
+                        // Ensure that the cursor is at the first position. On some systems the text isn't fully visible
+                        // Seems to have to do something with different dpi densities that QML doesn't quite handle.
+                        // Another option would be to increase the size even further, but that gives pretty ugly results.
+                        cursorPosition = 0;
+                        if(valueLabel.text != '')
+                        {
+                            slider.value = valueLabel.text - 1;
+                        }
+                    }
+                    validator: IntValidator { bottom: 1; top: slider.maximumValue + 1; }
+
+                    anchors.left: parent.left;
+                    anchors.leftMargin: UM.Theme.getSize("default_margin").width / 2;
+                    anchors.verticalCenter: parent.verticalCenter;
+
+                    width: Math.max(UM.Theme.getSize("line").width * maxValue.length + 2, 20);
+                    style: TextFieldStyle
+                    {
+                        textColor: UM.Theme.getColor("setting_control_text");
+                        font: UM.Theme.getFont("default");
+                        background: Item { }
+                    }
+                }
+
+                BusyIndicator
+                {
+                    id: busyIndicator;
+                    anchors.left: parent.right;
+                    anchors.leftMargin: UM.Theme.getSize("default_margin").width / 2;
+                    anchors.verticalCenter: parent.verticalCenter;
+
+                    width: UM.Theme.getSize("slider_handle").height;
+                    height: width;
+
+                    running: UM.LayerView.busy;
+                    visible: UM.LayerView.busy;
                 }
             }
-
-            BusyIndicator
-            {
-                id: busyIndicator;
-                anchors.left: parent.right;
-                anchors.leftMargin: UM.Theme.getSize("default_margin").width / 2;
-                anchors.verticalCenter: parent.verticalCenter;
-
-                width: UM.Theme.getSize("slider_handle").height;
-                height: width;
-
-                running: UM.LayerView.busy;
-                visible: UM.LayerView.busy;
-            }
         }
     }
-
-    Rectangle {
-        id: slider_background
-        anchors.left: layerViewMenu.right
-        anchors.verticalCenter: parent.verticalCenter
-        z: slider.z - 1
-        width: UM.Theme.getSize("slider_layerview_background").width
-        height: slider.height + UM.Theme.getSize("default_margin").height * 2
-        color: UM.Theme.getColor("tool_panel_background");
-        border.width: UM.Theme.getSize("default_lining").width
-        border.color: UM.Theme.getColor("lining")
-
-        MouseArea {
-            id: sliderMouseArea
-            property double manualStepSize: slider.maximumValue / 11
-            anchors.fill: parent
-            onWheel: {
-                slider.value = wheel.angleDelta.y < 0 ? slider.value - sliderMouseArea.manualStepSize : slider.value + sliderMouseArea.manualStepSize
-            }
-        }
-    }
-
 }

resources/themes/cura/theme.json

@@ -291,11 +291,14 @@
 
         "slider_groove": [0.5, 0.5],
         "slider_handle": [1.5, 1.5],
-        "slider_layerview_size": [1.0, 16.0],
+        "slider_layerview_size": [1.0, 22.0],
         "slider_layerview_background": [4.0, 0.0],
-        "slider_layerview_margin": [3.0, 3.0],
+        "slider_layerview_margin": [3.0, 1.0],
 
-        "layerview_menu_size": [12.0, 25.0],
+        "layerview_menu_size": [17.0, 20.0],
+        "layerview_legend_size": [1.0, 1.0],
+        "layerview_row": [11.0, 1.5],
+        "layerview_row_spacing": [0.0, 0.5],
 
         "checkbox": [2.0, 2.0],