...

1 files changed, 3 insertions, 25 deletions

diff --git a/include/cru/ui/ui_manager.hpp b/include/cru/ui/ui_manager.hpp
index 199ff28d..f196444c 100644
--- a/include/cru/ui/ui_manager.hpp
+++ b/include/cru/ui/ui_manager.hpp
@@ -11,26 +11,10 @@ struct IFont;
 }  // namespace cru::platform::graph
 
 namespace cru::ui {
-// TODO: Make this theme resource.
-class PredefineResources : public Object {
- public:
-  PredefineResources();
-  PredefineResources(const PredefineResources& other) = delete;
-  PredefineResources(PredefineResources&& other) = delete;
-  PredefineResources& operator=(const PredefineResources& other) = delete;
-  PredefineResources& operator=(PredefineResources&& other) = delete;
-  ~PredefineResources() override = default;
-
-  // region Button
-  std::shared_ptr<platform::graph::IBrush> button_normal_border_brush;
-
-  // region TextBlock
-  std::shared_ptr<platform::graph::IBrush> text_block_selection_brush;
-  std::shared_ptr<platform::graph::IBrush> text_block_text_brush;
-  std::shared_ptr<platform::graph::IFont> text_block_font;
-};
-
 struct ThemeResources {
+  std::shared_ptr<platform::graph::IFont> default_font;
+  std::shared_ptr<platform::graph::IBrush> text_brush;
+  std::shared_ptr<platform::graph::IBrush> text_selection_brush;
   controls::ButtonStyle button_style;
 };
 
@@ -48,15 +32,9 @@ class UiManager : public Object {
   UiManager& operator=(UiManager&& other) = delete;
   ~UiManager() override = default;
 
-  const PredefineResources* GetPredefineResources() const {
-    return predefine_resources_.get();
-  }
-
   ThemeResources* GetThemeResources() { return &theme_resource_; }
 
  private:
-  std::unique_ptr<PredefineResources> predefine_resources_;
-
   ThemeResources theme_resource_;
 };
 }  // namespace cru::ui