Fix wxToolBarBase::AdjustToolBitmapSize() for HiDPI on OS X

wxOSX's wxToolBar code uses toolbar size computed by
AdjustToolBitmapSize() to determine which of the builtin toolbar sizes
to use. Because AdjustToolBitmapSize() returned 2x the "logical" size,
it would always pick NSToolbarSizeModeRegular regardless of icon size,
resulting in differently-sized toolbar on HiDPI and low-DPI screens.
Use scaled size instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2014-11-02 16:28:12 +00:00
parent 7e96398e63
commit 06ddf44a27

View File

@@ -453,7 +453,7 @@ void wxToolBarBase::AdjustToolBitmapSize()
{
const wxBitmap& bmp = (*i)->GetNormalBitmap();
if ( bmp.IsOk() )
sizeActual.IncTo(bmp.GetSize());
sizeActual.IncTo(bmp.GetScaledSize());
}
if ( sizeActual != sizeOrig )