diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index 04274145772..ea9777c9440 100644 --- a/share/qtcreator/themes/dark.creatortheme +++ b/share/qtcreator/themes/dark.creatortheme @@ -7,8 +7,8 @@ DefaultTextEditorColorScheme=dark.xml shadowBackground=ff232323 text=ffe7e7e7 textDisabled=7fffffff -hoverBackground=ff515151 -selectedBackground=ff151515 +hoverBackground=18ffffff +selectedBackground=46ffffff normalBackground=ff333333 alternateBackground=ff515151 error=ffff0000 @@ -19,7 +19,7 @@ BackgroundColorDark=shadowBackground BackgroundColorHover=hoverBackground BackgroundColorNormal=normalBackground BackgroundColorDisabled=ff444444 -BackgroundColorSelected=ff909090 +BackgroundColorSelected=selectedBackground BadgeLabelBackgroundColorChecked=normalBackground BadgeLabelBackgroundColorUnchecked=selectedBackground BadgeLabelTextColorChecked=text @@ -47,7 +47,7 @@ FancyTabWidgetDisabledUnselectedTextColor=textDisabled FancyTabWidgetEnabledSelectedTextColor=text FancyTabWidgetEnabledUnselectedTextColor=text FancyToolButtonHoverColor=35ffffff -FancyToolButtonSelectedColor=7effffff +FancyToolButtonSelectedColor=selectedBackground FutureProgressBackgroundColor=shadowBackground IconsBaseColor=ffdcdcdc IconsDisabledColor=textDisabled @@ -83,7 +83,6 @@ MiniProjectTargetSelectorBackgroundColor=shadowBackground MiniProjectTargetSelectorBorderColor=shadowBackground MiniProjectTargetSelectorSummaryBackgroundColor=shadowBackground MiniProjectTargetSelectorTextColor=text -PanelButtonToolBackgroundColorHover=hoverBackground PanelStatusBarBackgroundColor=shadowBackground PanelsWidgetSeparatorLineColor=0 PanelTextColorDark=text diff --git a/share/qtcreator/themes/darkframe.creatortheme b/share/qtcreator/themes/darkframe.creatortheme index 6362ee8389e..7b8e6067e51 100644 --- a/share/qtcreator/themes/darkframe.creatortheme +++ b/share/qtcreator/themes/darkframe.creatortheme @@ -8,8 +8,8 @@ text=ff000000 textDisabled=55000000 toolBarItem=b6fbfdff toolBarItemDisabled=88a4a6a8 -hoverBackground=ff515151 -selectedBackground=ff151515 +hoverBackground=22ffffff +selectedBackground=66000000 normalBackground=ffffffff alternateBackground=ff515151 error=ffe41e25 @@ -21,7 +21,7 @@ BackgroundColorDark=shadowBackground BackgroundColorHover=hoverBackground BackgroundColorNormal=normalBackground BackgroundColorDisabled=ff444444 -BackgroundColorSelected=ff909090 +BackgroundColorSelected=selectedBackground BadgeLabelBackgroundColorChecked=ffe0e0e0 BadgeLabelBackgroundColorUnchecked=ff808080 BadgeLabelTextColorChecked=ff606060 @@ -48,8 +48,8 @@ FancyTabWidgetDisabledSelectedTextColor=toolBarItemDisabled FancyTabWidgetDisabledUnselectedTextColor=toolBarItemDisabled FancyTabWidgetEnabledSelectedTextColor=toolBarItem FancyTabWidgetEnabledUnselectedTextColor=toolBarItem -FancyToolButtonHoverColor=35ffffff -FancyToolButtonSelectedColor=66000000 +FancyToolButtonHoverColor=hoverBackground +FancyToolButtonSelectedColor=selectedBackground FutureProgressBackgroundColor=shadowBackground IconsBaseColor=toolBarItem IconsDisabledColor=toolBarItemDisabled @@ -85,7 +85,6 @@ MiniProjectTargetSelectorBackgroundColor=shadowBackground MiniProjectTargetSelectorBorderColor=shadowBackground MiniProjectTargetSelectorSummaryBackgroundColor=shadowBackground MiniProjectTargetSelectorTextColor=text -PanelButtonToolBackgroundColorHover=hoverBackground PanelStatusBarBackgroundColor=shadowBackground PanelsWidgetSeparatorLineColor=0 PanelTextColorDark=text diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index 9b7cf024ab1..d373839cbb0 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -34,7 +34,7 @@ DoubleTabWidget2ndTabActiveTextColor=ffffffff DoubleTabWidget2ndTabBackgroundColor=ffff0000 DoubleTabWidget2ndTabInactiveTextColor=ff000000 EditorPlaceholderColor=ffe0dcd8 -FancyToolBarSeparatorColor=ff000000 +FancyToolBarSeparatorColor=60ffffff FancyTabBarBackgroundColor=ffff0000 FancyTabWidgetDisabledSelectedTextColor=textDisabled FancyTabWidgetDisabledUnselectedTextColor=textDisabled @@ -77,7 +77,6 @@ MiniProjectTargetSelectorBackgroundColor=ffa0a0a0 MiniProjectTargetSelectorBorderColor=ff000000 MiniProjectTargetSelectorSummaryBackgroundColor=ff464646 MiniProjectTargetSelectorTextColor=a0ffffff -PanelButtonToolBackgroundColorHover=25ffffff PanelStatusBarBackgroundColor=ffff0000 PanelsWidgetSeparatorLineColor=ffbfbcb8 PanelTextColorDark=darkText diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h index d5a006dc2c4..d674e0d1a56 100644 --- a/src/libs/utils/theme/theme.h +++ b/src/libs/utils/theme/theme.h @@ -103,7 +103,6 @@ public: OutputPaneButtonFlashColor, OutputPaneToggleButtonTextColorChecked, OutputPaneToggleButtonTextColorUnchecked, - PanelButtonToolBackgroundColorHover, PanelStatusBarBackgroundColor, PanelsWidgetSeparatorLineColor, PanelTextColorDark, diff --git a/src/libs/utils/utilsicons.h b/src/libs/utils/utilsicons.h index 0f2d8a49b8a..51da2999c4d 100644 --- a/src/libs/utils/utilsicons.h +++ b/src/libs/utils/utilsicons.h @@ -32,7 +32,7 @@ namespace Utils { namespace Icons { const Utils::Icon EDIT_CLEAR({ - {QLatin1String(":/core/images/editclear.png"), Utils::Theme::BackgroundColorHover}}, Utils::Icon::Tint); + {QLatin1String(":/core/images/editclear.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint); } // namespace Icons } // namespace Utils diff --git a/src/plugins/coreplugin/coreicons.cpp b/src/plugins/coreplugin/coreicons.cpp index 1cf5243bfb5..4432a3c7040 100644 --- a/src/plugins/coreplugin/coreicons.cpp +++ b/src/plugins/coreplugin/coreicons.cpp @@ -84,7 +84,7 @@ const Icon NEXT({ const Icon PREV({ {QLatin1String(":/core/images/prev.png"), Theme::IconsNavigationArrowsColor}}); const Icon MAGNIFIER({ - {QLatin1String(":/core/images/magnifier.png"), Theme::BackgroundColorHover}}, Icon::Tint); + {QLatin1String(":/core/images/magnifier.png"), Theme::PanelTextColorMid}}, Icon::Tint); const Icon CLEAN_PANE({ {QLatin1String(":/core/images/clean_pane_small.png"), Theme::IconsBaseColor}}); const Icon RELOAD({ diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp index d3583fab311..cb5df446fb6 100644 --- a/src/plugins/coreplugin/manhattanstyle.cpp +++ b/src/plugins/coreplugin/manhattanstyle.cpp @@ -488,15 +488,14 @@ void ManhattanStyle::drawPrimitive(PrimitiveElement element, const QStyleOption QColor shadow(0, 0, 0, 30); painter->setPen(shadow); if (pressed) { - QColor shade = option->palette.base().color(); - shade.setHsv(shade.hue(), shade.saturation(), 255 - shade.value(), 40); + const QColor shade = creatorTheme()->color(Theme::FancyToolButtonSelectedColor); painter->fillRect(rect, shade); const QRectF borderRect = QRectF(rect).adjusted(0.5, 0.5, -0.5, -0.5); painter->drawLine(borderRect.topLeft() + QPointF(1, 0), borderRect.topRight() - QPointF(1, 0)); painter->drawLine(borderRect.topLeft(), borderRect.bottomLeft()); painter->drawLine(borderRect.topRight(), borderRect.bottomRight()); } else if (option->state & State_Enabled && option->state & State_MouseOver) { - painter->fillRect(rect, creatorTheme()->color(Theme::PanelButtonToolBackgroundColorHover)); + painter->fillRect(rect, creatorTheme()->color(Theme::FancyToolButtonHoverColor)); } else if (widget && widget->property("highlightWidget").toBool()) { QColor shade(0, 0, 0, 128); painter->fillRect(rect, shade); @@ -529,7 +528,9 @@ void ManhattanStyle::drawPrimitive(PrimitiveElement element, const QStyleOption painter->drawLine(borderRect.topLeft(), borderRect.topRight()); painter->restore(); } else { - painter->fillRect(rect, creatorTheme()->color(Theme::PanelStatusBarBackgroundColor)); + painter->fillRect(rect, StyleHelper::isBaseColorDefault() + ? creatorTheme()->color(Theme::PanelStatusBarBackgroundColor) + : StyleHelper::baseColor()); } } break; diff --git a/src/plugins/coreplugin/minisplitter.cpp b/src/plugins/coreplugin/minisplitter.cpp index c00a31fd51d..d32d0bdf321 100644 --- a/src/plugins/coreplugin/minisplitter.cpp +++ b/src/plugins/coreplugin/minisplitter.cpp @@ -72,9 +72,9 @@ void MiniSplitterHandle::resizeEvent(QResizeEvent *event) void MiniSplitterHandle::paintEvent(QPaintEvent *event) { QPainter painter(this); - const QColor color = m_lightColored - ? Utils::StyleHelper::borderColor(m_lightColored) - : Utils::creatorTheme()->color(Utils::Theme::SplitterColor); + const QColor color = Utils::creatorTheme()->color( + m_lightColored ? Utils::Theme::FancyToolBarSeparatorColor + : Utils::Theme::SplitterColor); painter.fillRect(event->rect(), color); } diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp index 231ea7509ca..eeb14f596e9 100644 --- a/src/plugins/coreplugin/outputpanemanager.cpp +++ b/src/plugins/coreplugin/outputpanemanager.cpp @@ -686,17 +686,15 @@ void OutputPaneToggleButton::paintEvent(QPaintEvent*) if (image) StyleHelper::drawCornerImage(*image, &p, rect(), numberAreaWidth, buttonBorderWidth, buttonBorderWidth, buttonBorderWidth); } else { - QColor c; - if (isChecked()) { - c = creatorTheme()->color(hovered ? Theme::BackgroundColorHover - : Theme::BackgroundColorSelected); - } else if (isDown()) { - c = creatorTheme()->color(Theme::BackgroundColorSelected); - } else { - c = creatorTheme()->color(hovered ? Theme::BackgroundColorHover - : Theme::BackgroundColorDark); - } - p.fillRect(rect(), c); + Theme::Color c = Theme::BackgroundColorDark; + + if (hovered) + c = Theme::BackgroundColorHover; + else if (isDown() || isChecked()) + c = Theme::BackgroundColorSelected; + + if (c != Theme::BackgroundColorDark) + p.fillRect(rect(), creatorTheme()->color(c)); } if (m_flashTimer->state() == QTimeLine::Running) diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.cpp b/src/plugins/coreplugin/progressmanager/futureprogress.cpp index e06451eac60..e1a2a66220a 100644 --- a/src/plugins/coreplugin/progressmanager/futureprogress.cpp +++ b/src/plugins/coreplugin/progressmanager/futureprogress.cpp @@ -296,7 +296,9 @@ void FutureProgress::paintEvent(QPaintEvent *) { QPainter p(this); if (creatorTheme()->widgetStyle() == Theme::StyleFlat) { - p.fillRect(rect(), creatorTheme()->color(Theme::FutureProgressBackgroundColor)); + p.fillRect(rect(), StyleHelper::isBaseColorDefault() + ? creatorTheme()->color(Theme::FutureProgressBackgroundColor) + : StyleHelper::baseColor()); } else { QLinearGradient grad = StyleHelper::statusBarGradient(rect()); p.fillRect(rect(), grad);