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

QmlDesigner: Use QmlDesigner_HighlightColor consistently

This fixes a couple of issue in the .css and we
always use the same highlight color (QmlDesigner_HighlightColor).

Change-Id: I6522eabc00c30399b2c3b2689256b970ec558719
Reviewed-by: Tim Jenssen's avatarTim Jenssen <tim.jenssen@qt.io>
parent 9d5705a7
...@@ -101,9 +101,6 @@ Rectangle { ...@@ -101,9 +101,6 @@ Rectangle {
statesEditorModel.renameState(internalNodeId, text) statesEditorModel.renameState(internalNodeId, text)
} }
// as we change the background we need to change the text
// color to see some text
textColor: creatorTheme.PanelTextColorLight
} }
Item { Item {
......
...@@ -147,7 +147,7 @@ FocusScope { ...@@ -147,7 +147,7 @@ FocusScope {
height: delegateHeight height: delegateHeight
isBaseState: 0 == internalNodeId isBaseState: 0 == internalNodeId
isCurrentState: root.currentStateInternalId == internalNodeId isCurrentState: root.currentStateInternalId == internalNodeId
baseColor: isCurrentState ? Qt.darker(highlightColor, 1.2) : background.color baseColor: isCurrentState ? creatorTheme.QmlDesigner_HighlightColor : background.color
delegateStateName: stateName delegateStateName: stateName
delegateStateImageSource: stateImageSource delegateStateImageSource: stateImageSource
delegateStateImageSize: stateImageSize delegateStateImageSize: stateImageSize
......
...@@ -59,19 +59,13 @@ QLineEdit#itemLibrarySearchInput ...@@ -59,19 +59,13 @@ QLineEdit#itemLibrarySearchInput
QTreeView { QTreeView {
color: creatorTheme.PanelTextColorLight; color: creatorTheme.PanelTextColorLight;
selection-color: creatorTheme.PanelTextColorLight; selection-color: creatorTheme.PanelTextColorLight;
} selection-background-color: creatorTheme.QmlDesigner_HighlightColor;
QTreeView::item:selected {
color: creatorTheme.PanelTextColorLight;
} }
QListView { QListView {
color:creatorTheme.PanelTextColorLight; color: creatorTheme.PanelTextColorLight;
selection-color: creatorTheme.PanelTextColorLight; selection-color: creatorTheme.PanelTextColorLight;
} selection-background-color: creatorTheme.QmlDesigner_HighlightColor;
QListView::item:selected {
color: creatorTheme.PanelTextColorLight;
} }
QComboBox QAbstractItemView { QComboBox QAbstractItemView {
......
...@@ -96,7 +96,6 @@ StatesEditorWidget::StatesEditorWidget(StatesEditorView *statesEditorView, State ...@@ -96,7 +96,6 @@ StatesEditorWidget::StatesEditorWidget(StatesEditorView *statesEditorView, State
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
rootContext()->setContextProperty(QStringLiteral("statesEditorModel"), statesEditorModel); rootContext()->setContextProperty(QStringLiteral("statesEditorModel"), statesEditorModel);
rootContext()->setContextProperty(QStringLiteral("highlightColor"), Utils::StyleHelper::notTooBrightHighlightColor());
rootContext()->setContextProperty(QLatin1String("canAddNewStates"), true); rootContext()->setContextProperty(QLatin1String("canAddNewStates"), true);
......
...@@ -8,6 +8,9 @@ QFrame ...@@ -8,6 +8,9 @@ QFrame
QTableView { QTableView {
color: creatorTheme.PanelTextColorLight; color: creatorTheme.PanelTextColorLight;
selection-color: creatorTheme.PanelTextColorLight;
selection-background-color: creatorTheme.QmlDesigner_HighlightColor;
} }
QTableView::item QTableView::item
...@@ -24,12 +27,9 @@ QTableView::item:focus ...@@ -24,12 +27,9 @@ QTableView::item:focus
QTableView::item:selected QTableView::item:selected
{ {
background-color: qlineargradient(x1: 0, y1: -0.4, x2: 0, y2: 0.6,stop: 0 palette(midlight), stop: 1 palette(highlight));
border: none border: none
} }
QHeaderView::section { QHeaderView::section {
background-color: #494949; background-color: #494949;
padding: 4px; padding: 4px;
......
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