From 8b8bc55ff731e233309f481da0239f282bdd4050 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Tue, 19 Mar 2024 14:54:50 +0300 Subject: [PATCH] xml elements context --- src/coders/xml.cpp | 9 +++++++-- src/frontend/menu/menu.cpp | 4 +--- src/graphics/ui/gui_util.cpp | 8 ++++++++ src/graphics/ui/gui_util.h | 4 ++++ src/graphics/ui/gui_xml.cpp | 34 +++++++++++++++++++++++++--------- src/graphics/ui/gui_xml.h | 3 +++ 6 files changed, 48 insertions(+), 14 deletions(-) diff --git a/src/coders/xml.cpp b/src/coders/xml.cpp index 03b4b3cd..2bd656de 100644 --- a/src/coders/xml.cpp +++ b/src/coders/xml.cpp @@ -196,8 +196,13 @@ xmlelement Parser::parseOpenTag() { if (peek() == '=') { nextChar(); skipWhitespace(); - expect('"'); - attrtext = parseString('"'); + + char quote = peek(); + if (quote != '\'' && quote != '"') { + throw error("string literal expected"); + } + skip(1); + attrtext = parseString(quote); } node->set(attrname, attrtext); } diff --git a/src/frontend/menu/menu.cpp b/src/frontend/menu/menu.cpp index aa943763..06562962 100644 --- a/src/frontend/menu/menu.cpp +++ b/src/frontend/menu/menu.cpp @@ -284,9 +284,7 @@ void create_404_page(Engine* engine) { auto menu = engine->getGUI()->getMenu(); auto panel = menus::create_page(engine, "404", 400, 0.0f, 8); - panel->add(std::make_shared