Changeset 6130 for trunk/qt4-gui/src/views

Timestamp:

04/05/08 21:55:21 (8 months ago)

Author:

eugene

Message:

Updated the spanning algorithm to make newly added rows be spanned too if needed.

Location:

trunk/qt4-gui/src/views

Files:

• userview.cpp (modified) (3 diffs)
• userview.h (modified) (2 diffs)

trunk/qt4-gui/src/views/userview.cpp

@@ -127 +127 @@
     header()->hide();
 
-  setGroupSpanning();
+  spanRowRange(rootIndex(), 0, model()->rowCount(rootIndex()) - 1);
 }
 
@@ -141 +141 @@
 }
 
-void UserView::setGroupSpanning()
-{
-  QModelIndex root = rootIndex();
-  int rows = model()->rowCount(root);
-
-  if (root.isValid())
-  {
-    // Single group (non-threaded) view - bars are sorted with contacts
-    for (int i = 0; i < rows; ++i)
-      if (model()->data(model()->index(i, 0, root), ContactListModel::ItemTypeRole).toUInt() ==
-          ContactListModel::BarItem)
-        setFirstColumnSpanned(i, root, true);
-  }
-  else
-  {
-    // Full tree (threaded) view - all top level items are groups
-    for (int i = 0; i < rows; ++i)
-      setFirstColumnSpanned(i, root, true);
+void UserView::spanRowRange(const QModelIndex& parent, int start, int end)
+{
+  for (int i = start; i <= end; i++)
+  {
+    // get the real model index
+    QModelIndex index = model()->index(i, 0, parent);
+    unsigned itemType = model()->data(index, ContactListModel::ItemTypeRole).toUInt();
+
+    if (itemType == ContactListModel::GroupItem ||
+        itemType == ContactListModel::BarItem)
+      setFirstColumnSpanned(i, parent, true);
   }
 }
@@ -179 +172 @@
   setFrameStyle(Config::Skin::active()->frame.frameStyle);
   UserViewBase::applySkin();
+}
+
+void UserView::rowsInserted(const QModelIndex& parent, int start, int end)
+{
+  spanRowRange(parent, start, end);
+  UserViewBase::rowsInserted(parent, start, end);
 }
 

trunk/qt4-gui/src/views/userview.h

@@ -85 +85 @@
   virtual void applySkin();
 
+  /**
+   * Overload the base class so we can analyze the rows
+   * which were inserted and act accordingly
+   *
+   * @param parent The view index which was populated
+   * @param start The number of the first inserted row
+   * @param end The number of the last inserted row
+   */
+  virtual void rowsInserted(const QModelIndex& parent, int start, int end);
+
 private:
   /**
@@ -108 +118 @@
 
   /**
-   * Set group spanning for header rows
+   * Sets row spanning for particular rows in the given group
+   *
+   * @param parent The view index to analyze
+   * @param start The count of the first row
+   * @param end The count of the last row
    */
-  void setGroupSpanning();
+  void spanRowRange(const QModelIndex& parent, int start, int end);
 
 private slots: