From 9732099250f9085137883907293f5dbd1080691a Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Mon, 26 Nov 2018 15:14:32 +0100
Subject: [PATCH 1/2] Add border to rounded rectangle.

It's designed so that it works in exactly the same way as rectangle.
---
 resources/qml/BorderGroup.qml      |  7 +++++++
 resources/qml/RoundedRectangle.qml | 23 +++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 resources/qml/BorderGroup.qml

diff --git a/resources/qml/BorderGroup.qml b/resources/qml/BorderGroup.qml
new file mode 100644
index 0000000000..94d0d68594
--- /dev/null
+++ b/resources/qml/BorderGroup.qml
@@ -0,0 +1,7 @@
+import QtQuick 2.0
+
+QtObject
+{
+    property real width: 0
+    property color color: "black"
+}
diff --git a/resources/qml/RoundedRectangle.qml b/resources/qml/RoundedRectangle.qml
index 9ad2230be5..3ca05e2125 100644
--- a/resources/qml/RoundedRectangle.qml
+++ b/resources/qml/RoundedRectangle.qml
@@ -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.
 Item
 {
+    id: roundedRectangle
     // As per the regular rectangle
     property color color: "transparent"
 
@@ -15,6 +16,9 @@ Item
     // 1 is down, 2 is left, 3 is up and 4 is right.
     property int cornerSide: RoundedRectangle.Direction.None
 
+    // Simple object to ensure that border.width and border.color work
+    property BorderGroup border: BorderGroup {}
+
     enum Direction
     {
         None = 0,
@@ -31,6 +35,8 @@ Item
         anchors.fill: parent
         radius: cornerSide != RoundedRectangle.Direction.None ? parent.radius : 0
         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.
@@ -45,5 +51,22 @@ Item
             right: cornerSide == RoundedRectangle.Direction.Left ? parent.right: 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
+            }
+        }
     }
 }

From 9afc5748a8ec1eb7bbbdb8ba7395f7b3d2554a49 Mon Sep 17 00:00:00 2001
From: Diego Prado Gesto <d.pradogesto@ultimaker.com>
Date: Mon, 26 Nov 2018 15:39:34 +0100
Subject: [PATCH 2/2] Add copyright header.

---
 resources/qml/BorderGroup.qml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/qml/BorderGroup.qml b/resources/qml/BorderGroup.qml
index 94d0d68594..38ad9fadff 100644
--- a/resources/qml/BorderGroup.qml
+++ b/resources/qml/BorderGroup.qml
@@ -1,3 +1,6 @@
+// Copyright (c) 2018 Ultimaker B.V.
+// Cura is released under the terms of the LGPLv3 or higher.
+
 import QtQuick 2.0
 
 QtObject