Changeset 13930 for trunk/qt/file-tree.cc

Timestamp:

Feb 1, 2013, 10:40:08 PM (10 years ago)

Author:

jordan

Message:

(qt) #5252 'file-renaming issues in Qt client': fix renaming flicker error reported by rb07

File:

• trunk/qt/file-tree.cc (modified) (10 diffs)

trunk/qt/file-tree.cc

@@ -11 +11 @@
  */
 
+#include <algorithm>
 #include <cassert>
 
@@ -188 +189 @@
 #include <iostream>
 
-bool
+std::pair<int,int>
 FileTreeItem :: update (const QString& name,
                         bool           wanted,
@@ -195 +196 @@
                         bool           updateFields)
 {
-  bool changed = false;
+  int changed_count = 0;
+  int changed_fields[3];
 
   if (myName != name)
@@ -203 +205 @@
 
       myName = name;
-      changed = true;
+      changed_fields[changed_count++] = COL_NAME;
     }
 
@@ -209 +211 @@
     {
       if (myHaveSize != haveSize)
-        {
-          myHaveSize = haveSize;
-          changed = true;
-        }
+        myHaveSize = haveSize;
 
       if (updateFields)
@@ -219 +218 @@
             {
               myIsWanted = wanted;
-              changed = true;
+              changed_fields[changed_count++] = COL_WANTED;
             }
 
@@ -225 +224 @@
             {
               myPriority = priority;
-              changed = true;
+              changed_fields[changed_count++] = COL_PRIORITY;
             }
         }
     }
 
+  std::pair<int,int> changed (-1, -1);
+  if (changed_count > 0)
+    {
+      std::sort (changed_fields, changed_fields+changed_count);
+      changed.first = changed_fields[0];
+      changed.second = changed_fields [changed_count-1];
+      std::cerr << "changed.first " << changed.first << " changed.second " << changed.second << std::endl;
+    }
   return changed;
 }
@@ -567 +574 @@
 
   return ret;
-}
-
-void
-FileTreeModel :: itemChanged (FileTreeItem * item)
-{
-  dataChanged (indexOf(item, FIRST_VISIBLE_COLUMN), indexOf(item, LAST_VISIBLE_COLUMN));
 }
 
@@ -596 +597 @@
         {
           const QString token = tokens.takeLast();
-          if (item->update (token, wanted, priority, have, updateFields))
-            itemChanged (item);
+          const std::pair<int,int> changed = item->update (token, wanted, priority, have, updateFields);
+          if (changed.first >= 0)
+            dataChanged (indexOf (item, changed.first), indexOf (item, changed.second));
           item = item->parent();
         }
@@ -633 +635 @@
           assert (item->totalSize() == totalSize);
 
-          if (item->update (item->name(), wanted, priority, have, added || updateFields))
-            itemChanged (item);
+          const std::pair<int,int> changed = item->update (item->name(), wanted, priority, have, added || updateFields);
+          if (changed.first >= 0)
+            dataChanged (indexOf (item, changed.first), indexOf (item, changed.second));
         }
     }