Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-04-10 19:15:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rewrite custom button icon tags into customButtonIcon node with attribute.

Browse source
This commit is contained in:
Sophia Hadash 2021-08-23 12:56:42 +02:00 committed by SophiaHadash
parent 6270c1f827
commit b8ce3d95e8
1 changed files with 16 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
es-core/src/ThemeData.cpp
View file

@ -159,35 +159,7 @@ std::map<std::string, std::map<std::string, ThemeData::ElementPropertyType>> The
{"entrySpacing", FLOAT}, {"entrySpacing", FLOAT},
{"iconTextSpacing", FLOAT}, {"iconTextSpacing", FLOAT},
{"textStyle", STRING}, {"textStyle", STRING},
{"dpad_updown", PATH}, {"customButtonIcon", PATH}}},
{"dpad_leftright", PATH},
{"dpad_all", PATH},
{"thumbstick_click", PATH},
{"button_l", PATH},
{"button_r", PATH},
{"button_lr", PATH},
{"button_a_SNES", PATH},
{"button_b_SNES", PATH},
{"button_x_SNEs", PATH},
{"button_y_SNES", PATH},
{"button_back_SNES", PATH},
{"button_start_SNES", PATH},
{"button_a_PS", PATH},
{"button_b_PS", PATH},
{"button_x_PS", PATH},
{"button_y_PS", PATH},
{"button_back_PS4", PATH},
{"button_start_PS4", PATH},
{"button_back_PS5", PATH},
{"button_start_PS5", PATH},
{"button_a_XBOX", PATH},
{"button_b_XBOX", PATH},
{"button_x_XBOX", PATH},
{"button_y_XBOX", PATH},
{"button_back_XBOX", PATH},
{"button_start_XBOX", PATH},
{"button_back_XBOX360", PATH},
{"button_start_XBOX360", PATH}}},
{"navigationsounds", {"navigationsounds",
{{"systembrowseSound", PATH}, {{"systembrowseSound", PATH},
{"quicksysselectSound", PATH}, {"quicksysselectSound", PATH},
@ -530,7 +502,21 @@ void ThemeData::parseElement(const pugi::xml_node& root,
<< ((node.text().get() != path) ? "which resolves to \"" + path + "\"" : << ((node.text().get() != path) ? "which resolves to \"" + path + "\"" :
""); "");
} }
element.properties[node.name()] = path;
// Special parsing instruction for customButtonIcon -> save node as it's button
// attribute to prevent nodes overwriting each other.
if (strcmp(node.name(), "customButtonIcon") == 0) {
const auto btn = node.attribute("button").as_string("");
if (strcmp(btn, "") == 0) {
LOG(LogError)
<< "<customButtonIcon> element requires the `button` property.";
}
else
element.properties[btn] = path;
}
else
element.properties[node.name()] = path;
break; break;
} }
case COLOR: { case COLOR: {