feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ManhattanStyle: Fix themed drawing of toolbar extension

Browse Source 
The extension image gets queried via QStyle::standardIcon() instead of
QStyle::standardPixmap(). That's why so far our extension was never
drawn with our own icon.

The icon .png needed to be resized in order not to be resampled in @2x
mode.

Change-Id: I27ae4e5872c18421e5d40271b01cb9daf8adc8bc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Alessandro Portale
2019-12-10 14:01:15 +01:00
parent 0e49f11ca3
commit 27a5d50125
4 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/coreplugin/manhattanstyle.cpp
View File

@@ -122,13 +122,13 @@ public:
void init();
public:
const QPixmap extButtonPixmap;
const QIcon extButtonIcon;
const QPixmap closeButtonPixmap;
StyleAnimator animator;
};
ManhattanStylePrivate::ManhattanStylePrivate() :
extButtonPixmap(Utils::Icons::TOOLBAR_EXTENSION.pixmap()),
extButtonIcon(Utils::Icons::TOOLBAR_EXTENSION.icon()),
closeButtonPixmap(Utils::Icons::CLOSE_FOREGROUND.pixmap())
{
}
@@ -321,9 +321,6 @@ QPixmap ManhattanStyle::standardPixmap(StandardPixmap standardPixmap, const QSty
QPixmap pixmap;
switch (standardPixmap) {
case QStyle::SP_ToolBarHorizontalExtensionButton:
pixmap = d->extButtonPixmap;
break;
case QStyle::SP_TitleBarCloseButton:
pixmap = d->closeButtonPixmap;
break;
@@ -336,7 +333,16 @@ QPixmap ManhattanStyle::standardPixmap(StandardPixmap standardPixmap, const QSty
QIcon ManhattanStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *option, const QWidget *widget) const
{
QIcon icon = QProxyStyle::standardIcon(standardIcon, option, widget);
QIcon icon;
switch (standardIcon) {
case QStyle::SP_ToolBarHorizontalExtensionButton:
icon = d->extButtonIcon;
break;
default:
icon = QProxyStyle::standardIcon(standardIcon, option, widget);
break;
}
if (standardIcon == QStyle::SP_ComputerIcon) {
// Ubuntu has in some versions a 16x16 icon, see QTCREATORBUG-12832
const QList<QSize> &sizes = icon.availableSizes();