diff options
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/ThemeManager.cpp | 6 | ||||
| -rw-r--r-- | src/ui/render/ScrollBar.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/ui/ThemeManager.cpp b/src/ui/ThemeManager.cpp index 4a0e08a5..a5280d40 100644 --- a/src/ui/ThemeManager.cpp +++ b/src/ui/ThemeManager.cpp @@ -36,15 +36,15 @@ void ThemeManager::Init() { } gsl::not_null<std::shared_ptr<platform::graphics::IBrush>> -ThemeManager::GetBrush(std::u16string key) { - std::u16string k = ToLower(key); +ThemeManager::GetBrush(StringView key) { + String k = ToLower(key); auto cached_brush_iter = brushes_.find(k); if (cached_brush_iter != brushes_.cend()) { return cached_brush_iter->second; } auto color_string = - String::FromUtf8(theme_tree_.get<std::string>(ToUtf8(key))); + String::FromUtf8(theme_tree_.get<std::string>(key.ToUtf8())); auto color = Color::Parse(color_string); if (!color) throw BadThemeResourceException("Value is not a valid color."); std::shared_ptr<platform::graphics::IBrush> brush = diff --git a/src/ui/render/ScrollBar.cpp b/src/ui/render/ScrollBar.cpp index 0d644a1f..aeecd9e2 100644 --- a/src/ui/render/ScrollBar.cpp +++ b/src/ui/render/ScrollBar.cpp @@ -39,9 +39,9 @@ constexpr std::array<ScrollBarAreaKind, 5> kScrollBarAreaKindList{ ScrollBarAreaKind::UpSlot, ScrollBarAreaKind::DownSlot, ScrollBarAreaKind::Thumb}; -std::u16string GenerateScrollBarThemeColorKey(ScrollBarBrushUsageKind usage, - ScrollBarBrushStateKind state) { - std::u16string result = u"scrollbar."; +String GenerateScrollBarThemeColorKey(ScrollBarBrushUsageKind usage, + ScrollBarBrushStateKind state) { + String result = u"scrollbar."; switch (usage) { case ScrollBarBrushUsageKind::Arrow: result.append(u"arrow"); |