diff options
Diffstat (limited to 'src/citra_qt/main.cpp')
| -rw-r--r-- | src/citra_qt/main.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 24506deab..2ea33ebc5 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp | |||
| @@ -44,6 +44,8 @@ | |||
| 44 | #include "core/arm/disassembler/load_symbol_map.h" | 44 | #include "core/arm/disassembler/load_symbol_map.h" |
| 45 | #include "citra_qt/config.h" | 45 | #include "citra_qt/config.h" |
| 46 | 46 | ||
| 47 | #include "video_core/video_core.h" | ||
| 48 | |||
| 47 | #include "version.h" | 49 | #include "version.h" |
| 48 | 50 | ||
| 49 | GMainWindow::GMainWindow() : emu_thread(nullptr) | 51 | GMainWindow::GMainWindow() : emu_thread(nullptr) |
| @@ -123,6 +125,9 @@ GMainWindow::GMainWindow() : emu_thread(nullptr) | |||
| 123 | restoreState(settings.value("state").toByteArray()); | 125 | restoreState(settings.value("state").toByteArray()); |
| 124 | render_window->restoreGeometry(settings.value("geometryRenderWindow").toByteArray()); | 126 | render_window->restoreGeometry(settings.value("geometryRenderWindow").toByteArray()); |
| 125 | 127 | ||
| 128 | ui.action_Use_Hardware_Renderer->setChecked(Settings::values.use_hw_renderer); | ||
| 129 | SetHardwareRendererEnabled(ui.action_Use_Hardware_Renderer->isChecked()); | ||
| 130 | |||
| 126 | ui.action_Single_Window_Mode->setChecked(settings.value("singleWindowMode", true).toBool()); | 131 | ui.action_Single_Window_Mode->setChecked(settings.value("singleWindowMode", true).toBool()); |
| 127 | ToggleWindowMode(); | 132 | ToggleWindowMode(); |
| 128 | 133 | ||
| @@ -135,6 +140,7 @@ GMainWindow::GMainWindow() : emu_thread(nullptr) | |||
| 135 | connect(ui.action_Start, SIGNAL(triggered()), this, SLOT(OnStartGame())); | 140 | connect(ui.action_Start, SIGNAL(triggered()), this, SLOT(OnStartGame())); |
| 136 | connect(ui.action_Pause, SIGNAL(triggered()), this, SLOT(OnPauseGame())); | 141 | connect(ui.action_Pause, SIGNAL(triggered()), this, SLOT(OnPauseGame())); |
| 137 | connect(ui.action_Stop, SIGNAL(triggered()), this, SLOT(OnStopGame())); | 142 | connect(ui.action_Stop, SIGNAL(triggered()), this, SLOT(OnStopGame())); |
| 143 | connect(ui.action_Use_Hardware_Renderer, SIGNAL(triggered(bool)), this, SLOT(SetHardwareRendererEnabled(bool))); | ||
| 138 | connect(ui.action_Single_Window_Mode, SIGNAL(triggered(bool)), this, SLOT(ToggleWindowMode())); | 144 | connect(ui.action_Single_Window_Mode, SIGNAL(triggered(bool)), this, SLOT(ToggleWindowMode())); |
| 139 | connect(ui.action_Hotkeys, SIGNAL(triggered()), this, SLOT(OnOpenHotkeysDialog())); | 145 | connect(ui.action_Hotkeys, SIGNAL(triggered()), this, SLOT(OnOpenHotkeysDialog())); |
| 140 | 146 | ||
| @@ -300,6 +306,9 @@ void GMainWindow::OnOpenHotkeysDialog() | |||
| 300 | dialog.exec(); | 306 | dialog.exec(); |
| 301 | } | 307 | } |
| 302 | 308 | ||
| 309 | void GMainWindow::SetHardwareRendererEnabled(bool enabled) { | ||
| 310 | VideoCore::g_hw_renderer_enabled = enabled; | ||
| 311 | } | ||
| 303 | 312 | ||
| 304 | void GMainWindow::ToggleWindowMode() { | 313 | void GMainWindow::ToggleWindowMode() { |
| 305 | if (ui.action_Single_Window_Mode->isChecked()) { | 314 | if (ui.action_Single_Window_Mode->isChecked()) { |