diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml index 7c82a7324d..83cc59838b 100644 --- a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml +++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml @@ -104,7 +104,7 @@ Item { id: buttonRow property real padding: UM.Theme.getSize("default_margin").width - height: childrenRect.height + 2 * padding + height: recommendedButton.height + 2 * padding anchors { @@ -149,9 +149,8 @@ Item left: parent.left right: parent.right bottom: parent.bottom - top: recommendedButton.bottom - topMargin: UM.Theme.getSize("default_lining").height } + height: childrenRect.height cursorShape: Qt.SplitVCursor visible: currentModeIndex == PrintSetupSelectorContents.Mode.Custom drag @@ -182,15 +181,29 @@ Item } } - UM.RecolorImage + Rectangle { - width: parent.width * 0.05 - height: parent.height * 0.3 + width: parent.width + height: UM.Theme.getSize("narrow_margin").height + color: UM.Theme.getColor("secondary") - anchors.centerIn: parent + Rectangle + { + anchors.bottom: parent.top + width: parent.width + height: UM.Theme.getSize("default_lining").height + color: UM.Theme.getColor("lining") + } - source: UM.Theme.getIcon("grip_lines") - color: UM.Theme.getColor("lining") + UM.RecolorImage + { + width: UM.Theme.getSize("drag_icon").width + height: UM.Theme.getSize("drag_icon").height + anchors.centerIn: parent + + source: UM.Theme.getIcon("resize") + color: UM.Theme.getColor("small_button_text") + } } } } diff --git a/resources/themes/cura-light/icons/grip_lines.svg b/resources/themes/cura-light/icons/grip_lines.svg deleted file mode 100644 index 253d1fb486..0000000000 --- a/resources/themes/cura-light/icons/grip_lines.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/resize.svg b/resources/themes/cura-light/icons/resize.svg new file mode 100644 index 0000000000..d6a16649e1 --- /dev/null +++ b/resources/themes/cura-light/icons/resize.svg @@ -0,0 +1,15 @@ + + + + Group + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index ea1c64e2ac..cd27d16cc6 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -442,6 +442,7 @@ "print_setup_slider_tickmarks": [0.32, 0.32], "print_setup_big_item": [28, 2.5], "print_setup_icon": [1.2, 1.2], + "drag_icon": [1.416, 0.25], "expandable_component_content_header": [0.0, 3.0],