ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only wxMac supports scaleFactor, so only use it on OS X

This commit is contained in:
Jeffrey Pfau 2015-04-25 14:53:37 -07:00
parent 4a97045d81
commit af20e7498c
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/DolphinWX/AboutDolphin.cpp
View File

@ -38,8 +38,9 @@ AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id,
const wxSize& size, long style) const wxSize& size, long style)
: wxDialog(parent, id, title, position, size, style) : wxDialog(parent, id, title, position, size, style)
{ {
const unsigned char* dolphin_logo_bin; const unsigned char* dolphin_logo_bin = dolphin_logo_png;
size_t dolphin_logo_size; size_t dolphin_logo_size = sizeof dolphin_logo_png;
#ifdef __APPLE__
double scaleFactor = 1.0; double scaleFactor = 1.0;
if (GetContentScaleFactor() >= 2) if (GetContentScaleFactor() >= 2)
{ {
@ -47,15 +48,16 @@ AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id,
dolphin_logo_size = sizeof dolphin_logo_2x_png; dolphin_logo_size = sizeof dolphin_logo_2x_png;
scaleFactor = 2.0; scaleFactor = 2.0;
} }
else #endif
{
dolphin_logo_bin = dolphin_logo_png;
dolphin_logo_size = sizeof dolphin_logo_png;
}
wxMemoryInputStream istream(dolphin_logo_bin, dolphin_logo_size); wxMemoryInputStream istream(dolphin_logo_bin, dolphin_logo_size);
wxImage iDolphinLogo(istream, wxBITMAP_TYPE_PNG); wxImage iDolphinLogo(istream, wxBITMAP_TYPE_PNG);
#ifdef __APPLE__
wxGenericStaticBitmap* const sbDolphinLogo = new wxGenericStaticBitmap(this, wxID_ANY, wxGenericStaticBitmap* const sbDolphinLogo = new wxGenericStaticBitmap(this, wxID_ANY,
wxBitmap(iDolphinLogo, -1, scaleFactor)); wxBitmap(iDolphinLogo, -1, scaleFactor));
#else
wxGenericStaticBitmap* const sbDolphinLogo = new wxGenericStaticBitmap(this, wxID_ANY,
wxBitmap(iDolphinLogo));
#endif
const wxString DolphinText = _("Dolphin"); const wxString DolphinText = _("Dolphin");
const wxString RevisionText = scm_desc_str; const wxString RevisionText = scm_desc_str;