Merge pull request #1570 from lioncash/scale
WxUtils: Get rid of GetCurrentBitmapLogicalScale
This commit is contained in:
commit
f7d1943615
|
@ -8,11 +8,13 @@
|
|||
#include <memory>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <wx/app.h>
|
||||
#include <wx/bitmap.h>
|
||||
#include <wx/filefn.h>
|
||||
#include <wx/gdicmn.h>
|
||||
#include <wx/image.h>
|
||||
#include <wx/string.h>
|
||||
#include <wx/window.h>
|
||||
|
||||
#include "Common/ChunkFile.h"
|
||||
#include "Common/CommonPaths.h"
|
||||
|
@ -131,7 +133,7 @@ GameListItem::GameListItem(const std::string& _rFileName)
|
|||
if (!m_pImage.empty())
|
||||
{
|
||||
wxImage Image(m_ImageWidth, m_ImageHeight, &m_pImage[0], true);
|
||||
double Scale = WxUtils::GetCurrentBitmapLogicalScale();
|
||||
double Scale = wxTheApp->GetTopWindow()->GetContentScaleFactor();
|
||||
// Note: This uses nearest neighbor, which subjectively looks a lot
|
||||
// better for GC banners than smooths caling.
|
||||
Image.Rescale(DVD_BANNER_WIDTH * Scale, DVD_BANNER_HEIGHT * Scale);
|
||||
|
|
|
@ -58,18 +58,6 @@ void ShowErrorDialog(const wxString& error_msg)
|
|||
wxMessageBox(error_msg, _("Error"), wxOK | wxICON_ERROR);
|
||||
}
|
||||
|
||||
double GetCurrentBitmapLogicalScale()
|
||||
{
|
||||
#ifdef __APPLE__
|
||||
// wx doesn't expose this itself, unfortunately.
|
||||
if ([[NSScreen mainScreen] respondsToSelector:@selector(backingScaleFactor)])
|
||||
{
|
||||
return [[NSScreen mainScreen] backingScaleFactor];
|
||||
}
|
||||
#endif
|
||||
return 1.0;
|
||||
}
|
||||
|
||||
wxBitmap _wxGetBitmapFromMemory(const unsigned char* data, int length)
|
||||
{
|
||||
wxMemoryInputStream is(data, length);
|
||||
|
|
|
@ -25,8 +25,6 @@ void Explore(const std::string& path);
|
|||
// Displays a wxMessageBox geared for errors
|
||||
void ShowErrorDialog(const wxString& error_msg);
|
||||
|
||||
double GetCurrentBitmapLogicalScale();
|
||||
|
||||
wxBitmap _wxGetBitmapFromMemory(const unsigned char* data, int length);
|
||||
|
||||
// From a wxBitmap, creates the corresponding disabled version for toolbar buttons
|
||||
|
|
Loading…
Reference in New Issue