[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/apps/plasma/applets/folderview
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2010-08-24 17:27:53
Message-ID: 20100824172753.81495AC867 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1167465 by aseigo:

better fix for the "update the view on icon settings change" bug
CCBUG:245850


 M  +0 -7      abstractitemview.cpp  
 M  +0 -1      abstractitemview.h  
 M  +6 -5      folderview.cpp  


--- trunk/KDE/kdebase/apps/plasma/applets/folderview/abstractitemview.cpp #1167464:1167465
@@ -729,11 +729,4 @@
     m_smoothScrollStopwatch.start();
 }
 
-void AbstractItemView::iconSettingsChanged()
-{
-    markAreaDirty(visibleArea());
-    update();
-}
-
-
 #include "abstractitemview.moc"
--- trunk/KDE/kdebase/apps/plasma/applets/folderview/abstractitemview.h #1167464:1167465
@@ -123,7 +123,6 @@
     void scrollBarValueChanged(int value);
     void scrollBarActionTriggered(int action);
     void scrollBarSliderReleased();
-    void iconSettingsChanged();
 
 protected:
     KFileItemDelegate *m_delegate;
--- trunk/KDE/kdebase/apps/plasma/applets/folderview/folderview.cpp #1167464:1167465
@@ -995,19 +995,20 @@
 
 void FolderView::iconSettingsChanged(int group)
 {
-    if (group == KIconLoader::Desktop && m_iconView)
-    {
+    if (group == KIconLoader::Desktop && m_iconView) {
         const int size = (m_customIconSize != 0) ?
                 m_customIconSize : KIconLoader::global()->currentSize(KIconLoader::Desktop);
 
         m_iconView->setIconSize(QSize(size, size));
-    }
-    else if (group == KIconLoader::Panel && m_listView)
-    {
+        m_iconView->markAreaDirty(m_iconView->visibleArea());
+        m_iconView->update();
+    } else if (group == KIconLoader::Panel && m_listView) {
         const int size = (m_customIconSize != 0) ?
                 m_customIconSize : KIconLoader::global()->currentSize(KIconLoader::Panel);
 
         m_listView->setIconSize(QSize(size, size));
+        m_listView->markAreaDirty(m_listView->visibleArea());
+        m_listView->update();
     }
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]