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

Fix wxDataViewCheckIconTextRenderer icon size with GTK3

Browse Source
This commit is contained in:
Paul Cornett
2020-09-17 09:29:30 -07:00
parent 32cc9317f2
commit dcdcbbe078
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/datavcmn.cpp
View File

@@ -2080,7 +2080,11 @@ wxSize wxDataViewCheckIconTextRenderer::GetSize() const
if ( m_value.GetIcon().IsOk() ) if ( m_value.GetIcon().IsOk() )
{ {
#ifdef __WXGTK3__
const wxSize sizeIcon = m_value.GetIcon().GetScaledSize();
#else
const wxSize sizeIcon = m_value.GetIcon().GetSize(); const wxSize sizeIcon = m_value.GetIcon().GetSize();
#endif
if ( sizeIcon.y > size.y ) if ( sizeIcon.y > size.y )
size.y = sizeIcon.y; size.y = sizeIcon.y;
@@ -2137,7 +2141,11 @@ bool wxDataViewCheckIconTextRenderer::Render(wxRect cell, wxDC* dc, int state)
const wxIcon& icon = m_value.GetIcon(); const wxIcon& icon = m_value.GetIcon();
if ( icon.IsOk() ) if ( icon.IsOk() )
{ {
#ifdef __WXGTK3__
const wxSize sizeIcon = icon.GetScaledSize();
#else
const wxSize sizeIcon = icon.GetSize(); const wxSize sizeIcon = icon.GetSize();
#endif
wxRect rectIcon(cell.GetPosition(), sizeIcon); wxRect rectIcon(cell.GetPosition(), sizeIcon);
rectIcon.x += xoffset; rectIcon.x += xoffset;
rectIcon = rectIcon.CentreIn(cell, wxVERTICAL); rectIcon = rectIcon.CentreIn(cell, wxVERTICAL);