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

Remove dialog and toolbar icon sizes

Browse Source 
Add FIXME for small icon alignment
This commit is contained in:
Sebastian Kügler 2014-01-25 03:24:50 +01:00
parent da3a724634
commit 11e3d687d9
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/declarativeimports/core/units.cpp
View File

@ -57,9 +57,6 @@ void Units::iconLoaderSettingsChanged()
{ {
m_iconSizes->insert("default", QVariant(KIconLoader::global()->currentSize(KIconLoader::Desktop))); m_iconSizes->insert("default", QVariant(KIconLoader::global()->currentSize(KIconLoader::Desktop)));
m_iconSizes->insert("desktop", QVariant(KIconLoader::global()->currentSize(KIconLoader::Desktop))); m_iconSizes->insert("desktop", QVariant(KIconLoader::global()->currentSize(KIconLoader::Desktop)));
m_iconSizes->insert("toolbar", KIconLoader::global()->currentSize(KIconLoader::Toolbar));
//m_iconSizes->insert("small", KIconLoader::global()->currentSize(KIconLoader::Small));
m_iconSizes->insert("dialog", KIconLoader::global()->currentSize(KIconLoader::Dialog));
m_iconSizes->insert("small", devicePixelIconSize(KIconLoader::SizeSmall)); m_iconSizes->insert("small", devicePixelIconSize(KIconLoader::SizeSmall));
m_iconSizes->insert("smallMedium", devicePixelIconSize(KIconLoader::SizeSmallMedium)); m_iconSizes->insert("smallMedium", devicePixelIconSize(KIconLoader::SizeSmallMedium));
@ -78,7 +75,7 @@ QQmlPropertyMap *Units::iconSizes() const
int Units::devicePixelIconSize(const int size) const int Units::devicePixelIconSize(const int size) const
{ {
/* /* in kiconloader.h
enum StdSizes { enum StdSizes {
SizeSmall=16, SizeSmall=16,
SizeSmallMedium=22, SizeSmallMedium=22,
@ -104,6 +101,8 @@ int Units::devicePixelIconSize(const int size) const
} else { } else {
out = dpisize; out = dpisize;
} }
// FIXME: Add special casing for < 64 cases: align to kiconloader size
//qDebug() << " Size in: " << size << dpisize << " -> " << out; //qDebug() << " Size in: " << size << dpisize << " -> " << out;
return out; return out;
} }