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

Use correct expander size in wxDataViewCtrl under MSW

Browse Source 
Add wxRendererNative::GetExpanderSize(), implement it using the
appropriate theme element and use it instead of hardcoding the expander
size to 3 character widths.

Closes https://github.com/wxWidgets/wxWidgets/pull/1431

Closes #18449.
This commit is contained in:
PeterO
2019-07-19 23:38:27 +02:00
committed by Vadim Zeitlin
parent 3d970a9c08
commit 8f386265dc
5 changed files with 55 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/generic/datavgen.cpp
View File

@@ -2573,17 +2573,17 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
// Calculate the indent first
indent = GetOwner()->GetIndent() * node->GetIndentLevel();
// We don't have any method to return the size of the expander
// button currently (TODO: add one to wxRendererNative), so
// just guesstimate it.
const int expWidth = 3*dc.GetCharWidth();
// Get expander size
wxSize expSize = wxRendererNative::Get().GetExpanderSize(this);
// draw expander if needed
if ( node->HasChildren() )
{
wxRect rect = cell_rect;
rect.x += indent;
rect.width = expWidth;
rect.y += (cell_rect.GetHeight() - expSize.GetHeight()) / 2; // center vertically
rect.width = expSize.GetWidth();
rect.height = expSize.GetHeight();
int flag = 0;
if ( m_underMouse == node )
@@ -2598,7 +2598,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag);
}
indent += expWidth;
indent += expSize.GetWidth();
// force the expander column to left-center align
cell->SetAlignment( wxALIGN_CENTER_VERTICAL );