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

Revert "Autosize the right columns in macOS wxDataViewCtrl"

Browse Source 
This reverts commit 36ea7ff4d6.
This commit is contained in:
Václav Slavík
2021-08-10 19:13:16 +02:00
parent 5f34d07bc1
commit 4d62a7a08f
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osx/cocoa/dataview.mm
View File

@@ -2377,7 +2377,7 @@ void wxCocoaDataViewControl::FitColumnWidthToContent(unsigned int pos)
if ( pos == noOfColumns - 1 ) if ( pos == noOfColumns - 1 )
[m_OutlineView sizeLastColumnToFit]; [m_OutlineView sizeLastColumnToFit];
else if ( GetColumn(pos)->GetWidthVariable() == wxCOL_WIDTH_AUTOSIZE ) else
[column setWidth:calculator.GetMaxWidth() + m_expanderWidth]; [column setWidth:calculator.GetMaxWidth() + m_expanderWidth];
if ( !(GetDataViewCtrl()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) ) if ( !(GetDataViewCtrl()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) )

5
src/osx/dataview_osx.cpp
View File

@@ -302,7 +302,10 @@ void wxOSXDataViewModelNotifier::AdjustAutosizedColumns()
unsigned count = m_DataViewCtrlPtr->GetColumnCount(); unsigned count = m_DataViewCtrlPtr->GetColumnCount();
for ( unsigned col = 0; col < count; col++ ) for ( unsigned col = 0; col < count; col++ )
{ {
m_DataViewCtrlPtr->GetDataViewPeer()->FitColumnWidthToContent(col); wxDataViewColumn *column = m_DataViewCtrlPtr->GetColumnPtr(col);
if ( column->GetWidthVariable() == wxCOL_WIDTH_AUTOSIZE )
m_DataViewCtrlPtr->GetDataViewPeer()->FitColumnWidthToContent(col);
} }
} }