Changeset 6193

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

Files:

• config/contactlist.cpp (modified) (3 diffs)
• config/contactlist.h (modified) (3 diffs)
• settings/contactlist.cpp (modified) (4 diffs)
• settings/contactlist.h (modified) (1 diff)
• views/userviewbase.cpp (modified) (3 diffs)
• views/userviewbase.h (modified) (4 diffs)

trunk/qt4-gui/src/config/contactlist.cpp

@@ -63 +63 @@
   iniFile.ReadBool("ScrollBar", myAllowScrollBar, true);
   iniFile.ReadBool("SystemBackground", myUseSystemBackground, false);
-  iniFile.ReadBool("AutoScrolling", myAutoScroll, true);
 
   unsigned short flash;
@@ -129 +128 @@
   iniFile.WriteBool("ScrollBar", myAllowScrollBar);
   iniFile.WriteBool("SystemBackground", myUseSystemBackground);
-  iniFile.WriteBool("AutoScrolling", myAutoScroll);
 
   iniFile.WriteNum("NumColumns", myColumnCount);
@@ -313 +311 @@
 }
 
-void Config::ContactList::setAutoScroll(bool autoScroll)
-{
-  myAutoScroll = autoScroll;
-}
-
 void Config::ContactList::setShowDividers(bool showDividers)
 {

trunk/qt4-gui/src/config/contactlist.h

@@ -110 +110 @@
   bool allowScrollBar() const { return myAllowScrollBar; }
   bool useSystemBackground() const { return myUseSystemBackground; }
-  bool autoScroll() const { return myAutoScroll; }
 
   bool popupPicture() const { return myPopupPicture; }
@@ -161 +160 @@
   void setAllowScrollBar(bool allowScrollBar);
   void setUseSystemBackground(bool useSystemBackground);
-  void setAutoScroll(bool autoScroll);
 
   void setPopupPicture(bool popupPicture);
@@ -242 +240 @@
   bool myAllowScrollBar;
   bool myUseSystemBackground;
-  bool myAutoScroll;
 
   // Contact list sorting

trunk/qt4-gui/src/settings/contactlist.cpp

@@ -161 +161 @@
   myBehaviourLayout->addWidget(myMainWinStickyCheck, 0, 1);
 
-  myAutoScrollCheck = new QCheckBox(tr("Automatic scrolling"));
-  myAutoScrollCheck->setToolTip(tr("Automatically scroll to the selected item if it was moved out of the view."));
-  myBehaviourLayout->addWidget(myAutoScrollCheck, 1, 1);
-
   QHBoxLayout* mySortByLayout = new QHBoxLayout();
   mySortByLabel = new QLabel(tr("Additional sorting:"));
@@ -180 +176 @@
   mySortByLabel->setBuddy(mySortByCombo);
   mySortByLayout->addWidget(mySortByCombo);
-  myBehaviourLayout->addLayout(mySortByLayout, 2, 1);
+  myBehaviourLayout->addLayout(mySortByLayout, 1, 1);
 
 
@@ -351 +347 @@
   myScrollBarCheck->setChecked(contactListConfig->allowScrollBar());
   mySysBackCheck->setChecked(contactListConfig->useSystemBackground());
-  myAutoScrollCheck->setChecked(contactListConfig->autoScroll());
 
   int numColumns = contactListConfig->columnCount();
@@ -424 +419 @@
   contactListConfig->setAllowScrollBar(myScrollBarCheck->isChecked());
   contactListConfig->setUseSystemBackground(mySysBackCheck->isChecked());
-  contactListConfig->setAutoScroll(myAutoScrollCheck->isChecked());
 
   for (unsigned short i = 0; i < MAX_COLUMNCOUNT; ++i)

trunk/qt4-gui/src/settings/contactlist.h

@@ -90 +90 @@
   QLineEdit* myFrameStyleEdit;
   QComboBox* mySortByCombo;
-  QCheckBox* myAutoScrollCheck;
   QCheckBox* mySSListCheck;
   QCheckBox* myGridLinesCheck;

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;
 };