GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 05:39:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4884 from Ultimaker/add_border_to_rounded_rectangle

Browse Source 
Add border to rounded rectangle.
This commit is contained in:
Diego Prado Gesto 2018-11-26 15:40:02 +01:00 committed by GitHub
commit d1a5d548a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
resources/qml/BorderGroup.qml Normal file
View File

@ -0,0 +1,10 @@
// Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.0
QtObject
{
property real width: 0
property color color: "black"
}

23
resources/qml/RoundedRectangle.qml
View File

@ -5,6 +5,7 @@ import UM 1.2 as UM
// The rounded rectangle works mostly like a regular rectangle, but provides the option to have rounded corners on only one side of the rectangle. // The rounded rectangle works mostly like a regular rectangle, but provides the option to have rounded corners on only one side of the rectangle.
Item Item
{ {
id: roundedRectangle
// As per the regular rectangle // As per the regular rectangle
property color color: "transparent" property color color: "transparent"
@ -15,6 +16,9 @@ Item
// 1 is down, 2 is left, 3 is up and 4 is right. // 1 is down, 2 is left, 3 is up and 4 is right.
property int cornerSide: RoundedRectangle.Direction.None property int cornerSide: RoundedRectangle.Direction.None
// Simple object to ensure that border.width and border.color work
property BorderGroup border: BorderGroup {}
enum Direction enum Direction
{ {
None = 0, None = 0,
@ -31,6 +35,8 @@ Item
anchors.fill: parent anchors.fill: parent
radius: cornerSide != RoundedRectangle.Direction.None ? parent.radius : 0 radius: cornerSide != RoundedRectangle.Direction.None ? parent.radius : 0
color: parent.color color: parent.color
border.width: parent.border.width
border.color: parent.border.color
} }
// The item that covers 2 of the corners to make them not rounded. // The item that covers 2 of the corners to make them not rounded.
@ -45,5 +51,22 @@ Item
right: cornerSide == RoundedRectangle.Direction.Left ? parent.right: undefined right: cornerSide == RoundedRectangle.Direction.Left ? parent.right: undefined
bottom: cornerSide == RoundedRectangle.Direction.Up ? parent.bottom: undefined bottom: cornerSide == RoundedRectangle.Direction.Up ? parent.bottom: undefined
} }
border.width: parent.border.width
border.color: parent.border.color
Rectangle
{
color: roundedRectangle.color
height: cornerSide % 2 ? roundedRectangle.border.width: roundedRectangle.height - 2 * roundedRectangle.border.width
width: cornerSide % 2 ? roundedRectangle.width - 2 * roundedRectangle.border.width: roundedRectangle.border.width
anchors
{
right: cornerSide == RoundedRectangle.Direction.Right ? parent.right : undefined
bottom: cornerSide == RoundedRectangle.Direction.Down ? parent.bottom: undefined
horizontalCenter: cornerSide % 2 ? parent.horizontalCenter: undefined
verticalCenter: cornerSide % 2 ? undefined: parent.verticalCenter
}
}
} }
} }