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

Use bitmap bundle rather than scaled bitmap size in wxToolBar

Browse Source 
Get the minimum size needed for the bitmaps from wxBitmapBundle.
This commit is contained in:
Vadim Zeitlin
2021-10-17 18:28:52 +01:00
parent 62b6539eea
commit 04a8e0e5bd
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/tbarbase.cpp
View File

@@ -444,13 +444,14 @@ void wxToolBarBase::AdjustToolBitmapSize()
wxSize sizeActual(sizeOrig); wxSize sizeActual(sizeOrig);
const double scale = GetDPIScaleFactor();
for ( wxToolBarToolsList::const_iterator i = m_tools.begin(); for ( wxToolBarToolsList::const_iterator i = m_tools.begin();
i != m_tools.end(); i != m_tools.end();
++i ) ++i )
{ {
const wxBitmap& bmp = (*i)->GetNormalBitmap(); const wxBitmapBundle& bmp = (*i)->GetNormalBitmapBundle();
if ( bmp.IsOk() ) if ( bmp.IsOk() )
sizeActual.IncTo(bmp.GetScaledSize()); sizeActual.IncTo(bmp.GetDefaultSize()*scale);
} }
if ( sizeActual != sizeOrig ) if ( sizeActual != sizeOrig )