...

1 files changed, 28 insertions, 20 deletions

diff --git a/src/ui/ui_manager.cpp b/src/ui/ui_manager.cpp
index f60f6355..6c61083b 100644
--- a/src/ui/ui_manager.cpp
+++ b/src/ui/ui_manager.cpp
@@ -1,27 +1,35 @@
 #include "cru/ui/ui_manager.hpp"
 
 #include "cru/platform/graph/brush.hpp"
+#include "cru/platform/graph/factory.hpp"
 #include "cru/platform/graph/font.hpp"
-#include "cru/platform/graph/graph_factory.hpp"
 #include "cru/platform/native/ui_application.hpp"
+#include "helper.hpp"
 
 namespace cru::ui {
 using namespace cru::platform::graph;
+
+namespace {
+std::unique_ptr<ISolidColorBrush> CreateSolidColorBrush(IGraphFactory* factory,
+                                                        const Color& color) {
+  auto brush = factory->CreateSolidColorBrush();
+  brush->SetColor(color);
+  return brush;
+}
+}  // namespace
+
 PredefineResources::PredefineResources() {
-  const auto graph_factory = GraphFactory::GetInstance();
-
-  button_normal_border_brush.reset(
-      static_cast<Brush*>(graph_factory->CreateSolidColorBrush(colors::black)));
-  text_block_selection_brush.reset(static_cast<Brush*>(
-      graph_factory->CreateSolidColorBrush(colors::skyblue)));
-  text_block_text_brush.reset(
-      static_cast<Brush*>(graph_factory->CreateSolidColorBrush(colors::black)));
-  text_block_font.reset(graph_factory->CreateFont(L"等线", 24.0f));
+  const auto factory = GetGraphFactory();
+
+  button_normal_border_brush = CreateSolidColorBrush(factory, colors::black);
+  text_block_selection_brush = CreateSolidColorBrush(factory, colors::skyblue);
+  text_block_text_brush = CreateSolidColorBrush(factory, colors::black);
+  text_block_font = factory->CreateFont("等线", 24.0f);
 }
 
 UiManager* UiManager::GetInstance() {
   static UiManager* instance = new UiManager();
-  platform::native::UiApplication::GetInstance()->AddOnQuitHandler([] {
+  GetUiApplication()->AddOnQuitHandler([] {
     delete instance;
     instance = nullptr;
   });
@@ -29,15 +37,15 @@ UiManager* UiManager::GetInstance() {
 }
 
 UiManager::UiManager() : predefine_resources_(new PredefineResources()) {
-  const auto factory = GraphFactory::GetInstance();
-  theme_resource_.button_style.normal.border_brush = std::shared_ptr<platform::graph::Brush>(
-      factory->CreateSolidColorBrush(Color::FromHex(0x00bfff)));
-  theme_resource_.button_style.hover.border_brush = std::shared_ptr<platform::graph::Brush>(
-      factory->CreateSolidColorBrush(Color::FromHex(0x47d1ff)));
-  theme_resource_.button_style.press.border_brush = std::shared_ptr<platform::graph::Brush>(
-      factory->CreateSolidColorBrush(Color::FromHex(0x91e4ff)));
-  theme_resource_.button_style.press_cancel.border_brush = std::shared_ptr<platform::graph::Brush>(
-      factory->CreateSolidColorBrush(Color::FromHex(0x91e4ff)));
+  const auto factory = GetGraphFactory();
+  theme_resource_.button_style.normal.border_brush =
+      CreateSolidColorBrush(factory, Color::FromHex(0x00bfff));
+  theme_resource_.button_style.hover.border_brush =
+      CreateSolidColorBrush(factory, Color::FromHex(0x47d1ff));
+  theme_resource_.button_style.press.border_brush =
+      CreateSolidColorBrush(factory, Color::FromHex(0x91e4ff));
+  theme_resource_.button_style.press_cancel.border_brush =
+      CreateSolidColorBrush(factory, Color::FromHex(0x91e4ff));
 
   theme_resource_.button_style.normal.border_thickness =
       theme_resource_.button_style.hover.border_thickness =