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

iconSizes.default be gone

Browse Source 
This is used nowhere, so better get rid of it before someone gets the
idea.

Leaves us with only one non-scaled icon size. Maybe worth considering to
get rid of this as well, and let Folderview decide?
This commit is contained in:
Sebastian Kügler 2014-01-25 03:30:45 +01:00
parent 11e3d687d9
commit c8ba9746f2
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,9 +55,10 @@ Units::~Units()
void Units::iconLoaderSettingsChanged() void Units::iconLoaderSettingsChanged()
{ {
m_iconSizes->insert("default", QVariant(KIconLoader::global()->currentSize(KIconLoader::Desktop))); // These are not scaled, we respect the user's setting over dpi scaling
m_iconSizes->insert("desktop", QVariant(KIconLoader::global()->currentSize(KIconLoader::Desktop))); m_iconSizes->insert("desktop", QVariant(KIconLoader::global()->currentSize(KIconLoader::Desktop)));
// The following icon sizes are fully scaled to dpi
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));
m_iconSizes->insert("medium", devicePixelIconSize(KIconLoader::SizeMedium)); m_iconSizes->insert("medium", devicePixelIconSize(KIconLoader::SizeMedium));

8
src/declarativeimports/core/units.h
View File

@ -44,7 +44,7 @@ class Units : public QObject
* The icon sizes provided are normalized for different DPI, so icons * The icon sizes provided are normalized for different DPI, so icons
* will scale depending on the DPI. * will scale depending on the DPI.
* *
* Icon sizes from KIconLoader: * Icon sizes from KIconLoader, adjusted to devicePixelRatio:
* * small * * small
* * smallMedium * * smallMedium
* * medium * * medium
@ -52,12 +52,8 @@ class Units : public QObject
* * huge * * huge
* * enormous * * enormous
* *
* Icon sizes depending on the context: use those if possible * Not devicePixelRation-adjusted::
* Access with units.iconSizes.desktop units.iconSizes.small etc.
* available keys are:
* * desktop * * desktop
* * toolbar
* * dialog
*/ */
Q_PROPERTY(QQmlPropertyMap *iconSizes READ iconSizes NOTIFY iconSizesChanged) Q_PROPERTY(QQmlPropertyMap *iconSizes READ iconSizes NOTIFY iconSizesChanged)