try harder to use a pixel perfect size

This commit is contained in:
Marco Martin 2014-05-22 14:04:27 +02:00
parent 2f9e158297
commit 4cc6d84a81

View File

@ -258,15 +258,19 @@ void IconItem::animationFinished()
int IconItem::adjustedSize(int size) int IconItem::adjustedSize(int size)
{ {
//FIXME: Heuristic: allow 24x24 for icons/ that are in the systray(ugly) if (m_svgIcon) {
if (m_svgIcon && m_svgIcon->imagePath().contains("icons/") && m_svgIcon->resize();
size > KIconLoader::SizeSmallMedium && }
size < KIconLoader::SizeMedium) {
return 24;
//if size is less than 16, leave as is if (m_svgIcon &&
size > KIconLoader::SizeSmallMedium &&
size < KIconLoader::SizeMedium &&
m_svgIcon->elementSize(m_source.toString()).width() > KIconLoader::SizeSmallMedium &&
m_svgIcon->elementSize(m_source.toString()).width() < KIconLoader::SizeMedium) {
return m_svgIcon->elementSize(m_source.toString()).width();
} else if (size < KIconLoader::SizeSmall) { } else if (size < KIconLoader::SizeSmall) {
//do nothing //do nothing
return size;
} else if (size < KIconLoader::SizeSmallMedium) { } else if (size < KIconLoader::SizeSmallMedium) {
return KIconLoader::SizeSmall; return KIconLoader::SizeSmall;
} else if (size < KIconLoader::SizeMedium) { } else if (size < KIconLoader::SizeMedium) {