From 896f3108ee2d497abce69e9381ca3cde9260d3eb Mon Sep 17 00:00:00 2001 From: Dydzio Date: Sat, 23 Dec 2023 17:53:06 +0100 Subject: [PATCH 1/2] Large spellbook by default --- config/schemas/settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/schemas/settings.json b/config/schemas/settings.json index 2715ba2a8..667cff080 100644 --- a/config/schemas/settings.json +++ b/config/schemas/settings.json @@ -619,7 +619,7 @@ }, "enableLargeSpellbook" : { "type": "boolean", - "default": false + "default": true } } } From 39c58a9d949c80cf0254e3dba692dfcda5838a70 Mon Sep 17 00:00:00 2001 From: Laserlicht <13953785+Laserlicht@users.noreply.github.com> Date: Sun, 24 Dec 2023 00:41:29 +0100 Subject: [PATCH 2/2] disable animation button --- client/windows/settings/GeneralOptionsTab.cpp | 12 +++++++- .../widgets/settings/generalOptionsTab.json | 29 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/client/windows/settings/GeneralOptionsTab.cpp b/client/windows/settings/GeneralOptionsTab.cpp index 82d455c3d..69ee10fef 100644 --- a/client/windows/settings/GeneralOptionsTab.cpp +++ b/client/windows/settings/GeneralOptionsTab.cpp @@ -162,9 +162,15 @@ GeneralOptionsTab::GeneralOptionsTab() setBoolSetting("general", "enableUiEnhancements", value); }); - addCallback("enableLargeSpellbookChanged", [](bool value) + addCallback("enableLargeSpellbookChanged", [this](bool value) { setBoolSetting("gameTweaks", "enableLargeSpellbook", value); + std::shared_ptr spellbookAnimationCheckbox = widget("spellbookAnimationCheckbox"); + if(value) + spellbookAnimationCheckbox->disable(); + else + spellbookAnimationCheckbox->enable(); + redraw(); }); addCallback("audioMuteFocusChanged", [](bool value) @@ -196,6 +202,10 @@ GeneralOptionsTab::GeneralOptionsTab() std::shared_ptr spellbookAnimationCheckbox = widget("spellbookAnimationCheckbox"); spellbookAnimationCheckbox->setSelected(settings["video"]["spellbookAnimation"].Bool()); + if(settings["gameTweaks"]["enableLargeSpellbook"].Bool()) + spellbookAnimationCheckbox->disable(); + else + spellbookAnimationCheckbox->enable(); std::shared_ptr fullscreenBorderlessCheckbox = widget("fullscreenBorderlessCheckbox"); if (fullscreenBorderlessCheckbox) diff --git a/config/widgets/settings/generalOptionsTab.json b/config/widgets/settings/generalOptionsTab.json index 42348177e..6a70d457e 100644 --- a/config/widgets/settings/generalOptionsTab.json +++ b/config/widgets/settings/generalOptionsTab.json @@ -70,6 +70,35 @@ } ] }, + { + "type" : "verticalLayout", + "customType" : "checkboxFake", + "position" : {"x": 10, "y": 83}, + "items" : [ + { + "created" : "desktop" + }, + {}, + { + "created" : "desktop" + }, + { + "created" : "desktop" + }, + {}, + {}, + { + "name": "spellbookAnimationCheckboxPlaceholder" + }, + { + "created" : "touchscreen" + }, + { + "created" : "mobile" + }, + {} + ] + }, { "type" : "verticalLayout", "customType" : "checkbox",