Merge pull request #5172 from Ultimaker/resize_bar_ui_changes

Change the style of the resize bar
This commit is contained in:
Remco Burema 2019-01-17 16:59:18 +01:00 committed by GitHub
commit e7ba543fec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 13 deletions

View file

@ -109,7 +109,7 @@ Item
{
id: buttonRow
property real padding: UM.Theme.getSize("default_margin").width
height: childrenRect.height + 2 * padding
height: recommendedButton.height + 2 * padding + (draggableArea.visible ? draggableArea.height : 0)
anchors
{
@ -149,14 +149,14 @@ Item
//Invisible area at the bottom with which you can resize the panel.
MouseArea
{
id: draggableArea
anchors
{
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
@ -187,15 +187,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")
}
}
}
}