feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fixing highlighting for UrlChooser

Browse Source 
Change-Id: I47a7fc2e92247b1f4a8d81432a4ad020efd87ce9
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2014-11-19 10:35:27 +01:00
committed by Thomas Hartmann
parent f451908de4
commit c6f17699f8
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorLogic.qml
View File

@@ -42,6 +42,7 @@ QtObject {
property bool baseStateFlag: isBaseState; property bool baseStateFlag: isBaseState;
property bool isInModel: backendValue.isInModel; property bool isInModel: backendValue.isInModel;
property bool isInSubState: backendValue.isInSubState; property bool isInSubState: backendValue.isInSubState;
property bool highlight: textColor == Constants.colorsChangedBaseText
onBackendValueChanged: { onBackendValueChanged: {
evaluate(); evaluate();

8
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/UrlChooser.qml
View File

@@ -48,7 +48,7 @@ RowLayout {
id: urlChooser id: urlChooser
property variant backendValue property variant backendValue
property color textColor: "white" property color textColor: colorLogic.highlight ? colorLogic.textColor : "white"
property string filter: "*.png *.gif *.jpg *.bmp *.jpeg *.svg" property string filter: "*.png *.gif *.jpg *.bmp *.jpeg *.svg"
@@ -59,8 +59,12 @@ RowLayout {
id: fileModel id: fileModel
} }
Controls.ComboBox { ColorLogic {
id: colorLogic
backendValue: urlChooser.backendValue
}
Controls.ComboBox {
id: comboBox id: comboBox
property bool isComplete: false property bool isComplete: false