diff options
author | Alessandro Portale <alessandro.portale@theqtcompany.com> | 2015-11-11 19:26:58 +0100 |
---|---|---|
committer | Alessandro Portale <alessandro.portale@theqtcompany.com> | 2015-12-03 11:30:50 +0000 |
commit | 37c1823974bb11e59c820804df886c67e18deed0 (patch) | |
tree | d39f175c06868cef2251538cf6822df65fcc304d /src/plugins/coreplugin/fancytabwidget.cpp | |
parent | 0f50c41d059b5bffb455b76b096de92c6a79dbff (diff) | |
download | qt-creator-37c1823974bb11e59c820804df886c67e18deed0.tar.gz |
Flat and themeable side bar icons
This patch adds flat side bar icons according to
http://blog.qt.io/blog/author/didesous/
The flat icons are supposed to be opt-in, via the theme flag
"FlatSideBarIcons=true". It is false by default for the default
theme for now.
Change-Id: I1cbe69d4e138d5d23c0172a374933ac7a4ce8a5b
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Diffstat (limited to 'src/plugins/coreplugin/fancytabwidget.cpp')
-rw-r--r-- | src/plugins/coreplugin/fancytabwidget.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/coreplugin/fancytabwidget.cpp b/src/plugins/coreplugin/fancytabwidget.cpp index f4352bf62e..5d76861b9a 100644 --- a/src/plugins/coreplugin/fancytabwidget.cpp +++ b/src/plugins/coreplugin/fancytabwidget.cpp @@ -342,7 +342,9 @@ void FancyTabBar::paintTab(QPainter *painter, int tabIndex) const if (drawIcon) { int textHeight = painter->fontMetrics().boundingRect(QRect(0, 0, width(), height()), Qt::TextWordWrap, tabText).height(); tabIconRect.adjust(0, 4, 0, -textHeight); - StyleHelper::drawIconWithShadow(tabIcon(tabIndex), tabIconRect, painter, enabled ? QIcon::Normal : QIcon::Disabled); + const QIcon::Mode iconMode = enabled ? (selected ? QIcon::Active : QIcon::Normal) + : QIcon::Disabled; + StyleHelper::drawIconWithShadow(tabIcon(tabIndex), tabIconRect, painter, iconMode); } painter->setOpacity(1.0); //FIXME: was 0.7 before? |