archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-10 00:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add cli arg for hidpi

Browse source
This commit is contained in:
Megamouse 2019-07-12 01:32:06 +02:00
parent 13367071b0
commit 0dc7841d0f
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
rpcs3/main.cpp
View file

@ -98,11 +98,12 @@ static semaphore<> s_qt_mutex{};
} }
const char* ARG_NO_GUI = "no-gui"; const char* ARG_NO_GUI = "no-gui";
const char* ARG_HI_DPI = "hidpi";
QCoreApplication* createApplication(int& argc, char* argv[]) QCoreApplication* createApplication(int& argc, char* argv[])
{ {
for (int i = 1; i < argc; ++i) for (int i = 1; i < argc; ++i)
if (!qstrcmp(argv[i], ARG_NO_GUI)) if (!strcmp(ARG_NO_GUI, argv[i]))
return new rpcs3_app(argc, argv); return new rpcs3_app(argc, argv);
return new gui_application(argc, argv); return new gui_application(argc, argv);
} }
@ -132,7 +133,8 @@ int main(int argc, char** argv)
const QCommandLineOption helpOption = parser.addHelpOption(); const QCommandLineOption helpOption = parser.addHelpOption();
const QCommandLineOption versionOption = parser.addVersionOption(); const QCommandLineOption versionOption = parser.addVersionOption();
parser.addOption(QCommandLineOption("no-gui")); parser.addOption(QCommandLineOption(ARG_NO_GUI, "Run RPCS3 without the GUI."));
parser.addOption(QCommandLineOption(ARG_HI_DPI, "Enables Qt High Dpi Scaling.", "enabled", "1"));
parser.process(app->arguments()); parser.process(app->arguments());
// Don't start up the full rpcs3 gui if we just want the version or help. // Don't start up the full rpcs3 gui if we just want the version or help.
@ -144,11 +146,10 @@ int main(int argc, char** argv)
if (auto gui_app = qobject_cast<gui_application*>(app.data())) if (auto gui_app = qobject_cast<gui_application*>(app.data()))
{ {
#if defined(_WIN32) || defined(__APPLE__) // Set QT_AUTO_SCREEN_SCALE_FACTOR from environment. Defaults to cli argument, which defaults to 1.
app->setAttribute(Qt::AA_EnableHighDpiScaling); const bool use_high_dpi = "1" == qEnvironmentVariable("QT_AUTO_SCREEN_SCALE_FACTOR", parser.value(ARG_HI_DPI));
#else
setenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1", 0); app->setAttribute(use_high_dpi ? Qt::AA_EnableHighDpiScaling : Qt::AA_DisableHighDpiScaling);
#endif
app->setAttribute(Qt::AA_UseHighDpiPixmaps); app->setAttribute(Qt::AA_UseHighDpiPixmaps);
app->setAttribute(Qt::AA_DisableWindowContextHelpButton); app->setAttribute(Qt::AA_DisableWindowContextHelpButton);
app->setAttribute(Qt::AA_DontCheckOpenGLContextThreadAffinity); app->setAttribute(Qt::AA_DontCheckOpenGLContextThreadAffinity);
@ -180,8 +181,6 @@ int main(int argc, char** argv)
if (args.length() > 1) if (args.length() > 1)
{ {
args.removeAll(ARG_NO_GUI);
argv.emplace_back(); argv.emplace_back();
for (u32 i = 1; i < args.length(); i++) for (u32 i = 1; i < args.length(); i++)