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

Revert "Fix expansion of the last column in macOS wxDataViewCtrl"

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

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

@@ -2244,7 +2244,6 @@ void wxCocoaDataViewControl::FitColumnWidthToContent(unsigned int pos)
{
const int count = GetCount();
NSTableColumn *column = GetColumn(pos)->GetNativeData()->GetNativeColumnPtr();
UInt32 const noOfColumns = [[m_OutlineView tableColumns] count];
class MaxWidthCalculator
{
@@ -2375,10 +2374,7 @@ void wxCocoaDataViewControl::FitColumnWidthToContent(unsigned int pos)
if ( m_expanderWidth == 0 )
m_expanderWidth = calculator.GetExpanderWidth();
if ( pos == noOfColumns - 1 )
[m_OutlineView sizeLastColumnToFit];
else
[column setWidth:calculator.GetMaxWidth() + m_expanderWidth];
[column setWidth:calculator.GetMaxWidth() + m_expanderWidth];
if ( !(GetDataViewCtrl()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) )
{