#6166: Invoke EnsureVisible() in idle processing after an item has be…

…en selected
codereader · Nov 17, 2022 · 9b5eb96 · 9b5eb96
1 parent a14c7ab
commit 9b5eb96
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/radiant/ui/entitylist/EntityList.cpp b/radiant/ui/entitylist/EntityList.cpp
@@ -64,6 +64,9 @@ void EntityList::onPanelDeactivated()
     // Unselect everything when hiding the dialog
     util::ScopedBoolLock lock(_callbackActive);
     _treeView->UnselectAll();
+
+    cancelCallbacks();
+    _itemToScrollToWhenIdle.Unset();
 }
 
 void EntityList::connectListeners()
@@ -216,6 +219,15 @@ void EntityList::expandRootNode()
 	}
 }
 
+void EntityList::onIdle()
+{
+    if (_itemToScrollToWhenIdle.IsOk())
+    {
+        _treeView->EnsureVisible(_itemToScrollToWhenIdle);
+        _itemToScrollToWhenIdle.Unset();
+    }
+}
+
 void EntityList::onTreeViewSelection(const wxDataViewItem& item, bool selected)
 {
 	if (selected)
@@ -226,8 +238,9 @@ void EntityList::onTreeViewSelection(const wxDataViewItem& item, bool selected)
 		// Remember this item
 		_selection.insert(item);
 
-		// Scroll to the row
-		_treeView->EnsureVisible(item);
+		// Scroll to the row, but don't do this immediately (can be expensive)
+        _itemToScrollToWhenIdle = item;
+        requestIdleCallback();
 	}
 	else
 	{

diff --git a/radiant/ui/entitylist/EntityList.h b/radiant/ui/entitylist/EntityList.h
@@ -6,6 +6,7 @@
 #include <sigc++/connection.h>
 
 #include "wxutil/DockablePanel.h"
+#include "wxutil/event/SingleIdleCallback.h"
 
 namespace wxutil
 {
@@ -19,7 +20,8 @@ namespace ui
 
 class EntityList :
 	public wxutil::DockablePanel,
-    public selection::SelectionSystem::Observer
+    public selection::SelectionSystem::Observer,
+    public wxutil::SingleIdleCallback
 {
 private:
 	// The GraphTreeModel instance
@@ -44,6 +46,8 @@ class EntityList :
 
 	std::set<wxDataViewItem, DataViewItemLess> _selection;
 
+    wxDataViewItem _itemToScrollToWhenIdle;
+
 public:
 	EntityList(wxWindow* parent);
     ~EntityList() override;
@@ -52,6 +56,8 @@ class EntityList :
     void onPanelActivated() override;
     void onPanelDeactivated() override;
 
+    void onIdle() override;
+
 private:
     void connectListeners();
     void disconnectListeners();