From af43f72adcb6738eebaad505389084c17411a694 Mon Sep 17 00:00:00 2001 From: crupest Date: Thu, 27 Jan 2022 23:28:18 +0800 Subject: ... --- src/ui/ThemeManager.cpp | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'src/ui/ThemeManager.cpp') diff --git a/src/ui/ThemeManager.cpp b/src/ui/ThemeManager.cpp index dc08edb3..be980e8c 100644 --- a/src/ui/ThemeManager.cpp +++ b/src/ui/ThemeManager.cpp @@ -49,11 +49,15 @@ void ThemeManager::ReadResourcesFile(const String& file_path) { io::FileStream stream(file_path, io::OpenFileFlags::Read); auto xml_string = stream.ReadAllAsString(); auto parser = xml::XmlParser(xml_string); - theme_resource_xml_root_.reset(parser.Parse()); + SetThemeXml(parser.Parse()); +} + +void ThemeManager::SetThemeXml(xml::XmlElementNode* root) { + theme_resource_xml_root_.reset(root); theme_resource_map_.clear(); if (!theme_resource_xml_root_->GetTag().CaseInsensitiveEqual(u"Theme")) { - throw Exception(u"Root tag of theme resource file must be \"Theme\"."); + throw Exception(u"Root tag of theme must be \"Theme\"."); } for (auto child : theme_resource_xml_root_->GetChildren()) { @@ -64,10 +68,20 @@ void ThemeManager::ReadResourcesFile(const String& file_path) { if (!key_attr) { throw Exception(u"\"key\" attribute is required for resource."); } - theme_resource_map_[*key_attr] = c->GetFirstChildElement(); + if (!c->GetChildElementCount()) { + throw Exception(u"Resource must have only one child element."); + } + + ResourceEntry entry; + + entry.name = *key_attr; + entry.xml_node = c->GetFirstChildElement(); + + theme_resource_map_[entry.name] = std::move(entry); } } } -} + theme_resource_change_event_.Raise(nullptr); +} } // namespace cru::ui -- cgit v1.2.3