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 { ...@@ -40,7 +40,7 @@ QtObject {
property bool highlight: textColor === __changedTextColor property bool highlight: textColor === __changedTextColor
property color __defaultTextColor: creatorTheme.PanelTextColorLight property color __defaultTextColor: creatorTheme.PanelTextColorLight
property color __changedTextColor: Constants.colorsChangedBaseText readonly property color __changedTextColor: creatorTheme.QmlDesigner_HighlightColor
onBackendValueChanged: { onBackendValueChanged: {
evaluate(); evaluate();
...@@ -68,7 +68,7 @@ QtObject { ...@@ -68,7 +68,7 @@ QtObject {
if (baseStateFlag) { if (baseStateFlag) {
if (innerObject.backendValue.isInModel) if (innerObject.backendValue.isInModel)
innerObject.textColor = Constants.colorsChangedBaseText innerObject.textColor = __changedTextColor
else else
innerObject.textColor = creatorTheme.PanelTextColorLight innerObject.textColor = creatorTheme.PanelTextColorLight
} else { } else {
......
...@@ -28,5 +28,4 @@ ...@@ -28,5 +28,4 @@
var colorsDisabledText = "gray" var colorsDisabledText = "gray"
var colorsDefaultText = "white" var colorsDefaultText = "white"
var colorsBoldText = "#dedede" var colorsBoldText = "#dedede"
var colorsChangedBaseText = "#9999ff"
var colorsChangedStateText = "#99ccff" var colorsChangedStateText = "#99ccff"
...@@ -200,6 +200,8 @@ PaletteWindowTextDisabled=textDisabled ...@@ -200,6 +200,8 @@ PaletteWindowTextDisabled=textDisabled
PaletteBaseDisabled=backgroundColorDisabled PaletteBaseDisabled=backgroundColorDisabled
PaletteTextDisabled=textDisabled PaletteTextDisabled=textDisabled
QmlDesigner_HighlightColor=ff9999ff
[Flags] [Flags]
ComboBoxDrawTextShadow=false ComboBoxDrawTextShadow=false
DerivePaletteFromTheme=true DerivePaletteFromTheme=true
......
...@@ -171,6 +171,8 @@ ProjectExplorer_TaskWarn_TextMarkColor=ffffa500 ...@@ -171,6 +171,8 @@ ProjectExplorer_TaskWarn_TextMarkColor=ffffa500
ClangCodeModel_Error_TextMarkColor=ffff882f ClangCodeModel_Error_TextMarkColor=ffff882f
ClangCodeModel_Warning_TextMarkColor=ffc6c132 ClangCodeModel_Warning_TextMarkColor=ffc6c132
QmlDesigner_HighlightColor=ff9999ff
[Flags] [Flags]
ComboBoxDrawTextShadow=true ComboBoxDrawTextShadow=true
DerivePaletteFromTheme=false DerivePaletteFromTheme=false
......
...@@ -185,6 +185,8 @@ ProjectExplorer_TaskWarn_TextMarkColor=ffffff40 ...@@ -185,6 +185,8 @@ ProjectExplorer_TaskWarn_TextMarkColor=ffffff40
ClangCodeModel_Error_TextMarkColor=ffff882f ClangCodeModel_Error_TextMarkColor=ffff882f
ClangCodeModel_Warning_TextMarkColor=ffceff40 ClangCodeModel_Warning_TextMarkColor=ffceff40
QmlDesigner_HighlightColor=ff9999ff
PaletteWindow=normalBackground PaletteWindow=normalBackground
PaletteWindowText=text PaletteWindowText=text
PaletteBase=normalBackground PaletteBase=normalBackground
......
...@@ -182,6 +182,8 @@ ProjectExplorer_TaskWarn_TextMarkColor=ffffa500 ...@@ -182,6 +182,8 @@ ProjectExplorer_TaskWarn_TextMarkColor=ffffa500
ClangCodeModel_Error_TextMarkColor=ffff882f ClangCodeModel_Error_TextMarkColor=ffff882f
ClangCodeModel_Warning_TextMarkColor=ffc6c132 ClangCodeModel_Warning_TextMarkColor=ffc6c132
QmlDesigner_HighlightColor=ff9999ff
[Flags] [Flags]
ComboBoxDrawTextShadow=false ComboBoxDrawTextShadow=false
DerivePaletteFromTheme=false DerivePaletteFromTheme=false
......
...@@ -181,6 +181,8 @@ ProjectExplorer_TaskWarn_TextMarkColor=ffffa500 ...@@ -181,6 +181,8 @@ ProjectExplorer_TaskWarn_TextMarkColor=ffffa500
ClangCodeModel_Error_TextMarkColor=ffff882f ClangCodeModel_Error_TextMarkColor=ffff882f
ClangCodeModel_Warning_TextMarkColor=ffc6c132 ClangCodeModel_Warning_TextMarkColor=ffc6c132
QmlDesigner_HighlightColor=ff9999ff
[Flags] [Flags]
ComboBoxDrawTextShadow=false ComboBoxDrawTextShadow=false
DerivePaletteFromTheme=false DerivePaletteFromTheme=false
......
...@@ -279,7 +279,10 @@ public: ...@@ -279,7 +279,10 @@ public:
/* ClangCodeModel Plugin */ /* ClangCodeModel Plugin */
ClangCodeModel_Error_TextMarkColor, ClangCodeModel_Error_TextMarkColor,
ClangCodeModel_Warning_TextMarkColor ClangCodeModel_Warning_TextMarkColor,
/* QmlDesigner */
QmlDesigner_HighlightColor
}; };
enum Gradient { 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