From c6f17699f84aa21b169f7b90e15e9c68f19aedba Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Date: Wed, 19 Nov 2014 10:35:27 +0100
Subject: QmlDesigner: Fixing highlighting for UrlChooser

Change-Id: I47a7fc2e92247b1f4a8d81432a4ad020efd87ce9
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
---
 .../propertyEditorQmlSources/HelperWidgets/ColorLogic.qml         | 1 +
 .../propertyEditorQmlSources/HelperWidgets/UrlChooser.qml         | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'share/qtcreator')

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorLogic.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorLogic.qml
index fb44d7aaab..b143f6fdb9 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorLogic.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorLogic.qml
@@ -42,6 +42,7 @@ QtObject {
     property bool baseStateFlag: isBaseState;
     property bool isInModel: backendValue.isInModel;
     property bool isInSubState: backendValue.isInSubState;
+    property bool highlight: textColor == Constants.colorsChangedBaseText
 
     onBackendValueChanged: {
         evaluate();
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/UrlChooser.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/UrlChooser.qml
index 8a0b870dc6..00f75c4e4f 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/UrlChooser.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/UrlChooser.qml
@@ -48,7 +48,7 @@ RowLayout {
     id: urlChooser
     property variant backendValue
 
-    property color textColor: "white"
+    property color textColor: colorLogic.highlight ? colorLogic.textColor : "white"
 
     property string filter: "*.png *.gif *.jpg *.bmp *.jpeg *.svg"
 
@@ -59,8 +59,12 @@ RowLayout {
         id: fileModel
     }
 
-    Controls.ComboBox {
+    ColorLogic {
+        id: colorLogic
+        backendValue: urlChooser.backendValue
+    }
 
+    Controls.ComboBox {
         id: comboBox
 
         property bool isComplete: false
-- 
cgit v1.2.1