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

Timestamp:

05/11/08 19:17:12 (7 months ago)

Author:

flynd

Message:

Revised r6191. scrollTo needs to be called for some cases. It's just the call triggered by layoutChanged that we want to ignore. And I don't see any reason to have this configurable.

Location:

trunk/qt4-gui/src/views

Files:

• userviewbase.cpp (modified) (3 diffs)
• userviewbase.h (modified) (4 diffs)

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

@@ -47 +47 @@
 UserViewBase::UserViewBase(ContactListModel* contactList, QWidget* parent)
   : QTreeView(parent),
-    myContactList(contactList)
+    myContactList(contactList),
+    myAllowScrollTo(false)
 {
   setItemDelegate(new ContactDelegate(this, this));
@@ -84 +85 @@
     setPalette(pal);
   }
-}
-
-void UserViewBase::scrollTo(const QModelIndex& index, QAbstractItemView::ScrollHint hint)
-{
-  if (Config::ContactList::instance()->autoScroll())
-    QTreeView::scrollTo(index, hint);
 }
 
@@ -330 +325 @@
   }
 }
+
+void UserViewBase::currentChanged(const QModelIndex &current, const QModelIndex &previous)
+{
+  // Workaround for annoying auto scrolling, see comment in scrollTo()
+  myAllowScrollTo = true;
+  QTreeView::currentChanged(current, previous);
+  myAllowScrollTo = false;
+}
+
+void UserViewBase::timerEvent(QTimerEvent* event)
+{
+  // Workaround for annoying auto scrolling, see comment in scrollTo()
+  myAllowScrollTo = true;
+  QTreeView::timerEvent(event);
+  myAllowScrollTo = false;
+}
+
+void UserViewBase::scrollTo(const QModelIndex& index, ScrollHint hint)
+{
+  // scrollTo is called from the following functions:
+  //   QAbstractItemView::setVerticalScrollMode
+  //   QAbstractItemView::timerEvent
+  //   QAbstractItemView::currentChanged
+  //   QAbstractItemViewPrivate::_q_layoutChanged
+  //
+  // Since layoutChanged is emitted by the sort proxy whenever anything item
+  // in the list is changed this causes the list to scroll back to current item
+  // which can be annoying when trying to scroll the list manually.
+  // Since we cannot override a private function this is a ugly workaround to
+  // block scrollTo as default but allow it for timerEvent and currentChanged
+  // instead. (setVerticalScrollMode isn't used so we don't care for that one.)
+  if (myAllowScrollTo)
+    QTreeView::scrollTo(index, hint);
+}
+

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

@@ -62 +62 @@
 
   /**
-   * Overloaded from base class to make scrolling conditional
+   * Make sure a specified index is visible
+   * Overloaded to stop annoying auto scrolling triggered by layoutChanged
    *
-   * @param index Index of the item to scroll to
-   * @param hint Relative viewport position to maintain
+   * @param index Index to scroll to
+   * @param hint Where to place the index
    */
   virtual void scrollTo(const QModelIndex& index, ScrollHint hint = EnsureVisible);
@@ -83 +84 @@
    */
   virtual void applySkin();
+
+  /**
+   * Current index has changed
+   * Overloaded as workaround for scrollTo()
+   *
+   * @param current New current index
+   * @param previous Previously current index
+   */
+  virtual void currentChanged(const QModelIndex& current, const QModelIndex& previous);
 
 protected:
@@ -145 +155 @@
   virtual void drawBranches(QPainter*, const QRect&, const QModelIndex&) const {}
 
+  /**
+   * A timer event happened
+   * Overloaded as workaround for scrollTo()
+   *
+   * @param event Timer event
+   */
+  virtual void timerEvent(QTimerEvent* event);
+
 private slots:
   /**
@@ -155 +173 @@
 private:
   bool midEvent;
+  bool myAllowScrollTo;
 };