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

Merge branch 'grid-native-header-autosize'

Browse Source 
Fixes for auto-sizing grid columns when using native header control.

Closes https://github.com/wxWidgets/wxWidgets/pull/1579
This commit is contained in:
Vadim Zeitlin
2019-10-07 22:26:02 +02:00
parent 9fe0d58732 b2194d9ad5
commit 30dabbdf69
3 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/generic/grid.h
View File

@@ -2282,6 +2282,7 @@ protected:
friend class wxGridWindow;
friend class wxGridHeaderRenderer;
friend class wxGridHeaderColumn;
friend class wxGridHeaderCtrl;
private:
@@ -2404,6 +2405,8 @@ private:
wxGridColLabelWindow* colLabelWin);
void ProcessCornerLabelMouseEvent(wxMouseEvent& event);
void HandleColumnAutosize(int col, const wxMouseEvent& event);
void DoColHeaderClick(int col);
void DoStartResizeCol(int col);

8
include/wx/generic/private/grid.h
View File

@@ -95,7 +95,7 @@ public:
virtual wxString GetTitle() const wxOVERRIDE { return m_grid->GetColLabelValue(m_col); }
virtual wxBitmap GetBitmap() const wxOVERRIDE { return wxNullBitmap; }
virtual int GetWidth() const wxOVERRIDE { return m_grid->GetColSize(m_col); }
virtual int GetMinWidth() const wxOVERRIDE { return m_grid->GetColMinimalAcceptableWidth(); }
virtual int GetMinWidth() const wxOVERRIDE { return m_grid->GetColMinimalWidth(m_col); }
virtual wxAlignment GetAlignment() const wxOVERRIDE
{
int horz,
@@ -191,11 +191,9 @@ private:
}
// override to implement column auto sizing
virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle) wxOVERRIDE
virtual bool UpdateColumnWidthToFit(unsigned int idx, int WXUNUSED(widthTitle)) wxOVERRIDE
{
// TODO: currently grid doesn't support computing the column best width
// from its contents so we just use the best label width as is
GetOwner()->SetColSize(idx, widthTitle);
GetOwner()->HandleColumnAutosize(idx, GetDummyMouseEvent());
return true;
}