From 72ad2e22d4da7a018b71028a3bb434bef24b0282 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sat, 24 Jan 2015 15:50:04 -0800 Subject: [PATCH] Qt: Show window later that usual to ensure that it scales properly initially --- src/platform/qt/GBAApp.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/platform/qt/GBAApp.cpp b/src/platform/qt/GBAApp.cpp index abb9c10e9..b69ebc05b 100644 --- a/src/platform/qt/GBAApp.cpp +++ b/src/platform/qt/GBAApp.cpp @@ -23,18 +23,24 @@ GBAApp::GBAApp(int& argc, char* argv[]) SDL_Init(SDL_INIT_NOPARACHUTE); #endif - QApplication::setApplicationName(PROJECT_NAME); - QApplication::setApplicationVersion(PROJECT_VERSION); + QApplication::setApplicationName(PROJECT_NAME); + QApplication::setApplicationVersion(PROJECT_VERSION); - m_window.show(); +#ifndef Q_OS_MAC + m_window.show(); +#endif GBAArguments args = {}; - if (m_configController.parseArguments(&args, argc, argv)) { + if (m_configController.parseArguments(&args, argc, argv)) { m_window.argumentsPassed(&args); - } else { + } else { m_window.loadConfig(); - } + } freeArguments(&args); + +#ifdef Q_OS_MAC + m_window.show(); +#endif } bool GBAApp::event(QEvent* event) {