aboutsummaryrefslogtreecommitdiff
path: root/src/yuzu
diff options
context:
space:
mode:
authorxbzk <xbzk@eden-emu.dev>2026-09-30 00:57:23 +0200
committercrueter <crueter@eden-emu.dev>2026-09-30 00:57:23 +0200
commita82f31a310c5dc7cae50c47b3306510a24cc36a6 (patch)
tree6afc34f3a4d8b74bf931e1aaddb5fa94cc0cb63e /src/yuzu
parent815325cceca948030cf476dce7c46d901e4e4df5 (diff)
[settings,qt] merge of "disable controller applet" toggle with "controller applet mode" picker (#4498)
- [x] I have read and followed the [Contribution Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CONTRIBUTING.md#code-contributions). - [x] I have read and followed the [AI Policy](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/AI.md) - [x] I have read and followed the [Coding Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/Coding.md) to the best of my ability. ------------------- Small good simplification to nuke a toggle which costed me almost an entire day of work when fixing controller applet issues: There were two settings related to Controller applet: -"disable controller applet", which is a boolean toggle; -"controller configuration" applet mode, which is a "Real"/"Custom" picker; All i did was to nuke the toggle and add a third option "Disabled" to the picker. Users which used the disable toggle will have to pick Disabled; Real/Custom settings wont be affected since their indexes remains. All options tested against diablo 3. All working as intended. Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4498 Reviewed-by: lizzie <lizzie@eden-emu.dev> Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Diffstat (limited to 'src/yuzu')
-rw-r--r--src/yuzu/configuration/configure_applets.h4
-rw-r--r--src/yuzu/configuration/shared_widget.cpp12
-rw-r--r--src/yuzu/main_window.cpp2
3 files changed, 12 insertions, 6 deletions
diff --git a/src/yuzu/configuration/configure_applets.h b/src/yuzu/configuration/configure_applets.h
index 54f494d2f1..b794b49e0b 100644
--- a/src/yuzu/configuration/configure_applets.h
+++ b/src/yuzu/configuration/configure_applets.h
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
// SPDX-FileCopyrightText: 2024 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
@@ -8,7 +11,6 @@
class QCheckBox;
class QLineEdit;
-class QComboBox;
class QDateTimeEdit;
namespace Core {
class System;
diff --git a/src/yuzu/configuration/shared_widget.cpp b/src/yuzu/configuration/shared_widget.cpp
index 0f59ee23a6..5e8e04be58 100644
--- a/src/yuzu/configuration/shared_widget.cpp
+++ b/src/yuzu/configuration/shared_widget.cpp
@@ -140,7 +140,12 @@ QWidget* Widget::CreateCombobox(std::function<std::string()>& serializer,
if (combobox_enumerations.contains(type)) {
enumeration = &combobox_enumerations.at(type);
for (const auto& [id, name] : *enumeration) {
- combobox->addItem(name);
+ if (type == Settings::EnumMetadata<Settings::AppletMode>::Index() &&
+ id == static_cast<u32>(Settings::AppletMode::Disabled) &&
+ setting.Id() != Settings::values.controller_applet_mode.Id()) {
+ continue;
+ }
+ combobox->addItem(name, id);
}
} else {
return combobox;
@@ -158,9 +163,8 @@ QWidget* Widget::CreateCombobox(std::function<std::string()>& serializer,
const u32 setting_value = std::strtoul(setting.ToString().c_str(), nullptr, 0);
combobox->setCurrentIndex(find_index(setting_value));
- serializer = [this, enumeration]() {
- int current = combobox->currentIndex();
- return std::to_string(enumeration->at(current).first);
+ serializer = [this]() {
+ return std::to_string(combobox->currentData().toUInt());
};
restore_func = [this, find_index]() {
diff --git a/src/yuzu/main_window.cpp b/src/yuzu/main_window.cpp
index e2807e80ff..60bfbae5cd 100644
--- a/src/yuzu/main_window.cpp
+++ b/src/yuzu/main_window.cpp
@@ -1786,7 +1786,7 @@ bool MainWindow::LoadROM(const QString& filename, Service::AM::FrontendAppletPar
QtCommon::system->SetFrontendAppletSet({
std::make_unique<QtAmiiboSettings>(*this), // Amiibo Settings
- (UISettings::values.controller_applet_disabled.GetValue() == true)
+ (Settings::values.controller_applet_mode.GetValue() == Settings::AppletMode::Disabled)
? nullptr
: std::make_unique<QtControllerSelector>(*this), // Controller Selector
std::make_unique<QtErrorDisplay>(*this), // Error Display