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

List:       kde-commits
Subject:    kdebase/konqueror/iconview
From:       Maks Orlovich <mo002j () mail ! rochester ! edu>
Date:       2003-06-08 23:00:01
[Download RAW message or body]

CVS commit by orlovich: 

Expand out the 'default' directory icon size setting when comparing whether we 
need to re-layout the grid on changing dirs. Noticeably speeds up re-visiting large directories  
when either the source or destination has a default icon size in .directory, and the other
has a fixed value that matches it.


  M +11 -1     konq_iconview.cc   1.435


--- kdebase/konqueror/iconview/konq_iconview.cc  #1.434:1.435
@@ -602,5 +602,15 @@ void KonqKfmIconView::slotSortDirsFirst(
 void KonqKfmIconView::newIconSize( int size )
 {
-    if ( size == m_pIconView->iconSize() )
+    //Either of the sizes can be 0 to indicate the default (Desktop) size icons.
+    //check for that when checking whether the size changed
+    int effSize = size;
+    if (effSize == 0)
+       effSize = IconSize(KIcon::Desktop);
+
+    int oldEffSize = m_pIconView->iconSize();
+    if (oldEffSize == 0)
+       oldEffSize = IconSize(KIcon::Desktop);
+
+    if ( effSize == oldEffSize )
         return;
 


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