summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorlat9nq <22451773+lat9nq@users.noreply.github.com>2023-05-09 07:35:25 +0200
committerlat9nq <22451773+lat9nq@users.noreply.github.com>2023-07-21 16:56:07 +0200
commit464aad52cd644bdc32ca4eb35b0ce669c3b30c4f (patch)
tree17ceb24d150d42fa154343c578062cad6581bd7e /src/common
parentconfig: Don't merge the maps (diff)
downloadyuzu-464aad52cd644bdc32ca4eb35b0ce669c3b30c4f.tar
yuzu-464aad52cd644bdc32ca4eb35b0ce669c3b30c4f.tar.gz
yuzu-464aad52cd644bdc32ca4eb35b0ce669c3b30c4f.tar.bz2
yuzu-464aad52cd644bdc32ca4eb35b0ce669c3b30c4f.tar.lz
yuzu-464aad52cd644bdc32ca4eb35b0ce669c3b30c4f.tar.xz
yuzu-464aad52cd644bdc32ca4eb35b0ce669c3b30c4f.tar.zst
yuzu-464aad52cd644bdc32ca4eb35b0ce669c3b30c4f.zip
Diffstat (limited to 'src/common')
-rw-r--r--src/common/settings.cpp4
-rw-r--r--src/common/settings.h7
2 files changed, 9 insertions, 2 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 38a82f6f7..b7a0c063f 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -144,6 +144,9 @@ float Volume() {
return values.volume.GetValue() / static_cast<f32>(values.volume.GetDefault());
}
+Linkage::Linkage() = default;
+Linkage::~Linkage() = default;
+
const char* TranslateCategory(Category category) {
switch (category) {
case Category::Audio:
@@ -176,6 +179,7 @@ const char* TranslateCategory(Category category) {
case Category::Controls:
return "Controls";
case Category::Ui:
+ case Category::UiGeneral:
return "UI";
case Category::UiLayout:
return "UiLayout";
diff --git a/src/common/settings.h b/src/common/settings.h
index 4ca8299b3..e60105059 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -143,6 +143,7 @@ enum class Category : u32 {
AddOns,
Controls,
Ui,
+ UiGeneral,
UiLayout,
UiGameList,
Screenshots,
@@ -209,8 +210,10 @@ public:
class Linkage {
public:
- std::map<Category, std::forward_list<BasicSetting*>> by_category;
- std::vector<std::function<void()>> restore_functions;
+ explicit Linkage();
+ ~Linkage();
+ std::map<Category, std::forward_list<BasicSetting*>> by_category{};
+ std::vector<std::function<void()>> restore_functions{};
u32 count;
};