Commit 8f393efe authored by Thomas Hartmann's avatar Thomas Hartmann

Adding QmlDesigner highlight color to Theme

Change-Id: I73d6ec3b7bff5e161de54a3287e3352435753234
Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@theqtcompany.com>
parent 74f93fe5
......@@ -40,7 +40,7 @@ QtObject {
property bool highlight: textColor === __changedTextColor
property color __defaultTextColor: creatorTheme.PanelTextColorLight
property color __changedTextColor: Constants.colorsChangedBaseText
readonly property color __changedTextColor: creatorTheme.QmlDesigner_HighlightColor
onBackendValueChanged: {
evaluate();
......@@ -68,7 +68,7 @@ QtObject {
if (baseStateFlag) {
if (innerObject.backendValue.isInModel)
innerObject.textColor = Constants.colorsChangedBaseText
innerObject.textColor = __changedTextColor
else
innerObject.textColor = creatorTheme.PanelTextColorLight
} else {
......
......@@ -28,5 +28,4 @@
var colorsDisabledText = "gray"
var colorsDefaultText = "white"
var colorsBoldText = "#dedede"
var colorsChangedBaseText = "#9999ff"
var colorsChangedStateText = "#99ccff"
......@@ -200,6 +200,8 @@ PaletteWindowTextDisabled=textDisabled
PaletteBaseDisabled=backgroundColorDisabled
PaletteTextDisabled=textDisabled
QmlDesigner_HighlightColor=ff9999ff
[Flags]
ComboBoxDrawTextShadow=false
DerivePaletteFromTheme=true
......
......@@ -171,6 +171,8 @@ ProjectExplorer_TaskWarn_TextMarkColor=ffffa500
ClangCodeModel_Error_TextMarkColor=ffff882f
ClangCodeModel_Warning_TextMarkColor=ffc6c132
QmlDesigner_HighlightColor=ff9999ff
[Flags]
ComboBoxDrawTextShadow=true
DerivePaletteFromTheme=false
......
......@@ -185,6 +185,8 @@ ProjectExplorer_TaskWarn_TextMarkColor=ffffff40
ClangCodeModel_Error_TextMarkColor=ffff882f
ClangCodeModel_Warning_TextMarkColor=ffceff40
QmlDesigner_HighlightColor=ff9999ff
PaletteWindow=normalBackground
PaletteWindowText=text
PaletteBase=normalBackground
......
......@@ -182,6 +182,8 @@ ProjectExplorer_TaskWarn_TextMarkColor=ffffa500
ClangCodeModel_Error_TextMarkColor=ffff882f
ClangCodeModel_Warning_TextMarkColor=ffc6c132
QmlDesigner_HighlightColor=ff9999ff
[Flags]
ComboBoxDrawTextShadow=false
DerivePaletteFromTheme=false
......
......@@ -181,6 +181,8 @@ ProjectExplorer_TaskWarn_TextMarkColor=ffffa500
ClangCodeModel_Error_TextMarkColor=ffff882f
ClangCodeModel_Warning_TextMarkColor=ffc6c132
QmlDesigner_HighlightColor=ff9999ff
[Flags]
ComboBoxDrawTextShadow=false
DerivePaletteFromTheme=false
......
......@@ -279,7 +279,10 @@ public:
/* ClangCodeModel Plugin */
ClangCodeModel_Error_TextMarkColor,
ClangCodeModel_Warning_TextMarkColor
ClangCodeModel_Warning_TextMarkColor,
/* QmlDesigner */
QmlDesigner_HighlightColor
};
enum Gradient {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment