diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2023-08-27 01:15:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-27 01:15:00 +0200 |
commit | 6c4abd23be375afda850661cdf164b65e52f8cb8 (patch) | |
tree | 4245dfb837da484556040bb02915d0e7b53569c8 /src/yuzu/main.cpp | |
parent | Merge pull request #11359 from Kelebek1/check_suitable_backend (diff) | |
parent | main: Fix docked mode button, clang 14 error (diff) | |
download | yuzu-6c4abd23be375afda850661cdf164b65e52f8cb8.tar yuzu-6c4abd23be375afda850661cdf164b65e52f8cb8.tar.gz yuzu-6c4abd23be375afda850661cdf164b65e52f8cb8.tar.bz2 yuzu-6c4abd23be375afda850661cdf164b65e52f8cb8.tar.lz yuzu-6c4abd23be375afda850661cdf164b65e52f8cb8.tar.xz yuzu-6c4abd23be375afda850661cdf164b65e52f8cb8.tar.zst yuzu-6c4abd23be375afda850661cdf164b65e52f8cb8.zip |
Diffstat (limited to 'src/yuzu/main.cpp')
-rw-r--r-- | src/yuzu/main.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 8e933af64..33c9fd0af 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -1158,9 +1158,9 @@ void GMainWindow::InitializeWidgets() { [this](const QPoint& menu_location) { QMenu context_menu; - for (auto const& docked_mode_pair : Config::use_docked_mode_texts_map) { - context_menu.addAction(docked_mode_pair.second, [this, docked_mode_pair] { - if (docked_mode_pair.first != Settings::values.use_docked_mode.GetValue()) { + for (auto const& pair : Config::use_docked_mode_texts_map) { + context_menu.addAction(pair.second, [this, &pair] { + if (pair.first != Settings::values.use_docked_mode.GetValue()) { OnToggleDockedMode(); } }); @@ -3674,7 +3674,7 @@ void GMainWindow::OnTasReset() { } void GMainWindow::OnToggleDockedMode() { - const bool is_docked = Settings::values.use_docked_mode.GetValue(); + const bool is_docked = Settings::IsDockedMode(); auto* player_1 = system->HIDCore().GetEmulatedController(Core::HID::NpadIdType::Player1); auto* handheld = system->HIDCore().GetEmulatedController(Core::HID::NpadIdType::Handheld); @@ -3688,7 +3688,8 @@ void GMainWindow::OnToggleDockedMode() { controller_dialog->refreshConfiguration(); } - Settings::values.use_docked_mode.SetValue(!is_docked); + Settings::values.use_docked_mode.SetValue(is_docked ? Settings::ConsoleMode::Handheld + : Settings::ConsoleMode::Docked); UpdateDockedButton(); OnDockedModeChanged(is_docked, !is_docked, *system); } @@ -4118,10 +4119,10 @@ void GMainWindow::UpdateGPUAccuracyButton() { } void GMainWindow::UpdateDockedButton() { - const bool is_docked = Settings::values.use_docked_mode.GetValue(); - dock_status_button->setChecked(is_docked); + const auto console_mode = Settings::values.use_docked_mode.GetValue(); + dock_status_button->setChecked(Settings::IsDockedMode()); dock_status_button->setText( - Config::use_docked_mode_texts_map.find(is_docked)->second.toUpper()); + Config::use_docked_mode_texts_map.find(console_mode)->second.toUpper()); } void GMainWindow::UpdateAPIText() { |