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

Support arbitrary scale factors, not just 2, when loading bitmaps

Browse Source 
This notably enables support for @3x icons used under iOS.

Closes https://github.com/wxWidgets/wxWidgets/pull/1983
This commit is contained in:
Stefan Csomor
2020-07-18 13:17:31 +02:00
committed by Vadim Zeitlin
parent ee09efdb63
commit 9f89467ff1
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/osx/core/bitmap.cpp
View File

@@ -17,6 +17,7 @@
#include "wx/dcmemory.h" #include "wx/dcmemory.h"
#include "wx/icon.h" #include "wx/icon.h"
#include "wx/image.h" #include "wx/image.h"
#include "wx/math.h"
#endif #endif
#include "wx/metafile.h" #include "wx/metafile.h"
@@ -1062,16 +1063,17 @@ bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
if ( type == wxBITMAP_TYPE_PNG ) if ( type == wxBITMAP_TYPE_PNG )
{ {
if ( wxOSXGetMainScreenContentScaleFactor() > 1.9 ) const int contentScaleFactor = wxRound(wxOSXGetMainScreenContentScaleFactor());
if ( contentScaleFactor > 1 )
{ {
wxFileName fn(filename); wxFileName fn(filename);
fn.MakeAbsolute(); fn.MakeAbsolute();
fn.SetName(fn.GetName()+"@2x"); fn.SetName(fn.GetName()+wxString::Format("@%dx",contentScaleFactor));
if ( fn.Exists() ) if ( fn.Exists() )
{ {
fname = fn.GetFullPath(); fname = fn.GetFullPath();
scale = 2.0; scale = contentScaleFactor;
} }
} }
} }
@@ -1896,21 +1898,22 @@ bool wxBundleResourceHandler::LoadFile(wxBitmap *bitmap,
int WXUNUSED(desiredHeight)) int WXUNUSED(desiredHeight))
{ {
wxString ext = GetExtension().Lower(); wxString ext = GetExtension().Lower();
wxCFStringRef resname(name);
wxCFStringRef resname2x(name+"@2x");
wxCFStringRef restype(ext); wxCFStringRef restype(ext);
double scale = 1.0; double scale = 1.0;
wxCFRef<CFURLRef> imageURL; wxCFRef<CFURLRef> imageURL;
if ( wxOSXGetMainScreenContentScaleFactor() > 1.9 ) const int contentScaleFactor = wxRound(wxOSXGetMainScreenContentScaleFactor());
if ( contentScaleFactor > 1 )
{ {
imageURL.reset(CFBundleCopyResourceURL(CFBundleGetMainBundle(), resname2x, restype, NULL)); wxCFStringRef resname(wxString::Format("%s@%dx", name, contentScaleFactor));
scale = 2.0; imageURL.reset(CFBundleCopyResourceURL(CFBundleGetMainBundle(), resname, restype, NULL));
scale = contentScaleFactor;
} }
if ( imageURL.get() == NULL ) if ( imageURL.get() == NULL )
{ {
wxCFStringRef resname(name);
imageURL.reset(CFBundleCopyResourceURL(CFBundleGetMainBundle(), resname, restype, NULL)); imageURL.reset(CFBundleCopyResourceURL(CFBundleGetMainBundle(), resname, restype, NULL));
scale = 1.0; scale = 1.0;
} }