diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2025-05-13 14:45:06 -0500 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2025-06-14 16:26:09 -0500 |
| commit | 89b8edea03bb77629de663c82b6dc070e3ca0442 (patch) | |
| tree | 9984855d30102f3eabef452955f447b757d00229 /Source/Core/DolphinQt/MainWindow.cpp | |
| parent | 2047eaf1d86839b53bb92cf79cfae8be2a568ed6 (diff) | |
DolphinQt: Move graphics config to main Settings window.
Diffstat (limited to 'Source/Core/DolphinQt/MainWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/MainWindow.cpp | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index c26c6a3f6f..a175860260 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -78,7 +78,6 @@ #include "DolphinQt/Achievements/AchievementsWindow.h" #include "DolphinQt/CheatsManager.h" #include "DolphinQt/Config/FreeLookWindow.h" -#include "DolphinQt/Config/Graphics/GraphicsWindow.h" #include "DolphinQt/Config/LogConfigWidget.h" #include "DolphinQt/Config/LogWidget.h" #include "DolphinQt/Config/Mapping/MappingWindow.h" @@ -1306,6 +1305,15 @@ void MainWindow::ShowSettingsWindow() { if (!m_settings_window) { +#ifdef HAVE_XRANDR + if (GetWindowSystemType() == WindowSystemType::X11) + { + m_xrr_config = std::make_unique<X11Utils::XRRConfiguration>( + static_cast<Display*>(QGuiApplication::platformNativeInterface()->nativeResourceForWindow( + "display", windowHandle())), + winId()); + } +#endif m_settings_window = new SettingsWindow(this); InstallHotkeyFilter(m_settings_window); } @@ -1348,24 +1356,8 @@ void MainWindow::ShowHotkeyDialog() void MainWindow::ShowGraphicsWindow() { - if (!m_graphics_window) - { -#ifdef HAVE_XRANDR - if (GetWindowSystemType() == WindowSystemType::X11) - { - m_xrr_config = std::make_unique<X11Utils::XRRConfiguration>( - static_cast<Display*>(QGuiApplication::platformNativeInterface()->nativeResourceForWindow( - "display", windowHandle())), - winId()); - } -#endif - m_graphics_window = new GraphicsWindow(this); - InstallHotkeyFilter(m_graphics_window); - } - - m_graphics_window->show(); - m_graphics_window->raise(); - m_graphics_window->activateWindow(); + ShowSettingsWindow(); + m_settings_window->SelectPane(SettingsWindowPaneIndex::Graphics); } void MainWindow::ShowNetPlaySetupDialog() |