Avoided qt bug that QTreeView scroll incorrectly. (in scrollTo, Ensur…

…eVisible).
alezzacreative · Apr 10, 2017 · 86b2e75 · 86b2e75
1 parent 0f385aa
commit 86b2e75
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/gui/ObjectTreeWidget.cpp b/src/gui/ObjectTreeWidget.cpp
@@ -913,4 +913,19 @@ void ObjectTreeWidget::resizeEvent(QResizeEvent* aEvent)
     onScrollUpdated(scrollHeight());
 }
 
+void ObjectTreeWidget::scrollTo(const QModelIndex& aIndex, ScrollHint aHint)
+{
+    // Avoided qt bug that QTreeView scroll incorrectly (in scrollTo, EnsureVisible).
+    if (aHint == ScrollHint::EnsureVisible)
+    {
+        auto view = this->viewport()->rect();
+        auto rect = this->visualRect(aIndex);
+        if (view.top() <= rect.top() && rect.bottom() <= view.bottom())
+        {
+            return; // nothing to do
+        }
+    }
+    QTreeWidget::scrollTo(aIndex, aHint);
+}
+
 } // namespace gui
diff --git a/src/gui/ObjectTreeWidget.h b/src/gui/ObjectTreeWidget.h
@@ -63,6 +63,7 @@ class ObjectTreeWidget : public QTreeWidget
     virtual void rowsInserted(const QModelIndex& aParent, int aStart, int aEnd);
     virtual void scrollContentsBy(int aDx, int aDy);
     virtual void resizeEvent(QResizeEvent* aEvent);
+    virtual void scrollTo(const QModelIndex& aIndex, ScrollHint aHint);
 
     void createTree(core::ObjectTree* aTree);
     void addItemRecursive(QTreeWidgetItem* aItem, core::ObjectNode* aNode);