From 4d62a7a08f2075d05594c5878d4731f60ac3d8d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Tue, 10 Aug 2021 19:13:16 +0200 Subject: [PATCH] Revert "Autosize the right columns in macOS wxDataViewCtrl" This reverts commit 36ea7ff4d61e174a2d116819f98e66f22a7f5b8a. --- src/osx/cocoa/dataview.mm | 2 +- src/osx/dataview_osx.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm index 49382f52cc..534553022f 100644 --- a/src/osx/cocoa/dataview.mm +++ b/src/osx/cocoa/dataview.mm @@ -2377,7 +2377,7 @@ void wxCocoaDataViewControl::FitColumnWidthToContent(unsigned int pos) if ( pos == noOfColumns - 1 ) [m_OutlineView sizeLastColumnToFit]; - else if ( GetColumn(pos)->GetWidthVariable() == wxCOL_WIDTH_AUTOSIZE ) + else [column setWidth:calculator.GetMaxWidth() + m_expanderWidth]; if ( !(GetDataViewCtrl()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) ) diff --git a/src/osx/dataview_osx.cpp b/src/osx/dataview_osx.cpp index be92e53da1..def9d099d4 100644 --- a/src/osx/dataview_osx.cpp +++ b/src/osx/dataview_osx.cpp @@ -302,7 +302,10 @@ void wxOSXDataViewModelNotifier::AdjustAutosizedColumns() unsigned count = m_DataViewCtrlPtr->GetColumnCount(); 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); } }