mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-19 16:31:21 +00:00
minor optimization: don't instantiate the icon loader on each size change
svn path=/trunk/KDE/kdebase/apps/; revision=710256
This commit is contained in:
parent
d6f393ff03
commit
1f17916fe2
|
@ -40,7 +40,8 @@ IconSizeDialog::IconSizeDialog(QWidget* parent) :
|
|||
m_iconSizeSlider(0),
|
||||
m_iconSizeViewer(0),
|
||||
m_previewSizeSlider(0),
|
||||
m_previewSizeViewer(0)
|
||||
m_previewSizeViewer(0),
|
||||
m_iconLoader()
|
||||
{
|
||||
IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
|
||||
Q_ASSERT(settings != 0);
|
||||
|
@ -131,8 +132,7 @@ void IconSizeDialog::slotButtonClicked(int button)
|
|||
|
||||
void IconSizeDialog::updateIconSize(int value)
|
||||
{
|
||||
KIconLoader iconLoader;
|
||||
m_iconSizeViewer->setPixmap(iconLoader.loadIcon("folder", K3Icon::Desktop, iconSize(value)));
|
||||
m_iconSizeViewer->setPixmap(m_iconLoader.loadIcon("folder", K3Icon::Desktop, iconSize(value)));
|
||||
if (m_previewSizeSlider != 0) {
|
||||
updatePreviewSize(m_previewSizeSlider->value());
|
||||
}
|
||||
|
@ -140,13 +140,12 @@ void IconSizeDialog::updateIconSize(int value)
|
|||
|
||||
void IconSizeDialog::updatePreviewSize(int value)
|
||||
{
|
||||
KIconLoader iconLoader;
|
||||
const int iconSizeValue = m_iconSizeSlider->value();
|
||||
if (value < iconSizeValue) {
|
||||
// assure that the preview size is never smaller than the icon size
|
||||
value = iconSizeValue;
|
||||
}
|
||||
m_previewSizeViewer->setPixmap(iconLoader.loadIcon("preview", K3Icon::Desktop, iconSize(value)));
|
||||
m_previewSizeViewer->setPixmap(m_iconLoader.loadIcon("preview", K3Icon::Desktop, iconSize(value)));
|
||||
}
|
||||
|
||||
int IconSizeDialog::iconSize(int sliderValue) const
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
#define ICONSIZEDIALOG_H
|
||||
|
||||
#include <kdialog.h>
|
||||
#include <kiconloader.h>
|
||||
|
||||
class QSlider;
|
||||
class PixmapViewer;
|
||||
|
@ -77,6 +78,7 @@ private:
|
|||
PixmapViewer* m_iconSizeViewer;
|
||||
QSlider* m_previewSizeSlider;
|
||||
PixmapViewer* m_previewSizeViewer;
|
||||
KIconLoader m_iconLoader;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue