Changeset 2921 for vidalia/trunk

Timestamp:

08/02/08 20:35:46 (4 months ago)

Author:

edmanm

Message:

Rework the message log scrollbar logic so it's consistent again on Qt 4.4.0.
Fixes ticket #369.

Location:

vidalia/trunk/src/vidalia/log

Files:

• logtreewidget.cpp (modified) (3 diffs)
• logtreewidget.h (modified) (1 diff)

vidalia/trunk/src/vidalia/log/logtreewidget.cpp

@@ -29 +29 @@
   /* Default to always scrolling to the most recent item added */
   _scrollOnNewItem = true;
-  connect(verticalScrollBar(), SIGNAL(valueChanged(int)),
-          this, SLOT(onVerticalScroll(int)));
+  setVerticalScrollMode(QAbstractItemView::ScrollPerItem);
+  connect(verticalScrollBar(), SIGNAL(sliderReleased()),
+          this, SLOT(verticalSliderReleased()));
 }
 
@@ -38 +39 @@
  * probably looking at something in their history. */
 void
-LogTreeWidget::onVerticalScroll(int value)
-{
-  QScrollBar *scrollbar = verticalScrollBar();
-  _scrollOnNewItem = (value >= (scrollbar->maximum()-scrollbar->singleStep()));
+LogTreeWidget::verticalSliderReleased()
+{
+  QScrollBar *scrollBar = verticalScrollBar();
+  if (header()->sortIndicatorOrder() == Qt::AscendingOrder)
+    _scrollOnNewItem = (scrollBar->value() == scrollBar->maximum());
+  else
+    _scrollOnNewItem = (scrollBar->value() == scrollBar->minimum());
 }
 
@@ -183 +187 @@
   }
   
-  /* Add the new message item and scroll to it (if necessary) */
+  /* Add the new message item and scroll to it (if necessary) 
+   * NOTE: We disable sorting, add the new item, and then re-enable sorting
+   *       to force the result to be sorted immediately. Otherwise, the new
+   *       message is not sorted until the message log has focus again.
+   */
+  setSortingEnabled(false); 
   addMessageItem(item);
+  setSortingEnabled(true);
+
   if (_scrollOnNewItem) {
-    scrollToItem(item);
-  }
+    QScrollBar *scrollBar = verticalScrollBar();
+    if (header()->sortIndicatorOrder() == Qt::AscendingOrder)
+      scrollBar->setValue(scrollBar->maximum());
+    else
+      scrollBar->setValue(scrollBar->minimum());
+  }
+
   return item;
 }

vidalia/trunk/src/vidalia/log/logtreewidget.h

@@ -77 +77 @@
 private slots:
   /** Called when the user moves the vertical scroll bar. */
-  void onVerticalScroll(int value);
+  void verticalSliderReleased();
 
 private: