mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 12:19:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #13736 from jordan-woyak/main-config-gfx

Browse source 
DolphinQt: Move graphics config to main Settings window.
This commit is contained in:
Jordan Woyak 2025-07-03 01:31:01 -05:00 • committed by GitHub
commit a5e85caf0a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 78 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Source/Core/DolphinQt/MainWindow.cpp
View file

@ -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()