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

Rename the new sort-related methods

Browse Source 
Don't use SetAllowSort() in one class and {Allow,Forbid}Sort() in
another one, both could be fine on their own but not together.

Also simplify code by forbidding sorting only if necessary (and add a
comment explaining why do we do it), which removes the need for
re-allowing it from two different places.
This commit is contained in:
Vadim Zeitlin
2021-04-07 02:01:47 +02:00
parent 8c9c16a578
commit d173c3f74b
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gtk/dataview.cpp
View File

@@ -244,8 +244,8 @@ 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; } void AllowSort(bool allowed) { m_allow_sort = allowed; }
bool GetAllowSort() const { return m_allow_sort; } bool IsSortAllowed() 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?
@@ -356,7 +356,7 @@ public:
m_children.Add( id ); m_children.Add( id );
if (m_internal->GetAllowSort() && m_internal->ShouldBeSorted()) if ( m_internal->IsSortAllowed() && m_internal->ShouldBeSorted() )
{ {
gs_internal = m_internal; gs_internal = m_internal;
m_children.Sort( &wxGtkTreeModelChildCmp ); m_children.Sort( &wxGtkTreeModelChildCmp );
@@ -403,7 +403,7 @@ public:
{ {
m_children.Insert( id, pos ); m_children.Insert( id, pos );
if (m_internal->GetAllowSort() && m_internal->ShouldBeSorted()) if (m_internal->IsSortAllowed() && m_internal->ShouldBeSorted() )
{ {
gs_internal = m_internal; gs_internal = m_internal;
m_children.Sort( &wxGtkTreeModelChildCmp ); m_children.Sort( &wxGtkTreeModelChildCmp );
@@ -455,8 +455,7 @@ 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 AllowSort(bool allow) { m_internal->AllowSort(allow); }
void ForbidSort() { m_internal->SetAllowSort(false); }
void Resort(); void Resort();
@@ -3727,16 +3726,20 @@ 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 // Avoid sorting children multiple times when inserting many nodes,
node->ForbidSort(); // this results in O(N^2*log(N)) complexity.
if ( count > 1 )
node->AllowSort(false);
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) // Rr-enable sorting before inserting the last child if we had
node->AllowSort(); // disabled it above.
if ( pos == count - 1 && pos != 0 )
node->AllowSort(true);
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 ) );
@@ -3745,7 +3748,6 @@ 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
} }
} }