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

Fix image loading on Retina and other HiDPI displays.

This commit is contained in:
Augustin Cavalier 2014-10-27 13:11:55 -04:00
parent 32c6848c79
commit 5b4b74de6a
3 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/DolphinQt/Main.cpp
View File

@ -39,6 +39,7 @@ static QString LowestSupportedOsVersion()
int main(int argc, char* argv[])
{
QApplication app(argc, argv);
app.setAttribute(Qt::AA_UseHighDpiPixmaps);
// TODO: Add command line options
UICommon::CreateDirectories();

47
Source/Core/DolphinQt/Utils/Resources.cpp
View File

@ -2,6 +2,9 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include <QApplication>
#include <QFile>
#include "Common/FileUtil.h"
#include "Core/ConfigManager.h"
@ -47,26 +50,40 @@ void Resources::Init()
UpdatePixmaps();
}
// Wrapper for GetImageFilename() so you don't have to to call it directly
#define GIFN(file) GetImageFilename(SL(file), dir)
void Resources::UpdatePixmaps()
{
QString dir = QString::fromStdString(File::GetThemeDir(SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name));
m_pixmaps[TOOLBAR_OPEN].load(dir + SL("open.png"));
m_pixmaps[TOOLBAR_REFRESH].load(dir + SL("refresh.png"));
m_pixmaps[TOOLBAR_BROWSE].load(dir + SL("browse.png"));
m_pixmaps[TOOLBAR_PLAY].load(dir + SL("play.png"));
m_pixmaps[TOOLBAR_STOP].load(dir + SL("stop.png"));
m_pixmaps[TOOLBAR_PAUSE].load(dir + SL("pause.png"));
m_pixmaps[TOOLBAR_FULLSCREEN].load(dir + SL("fullscreen.png"));
m_pixmaps[TOOLBAR_SCREENSHOT].load(dir + SL("screenshot.png"));
m_pixmaps[TOOLBAR_CONFIGURE].load(dir + SL("config.png"));
m_pixmaps[TOOLBAR_PLUGIN_GFX].load(dir + SL("graphics.png"));
m_pixmaps[TOOLBAR_PLUGIN_DSP].load(dir + SL("dsp.png"));
m_pixmaps[TOOLBAR_PLUGIN_GCPAD].load(dir + SL("gcpad.png"));
m_pixmaps[TOOLBAR_PLUGIN_WIIMOTE].load(dir + SL("wiimote.png"));
m_pixmaps[TOOLBAR_HELP].load(dir + SL("nobanner.png")); // TODO
m_pixmaps[TOOLBAR_OPEN].load(GIFN("open"));
m_pixmaps[TOOLBAR_REFRESH].load(GIFN("refresh"));
m_pixmaps[TOOLBAR_BROWSE].load(GIFN("browse"));
m_pixmaps[TOOLBAR_PLAY].load(GIFN("play"));
m_pixmaps[TOOLBAR_STOP].load(GIFN("stop"));
m_pixmaps[TOOLBAR_PAUSE].load(GIFN("pause"));
m_pixmaps[TOOLBAR_FULLSCREEN].load(GIFN("fullscreen"));
m_pixmaps[TOOLBAR_SCREENSHOT].load(GIFN("screenshot"));
m_pixmaps[TOOLBAR_CONFIGURE].load(GIFN("config"));
m_pixmaps[TOOLBAR_PLUGIN_GFX].load(GIFN("graphics"));
m_pixmaps[TOOLBAR_PLUGIN_DSP].load(GIFN("dsp"));
m_pixmaps[TOOLBAR_PLUGIN_GCPAD].load(GIFN("gcpad"));
m_pixmaps[TOOLBAR_PLUGIN_WIIMOTE].load(GIFN("wiimote"));
m_pixmaps[TOOLBAR_HELP].load(GIFN("nobanner")); // TODO
// TODO: toolbar[MEMCARD];
// TODO: toolbar[HOTKEYS];
m_pixmaps[BANNER_MISSING].load(dir + SL("nobanner.png"));
m_pixmaps[BANNER_MISSING].load(GIFN("nobanner"));
}
QString Resources::GetImageFilename(QString name, QString dir)
{
if (qApp->devicePixelRatio() >= 2)
{
QString fileName = name.prepend(dir).append(SL("@2x.png"));
if (QFile::exists(fileName))
return fileName;
}
return name.prepend(dir).append(SL(".png"));
}
QPixmap& Resources::GetRegionPixmap(DiscIO::IVolume::ECountry region)

2
Source/Core/DolphinQt/Utils/Resources.h
View File

@ -50,4 +50,6 @@ private:
static QVector<QPixmap> m_regions;
static QVector<QPixmap> m_ratings;
static QVector<QPixmap> m_pixmaps;
static QString GetImageFilename(QString name, QString dir);
};