From 11e3d687d9daba23864e8ba50cdc413a1b8e1368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= Date: Sat, 25 Jan 2014 03:24:50 +0100 Subject: [PATCH] Remove dialog and toolbar icon sizes Add FIXME for small icon alignment --- src/declarativeimports/core/units.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/declarativeimports/core/units.cpp b/src/declarativeimports/core/units.cpp index 30d6eef13..184c55972 100644 --- a/src/declarativeimports/core/units.cpp +++ b/src/declarativeimports/core/units.cpp @@ -57,9 +57,6 @@ void Units::iconLoaderSettingsChanged() { m_iconSizes->insert("default", 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("smallMedium", devicePixelIconSize(KIconLoader::SizeSmallMedium)); @@ -78,7 +75,7 @@ QQmlPropertyMap *Units::iconSizes() const int Units::devicePixelIconSize(const int size) const { - /* + /* in kiconloader.h enum StdSizes { SizeSmall=16, SizeSmallMedium=22, @@ -104,6 +101,8 @@ int Units::devicePixelIconSize(const int size) const } else { out = dpisize; } + // FIXME: Add special casing for < 64 cases: align to kiconloader size + //qDebug() << " Size in: " << size << dpisize << " -> " << out; return out; }