piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 07:09:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12794 from TryTwo/PR_Windows_Initialize_Fix

Browse Source 
MainWindow, Bugfix: Initialize geometries before calling GetWindowSystemInfo
This commit is contained in:
Admiral H. Curtiss
2024-05-31 20:00:37 +02:00
committed by GitHub
parent 171596ac74 564d4c3c25
commit 0e6db07203
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/DolphinQt/MainWindow.cpp
View File

@ -227,8 +227,6 @@ MainWindow::MainWindow(std::unique_ptr<BootParameters> boot_parameters,
setAcceptDrops(true); setAcceptDrops(true);
setAttribute(Qt::WA_NativeWindow); setAttribute(Qt::WA_NativeWindow);
InitControllers();
CreateComponents(); CreateComponents();
ConnectGameList(); ConnectGameList();
@ -237,6 +235,13 @@ MainWindow::MainWindow(std::unique_ptr<BootParameters> boot_parameters,
ConnectRenderWidget(); ConnectRenderWidget();
ConnectStack(); ConnectStack();
ConnectMenuBar(); ConnectMenuBar();
QSettings& settings = Settings::GetQSettings();
restoreState(settings.value(QStringLiteral("mainwindow/state")).toByteArray());
restoreGeometry(settings.value(QStringLiteral("mainwindow/geometry")).toByteArray());
show();
InitControllers();
ConnectHotkeys(); ConnectHotkeys();
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
@ -289,11 +294,6 @@ MainWindow::MainWindow(std::unique_ptr<BootParameters> boot_parameters,
m_state_slot = m_state_slot =
std::clamp(Settings::Instance().GetStateSlot(), 1, static_cast<int>(State::NUM_STATES)); std::clamp(Settings::Instance().GetStateSlot(), 1, static_cast<int>(State::NUM_STATES));
QSettings& settings = Settings::GetQSettings();
restoreState(settings.value(QStringLiteral("mainwindow/state")).toByteArray());
restoreGeometry(settings.value(QStringLiteral("mainwindow/geometry")).toByteArray());
m_render_widget_geometry = settings.value(QStringLiteral("renderwidget/geometry")).toByteArray(); m_render_widget_geometry = settings.value(QStringLiteral("renderwidget/geometry")).toByteArray();
// Restoring of window states can sometimes go wrong, resulting in widgets being visible when they // Restoring of window states can sometimes go wrong, resulting in widgets being visible when they