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

Mac: Add wxDataViewCtrl::AdjustAutosizedColumns()

Browse Source 
Refactor common code and also for upcoming accessibility from
wxCocoaOutlineView.

Part of #19003.

Co-Authored-By: Dimitri Schoolwerth <dimitri@schoolwerth.com>
This commit is contained in:
Andreas Falkenhahn
2020-12-22 01:58:46 +01:00
committed by Dimitri Schoolwerth
parent 1324b5122b
commit 9a78bfb553
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/osx/dataview.h
View File

@@ -261,6 +261,8 @@ public:
m_Deleting = deleting; m_Deleting = deleting;
} }
void AdjustAutosizedColumns() const;
virtual wxDataViewColumn *GetCurrentColumn() const wxOVERRIDE; virtual wxDataViewColumn *GetCurrentColumn() const wxOVERRIDE;
virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE

14
src/osx/dataview_osx.cpp
View File

@@ -506,9 +506,7 @@ int wxDataViewCtrl::GetColumnPosition(wxDataViewColumn const* columnPtr) const
void wxDataViewCtrl::Collapse(wxDataViewItem const& item) void wxDataViewCtrl::Collapse(wxDataViewItem const& item)
{ {
GetDataViewPeer()->Collapse(item); GetDataViewPeer()->Collapse(item);
AdjustAutosizedColumns();
if ( m_ModelNotifier )
m_ModelNotifier->AdjustAutosizedColumns();
} }
void wxDataViewCtrl::EnsureVisible(wxDataViewItem const& item, wxDataViewColumn const* columnPtr) void wxDataViewCtrl::EnsureVisible(wxDataViewItem const& item, wxDataViewColumn const* columnPtr)
@@ -523,9 +521,7 @@ void wxDataViewCtrl::EnsureVisible(wxDataViewItem const& item, wxDataViewColumn
void wxDataViewCtrl::DoExpand(wxDataViewItem const& item, bool expandChildren) void wxDataViewCtrl::DoExpand(wxDataViewItem const& item, bool expandChildren)
{ {
GetDataViewPeer()->DoExpand(item, expandChildren); GetDataViewPeer()->DoExpand(item, expandChildren);
AdjustAutosizedColumns();
if ( m_ModelNotifier )
m_ModelNotifier->AdjustAutosizedColumns();
} }
bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const
@@ -701,6 +697,12 @@ void wxDataViewCtrl::FinishCustomItemEditing()
} }
} }
void wxDataViewCtrl::AdjustAutosizedColumns() const
{
if ( m_ModelNotifier )
m_ModelNotifier->AdjustAutosizedColumns();
}
/*static*/ /*static*/
wxVisualAttributes wxVisualAttributes
wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))