alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/KDE/4.9' into KDE/4.10

Browse Source
This commit is contained in:
Montel Laurent 2012-10-18 20:49:50 +02:00
commit fead6ece87
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
widgets/iconwidget.cpp
View File

@ -810,16 +810,34 @@ QPixmap IconWidgetPrivate::decoration(const QStyleOptionGraphicsItem *option, bo
QIcon::Mode mode = option->state & QStyle::State_Enabled ? QIcon::Normal : QIcon::Disabled; QIcon::Mode mode = option->state & QStyle::State_Enabled ? QIcon::Normal : QIcon::Disabled;
QIcon::State state = option->state & QStyle::State_Open ? QIcon::On : QIcon::Off; QIcon::State state = option->state & QStyle::State_Open ? QIcon::On : QIcon::Off;
QSize finalSize(iconSize.toSize());
//for small sizes, use a standard size
if (finalSize.width() < KIconLoader::SizeSmallMedium) {
finalSize = QSize(KIconLoader::SizeSmall, KIconLoader::SizeSmall);
} else if (finalSize.width() < KIconLoader::SizeMedium) {
finalSize = QSize(KIconLoader::SizeSmallMedium, KIconLoader::SizeSmallMedium);
} else if (finalSize.width() < KIconLoader::SizeLarge) {
finalSize = QSize(KIconLoader::SizeMedium, KIconLoader::SizeMedium);
}
if (iconSvg) { if (iconSvg) {
if (iconSvgElementChanged || iconSvgPixmap.size() != iconSize.toSize()) { if (iconSvgElementChanged || iconSvgPixmap.size() != iconSize.toSize()) {
iconSvg->resize(iconSize); //even the svg is returned at standard sizes because:
// * it may have a version optimized for that size
// * look aligned with other icons
iconSvg->resize(finalSize);
iconSvgPixmap = iconSvg->pixmap(iconSvgElement); iconSvgPixmap = iconSvg->pixmap(iconSvgElement);
iconSvgElementChanged = false; iconSvgElementChanged = false;
} }
result = iconSvgPixmap; result = iconSvgPixmap;
} else { } else {
const QSize size = icon.actualSize(iconSize.toSize(), mode, state); QSize size(iconSize.toSize());
result = icon.pixmap(size, mode, state); //the QIcon isn't filled with available sizes, return a near standard size for small pixmaps
if (!icon.availableSizes().isEmpty()) {
finalSize = icon.actualSize(iconSize.toSize(), mode, state);
}
result = icon.pixmap(finalSize, mode, state);
} }
if (usePressedEffect) { if (usePressedEffect) {