Themes: Enable UI recoloring for flat themes

Change-Id: I1907c42a769124b7505bd7afaf6c4da910f3f407
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Alessandro Portale
2016-02-16 21:06:44 +01:00
parent fbffd3abae
commit 02af5d80b6
6 changed files with 29 additions and 16 deletions

View File

@@ -119,7 +119,9 @@ void FancyTabBar::paintEvent(QPaintEvent *event)
if (creatorTheme()->widgetStyle() == Theme::StyleFlat) {
// draw background of upper part of left tab widget
// (Welcome, ... Help)
p.fillRect (event->rect(), creatorTheme()->color(Theme::FancyTabBarBackgroundColor));
p.fillRect(event->rect(), StyleHelper::isBaseColorDefault()
? creatorTheme()->color(Theme::FancyTabBarBackgroundColor)
: StyleHelper::baseColor());
}
for (int i = 0; i < count(); ++i)
@@ -320,14 +322,11 @@ void FancyTabBar::paintTab(QPainter *painter, int tabIndex) const
const float fader = m_tabs[tabIndex]->fader();
if (fader > 0 && !HostOsInfo::isMacHost() && !selected && enabled) {
painter->save();
if (creatorTheme()->widgetStyle() == Theme::StyleFlat) {
QColor c = creatorTheme()->color(Theme::BackgroundColorHover);
c.setAlpha(255 * fader);
painter->fillRect(rect, c);
} else {
painter->setOpacity(fader);
painter->setOpacity(fader);
if (creatorTheme()->widgetStyle() == Theme::StyleFlat)
painter->fillRect(rect, creatorTheme()->color(Theme::BackgroundColorHover));
else
FancyToolButton::hoverOverlay(painter, rect);
}
painter->restore();
}