3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-19 04:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Replace mock borders with true borders

Browse source
This commit is contained in:
fieldOfView 2017-06-22 16:52:11 +02:00
parent 8a55469499
commit 5fec3d4f6d
2 changed files with 11 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

17
plugins/LayerView/LayerView.qml
View file

@ -39,6 +39,8 @@ Item
height: parent.height height: parent.height
z: slider.z - 1 z: slider.z - 1
color: UM.Theme.getColor("tool_panel_background") color: UM.Theme.getColor("tool_panel_background")
borderWidth: UM.Theme.getSize("default_lining").width
borderColor: UM.Theme.getColor("lining")
target: parent.buttonTarget target: parent.buttonTarget
arrowSize: UM.Theme.getSize("default_arrow").width arrowSize: UM.Theme.getSize("default_arrow").width
@ -530,27 +532,20 @@ Item
target: Qt.point(0, slider.activeHandle.y + slider.activeHandle.height / 2) target: Qt.point(0, slider.activeHandle.y + slider.activeHandle.height / 2)
arrowSize: UM.Theme.getSize("default_arrow").width arrowSize: UM.Theme.getSize("default_arrow").width
height: (Math.floor(UM.Theme.getSize("slider_handle").height + UM.Theme.getSize("default_margin").height) / 2) * 2 // Make sure height has an integer middle so drawing a pointy border is easier height: UM.Theme.getSize("slider_handle").height + UM.Theme.getSize("default_margin").height
width: valueLabel.width + UM.Theme.getSize("default_margin").width width: valueLabel.width + UM.Theme.getSize("default_margin").width
Behavior on height { NumberAnimation { duration: 50; } } Behavior on height { NumberAnimation { duration: 50; } }
color: UM.Theme.getColor("lining"); color: UM.Theme.getColor("tool_panel_background")
borderColor: UM.Theme.getColor("lining")
borderWidth: UM.Theme.getSize("default_lining").width
visible: slider.layersVisible visible: slider.layersVisible
UM.PointingRectangle
{
color: UM.Theme.getColor("tool_panel_background")
target: Qt.point(0, height / 2 + UM.Theme.getSize("default_lining").width)
arrowSize: UM.Theme.getSize("default_arrow").width
anchors.fill: parent
anchors.margins: UM.Theme.getSize("default_lining").width
MouseArea //Catch all mouse events (so scene doesnt handle them) MouseArea //Catch all mouse events (so scene doesnt handle them)
{ {
anchors.fill: parent anchors.fill: parent
} }
}
TextField TextField
{ {

15
resources/qml/Toolbar.qml
View file

@ -106,23 +106,14 @@ Item
opacity: panel.item && panel.width > 0 ? 1 : 0 opacity: panel.item && panel.width > 0 ? 1 : 0
Behavior on opacity { NumberAnimation { duration: 100 } } 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
{
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) MouseArea //Catch all mouse events (so scene doesnt handle them)
{ {
anchors.fill: parent anchors.fill: parent
} }
}
Loader Loader
{ {