Merge branch 'feature_pointing_rectangle_borders' of https://github.com/fieldOfView/Cura

This commit is contained in:
Jaime van Kessel 2017-07-05 10:22:54 +02:00
commit 84b522a4c8
2 changed files with 11 additions and 25 deletions

View file

@ -106,22 +106,13 @@ Item
opacity: panel.item && panel.width > 0 ? 1 : 0
Behavior on opacity { NumberAnimation { duration: 100 } }
color: UM.Theme.getColor("lining");
color: UM.Theme.getColor("tool_panel_background")
borderColor: UM.Theme.getColor("lining")
borderWidth: UM.Theme.getSize("default_lining").width
UM.PointingRectangle
MouseArea //Catch all mouse events (so scene doesnt handle them)
{
id: panelBackground;
color: UM.Theme.getColor("tool_panel_background");
anchors.fill: parent
anchors.margins: UM.Theme.getSize("default_lining").width
target: Qt.point(-UM.Theme.getSize("default_margin").width, UM.Theme.getSize("button").height/2)
arrowSize: parent.arrowSize
MouseArea //Catch all mouse events (so scene doesnt handle them)
{
anchors.fill: parent
}
}
Loader