1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00

Merge pull request #3374 from dydzio0614/default-large-spellbook

Default large spellbook
This commit is contained in:
Ivan Savenko
2023-12-24 16:23:29 +02:00
committed by GitHub
3 changed files with 41 additions and 2 deletions

View File

@@ -162,9 +162,15 @@ GeneralOptionsTab::GeneralOptionsTab()
setBoolSetting("general", "enableUiEnhancements", value); setBoolSetting("general", "enableUiEnhancements", value);
}); });
addCallback("enableLargeSpellbookChanged", [](bool value) addCallback("enableLargeSpellbookChanged", [this](bool value)
{ {
setBoolSetting("gameTweaks", "enableLargeSpellbook", value); setBoolSetting("gameTweaks", "enableLargeSpellbook", value);
std::shared_ptr<CToggleButton> spellbookAnimationCheckbox = widget<CToggleButton>("spellbookAnimationCheckbox");
if(value)
spellbookAnimationCheckbox->disable();
else
spellbookAnimationCheckbox->enable();
redraw();
}); });
addCallback("audioMuteFocusChanged", [](bool value) addCallback("audioMuteFocusChanged", [](bool value)
@@ -196,6 +202,10 @@ GeneralOptionsTab::GeneralOptionsTab()
std::shared_ptr<CToggleButton> spellbookAnimationCheckbox = widget<CToggleButton>("spellbookAnimationCheckbox"); std::shared_ptr<CToggleButton> spellbookAnimationCheckbox = widget<CToggleButton>("spellbookAnimationCheckbox");
spellbookAnimationCheckbox->setSelected(settings["video"]["spellbookAnimation"].Bool()); spellbookAnimationCheckbox->setSelected(settings["video"]["spellbookAnimation"].Bool());
if(settings["gameTweaks"]["enableLargeSpellbook"].Bool())
spellbookAnimationCheckbox->disable();
else
spellbookAnimationCheckbox->enable();
std::shared_ptr<CToggleButton> fullscreenBorderlessCheckbox = widget<CToggleButton>("fullscreenBorderlessCheckbox"); std::shared_ptr<CToggleButton> fullscreenBorderlessCheckbox = widget<CToggleButton>("fullscreenBorderlessCheckbox");
if (fullscreenBorderlessCheckbox) if (fullscreenBorderlessCheckbox)

View File

@@ -619,7 +619,7 @@
}, },
"enableLargeSpellbook" : { "enableLargeSpellbook" : {
"type": "boolean", "type": "boolean",
"default": false "default": true
} }
} }
} }

View File

@@ -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", "type" : "verticalLayout",
"customType" : "checkbox", "customType" : "checkbox",