From c7c93a8e8027085d2b8fd6b7c6acc73595e6a2c0 Mon Sep 17 00:00:00 2001 From: spycrab Date: Mon, 2 Jul 2018 15:15:23 +0200 Subject: [PATCH] ControllerEmu/BooleanSetting: Add exclusive flag --- .../ControllerEmu/Setting/BooleanSetting.cpp | 15 +++++++++++---- .../ControllerEmu/Setting/BooleanSetting.h | 11 +++++++++-- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/Source/Core/InputCommon/ControllerEmu/Setting/BooleanSetting.cpp b/Source/Core/InputCommon/ControllerEmu/Setting/BooleanSetting.cpp index 3f7c4e0752a1..d9aa61b9f69d 100644 --- a/Source/Core/InputCommon/ControllerEmu/Setting/BooleanSetting.cpp +++ b/Source/Core/InputCommon/ControllerEmu/Setting/BooleanSetting.cpp @@ -7,15 +7,16 @@ namespace ControllerEmu { BooleanSetting::BooleanSetting(const std::string& setting_name, const std::string& ui_name, - const bool default_value, const SettingType setting_type) + const bool default_value, const SettingType setting_type, + const bool exclusive) : m_type(setting_type), m_name(setting_name), m_ui_name(ui_name), - m_default_value(default_value), m_value(default_value) + m_default_value(default_value), m_value(default_value), m_exclusive(exclusive) { } BooleanSetting::BooleanSetting(const std::string& setting_name, const bool default_value, - const SettingType setting_type) - : BooleanSetting(setting_name, setting_name, default_value, setting_type) + const SettingType setting_type, const bool exclusive) + : BooleanSetting(setting_name, setting_name, default_value, setting_type, exclusive) { } @@ -23,6 +24,12 @@ bool BooleanSetting::GetValue() const { return m_value; } + +bool BooleanSetting::IsExclusive() const +{ + return m_exclusive; +} + void BooleanSetting::SetValue(bool value) { m_value = value; diff --git a/Source/Core/InputCommon/ControllerEmu/Setting/BooleanSetting.h b/Source/Core/InputCommon/ControllerEmu/Setting/BooleanSetting.h index 98c1614a6af1..a2729a588eb6 100644 --- a/Source/Core/InputCommon/ControllerEmu/Setting/BooleanSetting.h +++ b/Source/Core/InputCommon/ControllerEmu/Setting/BooleanSetting.h @@ -15,17 +15,24 @@ class BooleanSetting { public: BooleanSetting(const std::string& setting_name, const std::string& ui_name, - const bool default_value, const SettingType setting_type = SettingType::NORMAL); + const bool default_value, const SettingType setting_type = SettingType::NORMAL, + const bool exclusive = false); BooleanSetting(const std::string& setting_name, const bool default_value, - const SettingType setting_type = SettingType::NORMAL); + const SettingType setting_type = SettingType::NORMAL, + const bool exclusive = false); bool GetValue() const; void SetValue(bool value); + bool IsExclusive() const; + const SettingType m_type; const std::string m_name; const std::string m_ui_name; const bool m_default_value; bool m_value; + +private: + const bool m_exclusive; }; } // namespace ControllerEmu