...

1 files changed, 9 insertions, 18 deletions

diff --git a/src/ui/UiManager.cpp b/src/ui/UiManager.cpp
index 879ea2e1..78078e74 100644
--- a/src/ui/UiManager.cpp
+++ b/src/ui/UiManager.cpp
@@ -19,15 +19,6 @@ using namespace cru::platform::graphics;
 using namespace cru::ui::style;
 using namespace cru::ui::helper;
 
-namespace {
-std::unique_ptr<ISolidColorBrush> CreateSolidColorBrush(
-    IGraphicsFactory* factory, const Color& color) {
-  auto brush = factory->CreateSolidColorBrush();
-  brush->SetColor(color);
-  return brush;
-}
-}  // namespace
-
 UiManager* UiManager::GetInstance() {
   static UiManager* instance = new UiManager();
   GetUiApplication()->AddOnQuitHandler([] {
@@ -47,10 +38,10 @@ UiManager::UiManager() {
 
   const auto black_brush =
       std::shared_ptr<platform::graphics::ISolidColorBrush>(
-          CreateSolidColorBrush(factory, colors::black));
+          factory->CreateSolidColorBrush(colors::black));
   theme_resource_.text_brush = black_brush;
   theme_resource_.text_selection_brush =
-      CreateSolidColorBrush(factory, colors::skyblue);
+      factory->CreateSolidColorBrush(colors::skyblue);
   theme_resource_.caret_brush = black_brush;
 
   theme_resource_.button_style.AddStyleRule(
@@ -63,28 +54,28 @@ UiManager::UiManager() {
       {ClickStateCondition::Create(ClickState::None),
        CompoundStyler::Create(
            BorderStyler::Create(ApplyBorderStyleInfo{
-               CreateSolidColorBrush(factory, Color::FromHex(0x00bfff))}),
+               factory->CreateSolidColorBrush(Color::FromHex(0x00bfff))}),
            CursorStyler::Create(platform::gui::SystemCursorType::Arrow)),
        u"DefaultButtonNormal"});
   theme_resource_.button_style.AddStyleRule(
       {ClickStateCondition::Create(ClickState::Hover),
        CompoundStyler::Create(
            BorderStyler::Create(ApplyBorderStyleInfo{
-               CreateSolidColorBrush(factory, Color::FromHex(0x47d1ff))}),
+               factory->CreateSolidColorBrush(Color::FromHex(0x47d1ff))}),
            CursorStyler::Create(platform::gui::SystemCursorType::Hand)),
        u"DefaultButtonHover"});
   theme_resource_.button_style.AddStyleRule(
       {ClickStateCondition::Create(ClickState::Press),
        CompoundStyler::Create(
            BorderStyler::Create(ApplyBorderStyleInfo{
-               CreateSolidColorBrush(factory, Color::FromHex(0x91e4ff))}),
+               factory->CreateSolidColorBrush(Color::FromHex(0x91e4ff))}),
            CursorStyler::Create(platform::gui::SystemCursorType::Hand)),
        u"DefaultButtonPress"});
   theme_resource_.button_style.AddStyleRule(
       {ClickStateCondition::Create(ClickState::PressInactive),
        CompoundStyler::Create(
            BorderStyler::Create(ApplyBorderStyleInfo{
-               CreateSolidColorBrush(factory, Color::FromHex(0x91e4ff))}),
+               factory->CreateSolidColorBrush(Color::FromHex(0x91e4ff))}),
            CursorStyler::Create(platform::gui::SystemCursorType::Arrow)),
        u"DefaultButtonPressInactive"});
 
@@ -96,17 +87,17 @@ UiManager::UiManager() {
   theme_resource_.text_box_style.AddStyleRule(
       {HoverCondition::Create(false),
        BorderStyler::Create(ApplyBorderStyleInfo{
-           CreateSolidColorBrush(factory, Color::FromHex(0xced4da))}),
+           factory->CreateSolidColorBrush(Color::FromHex(0xced4da))}),
        u"DefaultTextBoxNormal"});
   theme_resource_.text_box_style.AddStyleRule(
       {HoverCondition::Create(true),
        BorderStyler::Create(ApplyBorderStyleInfo{
-           CreateSolidColorBrush(factory, Color::FromHex(0xced4da))}),
+           factory->CreateSolidColorBrush(Color::FromHex(0xced4da))}),
        u"DefaultTextBoxHover"});
   theme_resource_.text_box_style.AddStyleRule(
       {FocusCondition::Create(true),
        BorderStyler::Create(ApplyBorderStyleInfo{
-           CreateSolidColorBrush(factory, Color::FromHex(0x495057))}),
+           factory->CreateSolidColorBrush(Color::FromHex(0x495057))}),
        u"DefaultTextBoxFocus"});
 
   theme_resource_.menu_item_style.AddStyleRule(