From da9bdf2baced1ff51350c98047b7ade68fcae930 Mon Sep 17 00:00:00 2001 From: crupest Date: Sun, 23 Jan 2022 21:07:03 +0800 Subject: ... --- src/ui/mapper/BorderStyleMapper.cpp | 8 ++++---- src/ui/mapper/ColorMapper.cpp | 4 ++-- src/ui/mapper/CornerRadiusMapper.cpp | 15 ++++++--------- src/ui/mapper/CursorMapper.cpp | 10 +++++----- src/ui/mapper/PointMapper.cpp | 7 ++----- src/ui/mapper/SizeMapper.cpp | 7 ++----- src/ui/mapper/ThicknessMapper.cpp | 7 ++----- 7 files changed, 23 insertions(+), 35 deletions(-) (limited to 'src/ui/mapper') diff --git a/src/ui/mapper/BorderStyleMapper.cpp b/src/ui/mapper/BorderStyleMapper.cpp index 65dbfe3b..691f091d 100644 --- a/src/ui/mapper/BorderStyleMapper.cpp +++ b/src/ui/mapper/BorderStyleMapper.cpp @@ -11,7 +11,7 @@ using namespace xml; using ui::style::ApplyBorderStyleInfo; bool BorderStyleMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { - return node->GetTag() == u"BorderStyle"; + return node->GetTag().CaseInsensitiveCompare(u"BorderStyle") == 0; } ApplyBorderStyleInfo BorderStyleMapper::DoMapFromXml( @@ -35,11 +35,11 @@ ApplyBorderStyleInfo BorderStyleMapper::DoMapFromXml( } else if (color_mapper->XmlElementIsOfThisType(c)) { auto brush = GetGraphicsFactory()->CreateSolidColorBrush( color_mapper->MapFromXml(c)); - auto name = c->GetOptionalAttribute(u"name"); + auto name = c->GetOptionalAttributeCaseInsensitive(u"name"); if (name) { - if (name == u"foreground") { + if (name->CaseInsensitiveCompare(u"foreground") == 0) { result.foreground_brush = std::move(brush); - } else if (name == u"background") { + } else if (name->CaseInsensitiveCompare(u"background") == 0) { result.background_brush = std::move(brush); } else { log::Debug(u"Unknown brush name: {}", *name); diff --git a/src/ui/mapper/ColorMapper.cpp b/src/ui/mapper/ColorMapper.cpp index a5d2c5e3..ddfa6b9b 100644 --- a/src/ui/mapper/ColorMapper.cpp +++ b/src/ui/mapper/ColorMapper.cpp @@ -2,7 +2,7 @@ namespace cru::ui::mapper { bool ColorMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { - return node->GetTag() == u"Color"; + return node->GetTag().CaseInsensitiveCompare(u"Color") == 0; } Color ColorMapper::DoMapFromString(String str) { @@ -14,7 +14,7 @@ Color ColorMapper::DoMapFromString(String str) { } Color ColorMapper::DoMapFromXml(xml::XmlElementNode* node) { - auto value_attr = node->GetOptionalAttribute(u"value"); + auto value_attr = node->GetOptionalAttributeCaseInsensitive(u"value"); if (!value_attr) { return colors::transparent; } diff --git a/src/ui/mapper/CornerRadiusMapper.cpp b/src/ui/mapper/CornerRadiusMapper.cpp index 0c13db7c..9c8855a3 100644 --- a/src/ui/mapper/CornerRadiusMapper.cpp +++ b/src/ui/mapper/CornerRadiusMapper.cpp @@ -4,37 +4,34 @@ namespace cru::ui::mapper { bool CornerRadiusMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { - if (node->GetTag() == u"CornerRadius") { - return true; - } - return false; + return node->GetTag().CaseInsensitiveCompare(u"CornerRadius") == 0; } CornerRadius CornerRadiusMapper::DoMapFromXml(xml::XmlElementNode* node) { auto point_mapper = MapperRegistry::GetInstance()->GetMapper(); CornerRadius result; - auto all = node->GetOptionalAttribute(u"all"); + auto all = node->GetOptionalAttributeCaseInsensitive(u"all"); if (all) { result.SetAll(point_mapper->MapFromString(*all)); } - auto lefttop = node->GetOptionalAttribute(u"lefttop"); + auto lefttop = node->GetOptionalAttributeCaseInsensitive(u"lefttop"); if (lefttop) { result.left_top = point_mapper->MapFromString(*lefttop); } - auto righttop = node->GetOptionalAttribute(u"righttop"); + auto righttop = node->GetOptionalAttributeCaseInsensitive(u"righttop"); if (righttop) { result.right_top = point_mapper->MapFromString(*righttop); } - auto rightbottom = node->GetOptionalAttribute(u"rightbottom"); + auto rightbottom = node->GetOptionalAttributeCaseInsensitive(u"rightbottom"); if (rightbottom) { result.right_bottom = point_mapper->MapFromString(*rightbottom); } - auto leftbottom = node->GetOptionalAttribute(u"leftbottom"); + auto leftbottom = node->GetOptionalAttributeCaseInsensitive(u"leftbottom"); if (leftbottom) { result.left_bottom = point_mapper->MapFromString(*leftbottom); } diff --git a/src/ui/mapper/CursorMapper.cpp b/src/ui/mapper/CursorMapper.cpp index d77da2a5..ad9c2bbf 100644 --- a/src/ui/mapper/CursorMapper.cpp +++ b/src/ui/mapper/CursorMapper.cpp @@ -9,7 +9,7 @@ using cru::platform::gui::ICursor; using cru::platform::gui::SystemCursorType; bool CursorMapper::XmlElementIsOfThisType(xml::XmlElementNode *node) { - return node->GetTag() == u"Cursor"; + return node->GetTag().CaseInsensitiveCompare(u"Cursor") == 0; } std::shared_ptr CursorMapper::DoMapFromString(String str) { @@ -17,11 +17,11 @@ std::shared_ptr CursorMapper::DoMapFromString(String str) { auto cursor_manager = GetUiApplication()->GetCursorManager(); - if (str == u"arrow") { + if (str.CaseInsensitiveCompare(u"arrow") == 0) { return cursor_manager->GetSystemCursor(SystemCursorType::Arrow); - } else if (str == u"hand") { + } else if (str.CaseInsensitiveCompare(u"hand") == 0) { return cursor_manager->GetSystemCursor(SystemCursorType::Hand); - } else if (str == u"ibeam") { + } else if (str.CaseInsensitiveCompare(u"ibeam") == 0) { return cursor_manager->GetSystemCursor(SystemCursorType::IBeam); } else { throw Exception(u"Unsupported cursor type."); @@ -29,7 +29,7 @@ std::shared_ptr CursorMapper::DoMapFromString(String str) { } std::shared_ptr CursorMapper::DoMapFromXml(xml::XmlElementNode *node) { - auto value_attr = node->GetOptionalAttribute(u"value"); + auto value_attr = node->GetOptionalAttributeCaseInsensitive(u"value"); if (!value_attr) return nullptr; return DoMapFromString(*value_attr); } diff --git a/src/ui/mapper/PointMapper.cpp b/src/ui/mapper/PointMapper.cpp index bcf209fb..efafc6ce 100644 --- a/src/ui/mapper/PointMapper.cpp +++ b/src/ui/mapper/PointMapper.cpp @@ -2,10 +2,7 @@ namespace cru::ui::mapper { bool PointMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { - if (node->GetTag() == u"Point") { - return true; - } - return false; + return node->GetTag().CaseInsensitiveCompare(u"Point") == 0; } Point PointMapper::DoMapFromString(String str) { @@ -20,7 +17,7 @@ Point PointMapper::DoMapFromString(String str) { } Point PointMapper::DoMapFromXml(xml::XmlElementNode* node) { - auto value_attr = node->GetOptionalAttribute(u"value"); + auto value_attr = node->GetOptionalAttributeCaseInsensitive(u"value"); if (!value_attr) return {}; return DoMapFromString(*value_attr); } diff --git a/src/ui/mapper/SizeMapper.cpp b/src/ui/mapper/SizeMapper.cpp index 3e3355cd..dfc83cca 100644 --- a/src/ui/mapper/SizeMapper.cpp +++ b/src/ui/mapper/SizeMapper.cpp @@ -2,10 +2,7 @@ namespace cru::ui::mapper { bool SizeMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { - if (node->GetTag() == u"Size") { - return true; - } - return false; + return node->GetTag().CaseInsensitiveCompare(u"Size") == 0; } Size SizeMapper::DoMapFromString(String str) { @@ -20,7 +17,7 @@ Size SizeMapper::DoMapFromString(String str) { } Size SizeMapper::DoMapFromXml(xml::XmlElementNode* node) { - auto value_attr = node->GetOptionalAttribute(u"value"); + auto value_attr = node->GetOptionalAttributeCaseInsensitive(u"value"); if (!value_attr) return {}; return DoMapFromString(*value_attr); } diff --git a/src/ui/mapper/ThicknessMapper.cpp b/src/ui/mapper/ThicknessMapper.cpp index 1829d64b..b72f952c 100644 --- a/src/ui/mapper/ThicknessMapper.cpp +++ b/src/ui/mapper/ThicknessMapper.cpp @@ -3,10 +3,7 @@ namespace cru::ui::mapper { bool ThicknessMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { - if (node->GetTag() == u"Thickness") { - return true; - } - return false; + return node->GetTag().CaseInsensitiveCompare(u"Thickness") == 0; } Thickness ThicknessMapper::DoMapFromString(String str) { @@ -23,7 +20,7 @@ Thickness ThicknessMapper::DoMapFromString(String str) { } Thickness ThicknessMapper::DoMapFromXml(xml::XmlElementNode* node) { - auto value_attr = node->GetOptionalAttribute(u"value"); + auto value_attr = node->GetOptionalAttributeCaseInsensitive(u"value"); if (!value_attr) return {}; return DoMapFromString(*value_attr); } -- cgit v1.2.3