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

Rename AllowSort() to FreezeSort()

Browse Source 
This better reflects the temporary nature of forbidding sort.

Also add a comment describing this better.
This commit is contained in:
Vadim Zeitlin
2021-04-07 02:06:12 +02:00
parent d173c3f74b
commit 0a0a571ee2
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gtk/dataview.cpp
View File

@@ -244,8 +244,12 @@ public:
bool IsSorted() const { return m_sort_column >= 0; } bool IsSorted() const { return m_sort_column >= 0; }
void AllowSort(bool allowed) { m_allow_sort = allowed; } // Freezing sort temporarily disables sorting when inserting the items into
bool IsSortAllowed() const { return m_allow_sort; } // the tree as an optimization when inserting many items. Sort must be
// thawed, by calling FreezeSort(false), before inserting the last item to
// ensure that the items still end up in the right order.
void FreezeSort(bool freeze) { m_sort_frozen = freeze; }
bool IsSortFrozen() const { return m_sort_frozen; }
// 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?
@@ -289,7 +293,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; bool m_sort_frozen;
GtkTargetEntry m_dragSourceTargetEntry; GtkTargetEntry m_dragSourceTargetEntry;
wxCharBuffer m_dragSourceTargetEntryTarget; wxCharBuffer m_dragSourceTargetEntryTarget;
@@ -356,7 +360,7 @@ public:
m_children.Add( id ); m_children.Add( id );
if ( m_internal->IsSortAllowed() && m_internal->ShouldBeSorted() ) if ( !m_internal->IsSortFrozen() && m_internal->ShouldBeSorted() )
{ {
gs_internal = m_internal; gs_internal = m_internal;
m_children.Sort( &wxGtkTreeModelChildCmp ); m_children.Sort( &wxGtkTreeModelChildCmp );
@@ -403,7 +407,7 @@ public:
{ {
m_children.Insert( id, pos ); m_children.Insert( id, pos );
if (m_internal->IsSortAllowed() && m_internal->ShouldBeSorted() ) if ( !m_internal->IsSortFrozen() && m_internal->ShouldBeSorted() )
{ {
gs_internal = m_internal; gs_internal = m_internal;
m_children.Sort( &wxGtkTreeModelChildCmp ); m_children.Sort( &wxGtkTreeModelChildCmp );
@@ -455,7 +459,7 @@ public:
wxDataViewItem &GetItem() { return m_item; } wxDataViewItem &GetItem() { return m_item; }
wxDataViewCtrlInternal *GetInternal() { return m_internal; } wxDataViewCtrlInternal *GetInternal() { return m_internal; }
void AllowSort(bool allow) { m_internal->AllowSort(allow); } void FreezeSort(bool freeze) { m_internal->FreezeSort(freeze); }
void Resort(); void Resort();
@@ -3630,7 +3634,7 @@ wxDataViewCtrlInternal::wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataVie
m_root = NULL; m_root = NULL;
m_sort_order = GTK_SORT_ASCENDING; m_sort_order = GTK_SORT_ASCENDING;
m_sort_column = -1; m_sort_column = -1;
m_allow_sort = true; m_sort_frozen = false;
m_dataview_sort_column = NULL; m_dataview_sort_column = NULL;
m_dragDataObject = NULL; m_dragDataObject = NULL;
@@ -3729,7 +3733,7 @@ void wxDataViewCtrlInternal::BuildBranch( wxGtkTreeModelNode *node )
// Avoid sorting children multiple times when inserting many nodes, // Avoid sorting children multiple times when inserting many nodes,
// this results in O(N^2*log(N)) complexity. // this results in O(N^2*log(N)) complexity.
if ( count > 1 ) if ( count > 1 )
node->AllowSort(false); node->FreezeSort(true);
unsigned int pos; unsigned int pos;
for (pos = 0; pos < count; pos++) for (pos = 0; pos < count; pos++)
@@ -3739,7 +3743,7 @@ void wxDataViewCtrlInternal::BuildBranch( wxGtkTreeModelNode *node )
// Rr-enable sorting before inserting the last child if we had // Rr-enable sorting before inserting the last child if we had
// disabled it above. // disabled it above.
if ( pos == count - 1 && pos != 0 ) if ( pos == count - 1 && pos != 0 )
node->AllowSort(true); node->FreezeSort(false);
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 ) );