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

using GetPreferredSizeAtScale when assembling native NSImage from a bitmap bundle

Browse Source
This commit is contained in:
Stefan Csomor
2021-10-21 15:30:32 +02:00
parent 6f2a1fa55d
commit 98f056daf5
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osx/core/bmpbndl.mm
View File

@@ -249,12 +249,14 @@ WXImage wxOSXGetImageFromBundle(const wxBitmapBundle& bundle)
wxBitmap bmp = const_cast<wxBitmapBundleImpl*>(impl)->GetBitmap(sz); wxBitmap bmp = const_cast<wxBitmapBundleImpl*>(impl)->GetBitmap(sz);
image = wxOSXImageFromBitmap(bmp); image = wxOSXImageFromBitmap(bmp);
// unconditionally try to add a 2x version // unconditionally try to add a 2x version, if there really is a different one
double scale = 2.0; wxSize doublesz = impl->GetPreferredSizeAtScale(2.0);
wxSize doublesz = sz * scale; if ( doublesz != sz )
{
bmp = const_cast<wxBitmapBundleImpl*>(impl)->GetBitmap(doublesz); bmp = const_cast<wxBitmapBundleImpl*>(impl)->GetBitmap(doublesz);
if ( bmp.IsOk() && bmp.GetSize() != sz ) if ( bmp.IsOk() )
wxOSXAddBitmapToImage(image, bmp); wxOSXAddBitmapToImage(image, bmp);
}
#else #else
double scale = wxOSXGetMainScreenContentScaleFactor(); double scale = wxOSXGetMainScreenContentScaleFactor();
wxSize scaledSize = sz * scale; wxSize scaledSize = sz * scale;