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

Merge branch 'dvc-col-update'

Browse Source 
Avoid recursively updating wxHeaderColumns during resize in the generic
wxDataViewCtrl implementation.

See https://github.com/wxWidgets/wxWidgets/pull/1711
This commit is contained in:
Vadim Zeitlin
2020-01-19 17:48:19 +01:00
parent a73194f6b4 b02fbafb96
commit c1ef9f1f2d
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/generic/datavgen.cpp
View File

@@ -204,6 +204,14 @@ int wxDataViewColumn::GetWidth() const
}
}
void wxDataViewColumn::WXOnResize(int width)
{
m_width =
m_manuallySetWidth = width;
m_owner->OnColumnResized();
}
void wxDataViewColumn::UpdateDisplay()
{
if (m_owner)
@@ -401,8 +409,7 @@ private:
wxDataViewCtrl * const owner = GetOwner();
const unsigned col = event.GetColumn();
owner->GetColumn(col)->SetWidth(event.GetWidth());
GetOwner()->OnColumnChange(col);
owner->GetColumn(col)->WXOnResize(event.GetWidth());
}
void OnEndReorder(wxHeaderCtrlEvent& event)
@@ -5455,6 +5462,11 @@ bool wxDataViewCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col )
return true;
}
void wxDataViewCtrl::OnColumnResized()
{
m_clientArea->UpdateDisplay();
}
void wxDataViewCtrl::OnColumnWidthChange(unsigned int idx)
{
InvalidateColBestWidth(idx);