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

List:       kde-commits
Subject:    KDE/kdebase/apps/plasma/applets/folderview
From:       Fredrik Höglund <fredrik () kde ! org>
Date:       2010-01-12 22:44:24
Message-ID: 1263336264.064393.23464.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1073823 by fredrik:

- Ignore icons that haven't been laid out yet when searching for an
  empty position in the grid.
- Mark icons that didn't have a saved position as laid out after
  they've been laid out in the post layout pass.
- Remove an early return that caused the icon view to not be repainted
  after the post layout pass was completed.

Fixed for: KDE 4.4 RC2
BUG: 190374


 M  +2 -2      iconview.cpp  


--- trunk/KDE/kdebase/apps/plasma/applets/folderview/iconview.cpp #1073822:1073823
@@ -601,7 +601,7 @@
         pos = nextGridPosition(pos, gridSize, contentRect);
         const QRect r(pos, gridSize);
         for (int i = 0; i < m_items.count(); i++) {
-            if (m_items.at(i).rect.intersects(r)) {
+            if (m_items.at(i).layouted && m_items.at(i).rect.intersects(r)) {
                 done = false;
                 break;
             }
@@ -709,6 +709,7 @@
             }
             pos = findNextEmptyPosition(pos, grid, rect);
             m_items[i].rect.moveTo(pos);
+            m_items[i].layouted = true;
             if (m_items[i].rect.intersects(visibleRect)) {
                 needUpdate = true;
             }
@@ -716,7 +717,6 @@
         needUpdate |= doLayoutSanityCheck();
         m_needPostLayoutPass = false;
         emit busy(false);
-        return;
     }
 
     if (m_validRows < m_items.size() || m_needPostLayoutPass) {
[prev in list] [next in list] [prev in thread] [next in thread]