Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Speed up inserting items in sorted wxDataViewCtrl in wxGTK

Browse Source 
Avoid resorting the tree on each insertion, this results in horrible
performance even with a few thousand items. Instead, sort all the new
items only once at the end.
This commit is contained in:
sbesombes
2021-04-06 21:00:27 +02:00
committed by Vadim Zeitlin
parent 0ff1bdec09
commit 0ab446140d
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gtk/dataview.cpp
View File

@@ -244,6 +244,9 @@ public:
bool IsSorted() const { return m_sort_column >= 0; } bool IsSorted() const { return m_sort_column >= 0; }
void SetAllowSort( bool allowed ) { m_allow_sort = allowed; }
bool GetAllowSort() const { return m_allow_sort; }
// Should we be sorted either because we have a configured sort column or // Should we be sorted either because we have a configured sort column or
// because we have a default sort order? // because we have a default sort order?
bool ShouldBeSorted() const bool ShouldBeSorted() const
@@ -286,6 +289,7 @@ private:
GtkSortType m_sort_order; GtkSortType m_sort_order;
wxDataViewColumn *m_dataview_sort_column; wxDataViewColumn *m_dataview_sort_column;
int m_sort_column; int m_sort_column;
bool m_allow_sort;
GtkTargetEntry m_dragSourceTargetEntry; GtkTargetEntry m_dragSourceTargetEntry;
wxCharBuffer m_dragSourceTargetEntryTarget; wxCharBuffer m_dragSourceTargetEntryTarget;
@@ -352,7 +356,7 @@ public:
m_children.Add( id ); m_children.Add( id );
if (m_internal->ShouldBeSorted()) if (m_internal->GetAllowSort() && m_internal->ShouldBeSorted())
{ {
gs_internal = m_internal; gs_internal = m_internal;
m_children.Sort( &wxGtkTreeModelChildCmp ); m_children.Sort( &wxGtkTreeModelChildCmp );
@@ -399,7 +403,7 @@ public:
{ {
m_children.Insert( id, pos ); m_children.Insert( id, pos );
if (m_internal->ShouldBeSorted()) if (m_internal->GetAllowSort() && m_internal->ShouldBeSorted())
{ {
gs_internal = m_internal; gs_internal = m_internal;
m_children.Sort( &wxGtkTreeModelChildCmp ); m_children.Sort( &wxGtkTreeModelChildCmp );
@@ -451,6 +455,9 @@ public:
wxDataViewItem &GetItem() { return m_item; } wxDataViewItem &GetItem() { return m_item; }
wxDataViewCtrlInternal *GetInternal() { return m_internal; } wxDataViewCtrlInternal *GetInternal() { return m_internal; }
void AllowSort() { m_internal->SetAllowSort(true); }
void ForbidSort() { m_internal->SetAllowSort(false); }
void Resort(); void Resort();
private: private:
@@ -3719,11 +3726,17 @@ void wxDataViewCtrlInternal::BuildBranch( wxGtkTreeModelNode *node )
wxDataViewItemArray children; wxDataViewItemArray children;
unsigned int count = m_wx_model->GetChildren( node->GetItem(), children ); unsigned int count = m_wx_model->GetChildren( node->GetItem(), children );
// node will be sorted after last child is inserted
node->ForbidSort();
unsigned int pos; unsigned int pos;
for (pos = 0; pos < count; pos++) for (pos = 0; pos < count; pos++)
{ {
wxDataViewItem child = children[pos]; wxDataViewItem child = children[pos];
if (pos==count-1)
node->AllowSort();
if (m_wx_model->IsContainer( child )) if (m_wx_model->IsContainer( child ))
node->AddNode( new wxGtkTreeModelNode( node, child, this ) ); node->AddNode( new wxGtkTreeModelNode( node, child, this ) );
else else
@@ -3731,6 +3744,7 @@ void wxDataViewCtrlInternal::BuildBranch( wxGtkTreeModelNode *node )
// Don't send any events here // Don't send any events here
} }
node->AllowSort(); // in case there is no child
} }
} }