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

minor refactor

Browse Source
This commit is contained in:
MihailRis 2025-04-26 23:03:02 +03:00
parent d2b4e096ae
commit cefa26b497
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/coders/xml.hpp
View File

@ -53,11 +53,11 @@ namespace xml {
/// @brief Get element tag /// @brief Get element tag
const std::string& getTag() const; const std::string& getTag() const;
inline bool isText() const { bool isText() const {
return getTag() == "#"; return getTag() == "#";
} }
inline const std::string& text() const { const std::string& getInnerText() const {
return attr("#").getText(); return attr("#").getText();
} }

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

@ -287,7 +287,7 @@ static std::wstring parse_inner_text(
) { ) {
std::wstring text = L""; std::wstring text = L"";
if (element.size() == 1) { if (element.size() == 1) {
std::string source = element.sub(0).attr("#").getText(); std::string source = element.sub(0).getInnerText();
util::trim(source); util::trim(source);
text = util::str2wstr_utf8(source); text = util::str2wstr_utf8(source);
if (text[0] == '@') { if (text[0] == '@') {
@ -387,7 +387,7 @@ static std::shared_ptr<UINode> read_button(
std::shared_ptr<Button> button; std::shared_ptr<Button> button;
auto& elements = element.getElements(); auto& elements = element.getElements();
if (!elements.empty() && elements[0]->getTag() != "#") { if (!elements.empty() && elements[0]->isText()) {
auto inner = reader.readUINode(*elements.at(0)); auto inner = reader.readUINode(*elements.at(0));
if (inner != nullptr) { if (inner != nullptr) {
button = std::make_shared<Button>(gui, inner, padding); button = std::make_shared<Button>(gui, inner, padding);