PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

add 'selected' property to selectbox

Browse Source
This commit is contained in:
MihailRis 2025-06-28 13:42:38 +03:00
parent 1c8cafbb68
commit 2aff1a39eb
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/graphics/ui/gui_xml.cpp
View File

@ -288,8 +288,11 @@ static std::wstring parse_inner_text(
const xml::xmlelement& element, const std::string& context const xml::xmlelement& element, const std::string& context
) { ) {
std::wstring text = L""; std::wstring text = L"";
if (element.size() == 1) { for (const auto& elem : element.getElements()) {
std::string source = element.sub(0).getInnerText(); if (!elem->isText()) {
continue;
}
std::string source = elem->getInnerText();
util::trim(source); util::trim(source);
text = util::str2wstr_utf8(source); text = util::str2wstr_utf8(source);
if (text[0] == '@') { if (text[0] == '@') {
@ -299,6 +302,7 @@ static std::wstring parse_inner_text(
text = langs::get(text.substr(1), util::str2wstr_utf8(context)); text = langs::get(text.substr(1), util::str2wstr_utf8(context));
} }
} }
break;
} }
return text; return text;
} }
@ -437,6 +441,7 @@ static std::shared_ptr<UINode> read_select(
auto& elements = element.getElements(); auto& elements = element.getElements();
std::vector<SelectBox::Option> options; std::vector<SelectBox::Option> options;
SelectBox::Option selected; SelectBox::Option selected;
for (const auto& elem : elements) { for (const auto& elem : elements) {
const auto& tag = elem->getTag(); const auto& tag = elem->getTag();
if (tag != "option") { if (tag != "option") {
@ -444,11 +449,26 @@ static std::shared_ptr<UINode> read_select(
} }
auto value = elem->attr("value").getText(); auto value = elem->attr("value").getText();
auto text = parse_inner_text(*elem, reader.getContext()); auto text = parse_inner_text(*elem, reader.getContext());
SelectBox::Option option {std::move(value), std::move(text)}; options.push_back(SelectBox::Option {std::move(value), std::move(text)});
if (elem->attr("selected", "false").asBool()) { }
selected = option;
if (element.has("selected")) {
auto selectedValue = element.attr("selected").getText();
selected.value = selectedValue;
selected.text = L"";
for (const auto& option : options) {
if (option.value == selectedValue) {
selected.text = option.text;
}
} }
options.push_back(std::move(option)); if (selected.text.empty()) {
selected.text = util::str2wstr_utf8(selected.value);
}
}
auto innerText = parse_inner_text(element, "");
if (!innerText.empty()) {
selected.text = innerText;
} }
auto selectBox = std::make_shared<SelectBox>( auto selectBox = std::make_shared<SelectBox>(