From 8366bb169400d1ba2b9c39e1bc07137f02a30364 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Fri, 5 Aug 2016 09:43:30 +0200
Subject: [PATCH] QmlDesigner: Fix visibility of Origin control

Give the control the same border like all other controls. This improves
the visibility with the light theme.

Repeated 9 times. Needs to be made a component in master.

Change-Id: I11afa8c7ef628582c3d94fa8b42a27fb4f6e1368
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../HelperWidgets/OriginControl.qml           | 39 ++++++++++---------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/OriginControl.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/OriginControl.qml
index 72cd9eaecfe..0aeaa9232a6 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/OriginControl.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/OriginControl.qml
@@ -32,7 +32,8 @@ Item {
 
 
     property variant backendValue
-    property color borderColor: colorLogic.textColor
+    property color borderColorSelected: colorLogic.textColor
+    property color borderColor: creatorTheme.QmlDesignerBorderColor
 
     property bool showTranslateCheckBox: true
 
@@ -101,8 +102,8 @@ Item {
             width: 15
             height: 15
             color: selected ? selectedColor : unselectedColor
-            border.color: originControl.borderColor
-            border.width: selected ? 2 : 0
+            border.width: selected ? 2 : 1
+            border.color: selected ? originControl.borderColorSelected : originControl.borderColor
             MouseArea {
                 anchors.fill: parent
                 onClicked: {
@@ -116,8 +117,8 @@ Item {
             width: topLeft.width
             height: topLeft.height
             color: selected ? selectedColor : unselectedColor
-            border.width: selected ? 2 : 0
-            border.color: originControl.borderColor
+            border.width: selected ? 2 : 1
+            border.color: selected ? originControl.borderColorSelected : originControl.borderColor
             MouseArea {
                 anchors.fill: parent
                 onClicked: {
@@ -131,8 +132,8 @@ Item {
             width: topLeft.width
             height: topLeft.height
             color: selected ? selectedColor : unselectedColor
-            border.width: selected ? 2 : 0
-            border.color: originControl.borderColor
+            border.width: selected ? 2 : 1
+            border.color: selected ? originControl.borderColorSelected : originControl.borderColor
             MouseArea {
                 anchors.fill: parent
                 onClicked: {
@@ -146,8 +147,8 @@ Item {
             width: topLeft.width
             height: topLeft.height
             color: selected ? selectedColor : unselectedColor
-            border.width: selected ? 2 : 0
-            border.color: originControl.borderColor
+            border.width: selected ? 2 : 1
+            border.color: selected ? originControl.borderColorSelected : originControl.borderColor
             MouseArea {
                 anchors.fill: parent
                 onClicked: {
@@ -161,8 +162,8 @@ Item {
             width: topLeft.width
             height: topLeft.height
             color: selected ? selectedColor : unselectedColor
-            border.width: selected ? 2 : 0
-            border.color: originControl.borderColor
+            border.width: selected ? 2 : 1
+            border.color: selected ? originControl.borderColorSelected : originControl.borderColor
             MouseArea {
                 anchors.fill: parent
                 onClicked: {
@@ -176,8 +177,8 @@ Item {
             width: topLeft.width
             height: topLeft.height
             color: selected ? selectedColor : unselectedColor
-            border.width: selected ? 2 : 0
-            border.color: originControl.borderColor
+            border.width: selected ? 2 : 1
+            border.color: selected ? originControl.borderColorSelected : originControl.borderColor
             MouseArea {
                 anchors.fill: parent
                 onClicked: {
@@ -191,8 +192,8 @@ Item {
             width: topLeft.width
             height: topLeft.height
             color: selected ? selectedColor : unselectedColor
-            border.width: selected ? 2 : 0
-            border.color: originControl.borderColor
+            border.width: selected ? 2 : 1
+            border.color: selected ? originControl.borderColorSelected : originControl.borderColor
             MouseArea {
                 anchors.fill: parent
                 onClicked: {
@@ -206,8 +207,8 @@ Item {
             width: topLeft.width
             height: topLeft.height
             color: selected ? selectedColor : unselectedColor
-            border.width: selected ? 2 : 0
-            border.color: originControl.borderColor
+            border.width: selected ? 2 : 1
+            border.color: selected ? originControl.borderColorSelected : originControl.borderColor
             MouseArea {
                 anchors.fill: parent
                 onClicked: {
@@ -221,8 +222,8 @@ Item {
             width: topLeft.width
             height: topLeft.height
             color: selected ? selectedColor : unselectedColor
-            border.width: selected ? 2 : 0
-            border.color: originControl.borderColor
+            border.width: selected ? 2 : 1
+            border.color: selected ? originControl.borderColorSelected : originControl.borderColor
             MouseArea {
                 anchors.fill: parent
                 onClicked: {