...

2 files changed, 13 insertions, 1 deletions

diff --git a/include/cru/ui/controls/button.hpp b/include/cru/ui/controls/button.hpp
index 0fad0035..d4a03e1d 100644
--- a/include/cru/ui/controls/button.hpp
+++ b/include/cru/ui/controls/button.hpp
@@ -18,7 +18,7 @@ using render::CornerRadius;
 struct ButtonStateStyle {
   std::shared_ptr<platform::graph::Brush> border_brush;
   Thickness border_thickness;
-  CornerRadius corner_radius;
+  CornerRadius border_radius;
   std::shared_ptr<platform::graph::Brush> foreground_brush;
   std::shared_ptr<platform::graph::Brush> background_brush;
 };
diff --git a/include/cru/ui/ui_manager.hpp b/include/cru/ui/ui_manager.hpp
index d2b8ad53..5501c62c 100644
--- a/include/cru/ui/ui_manager.hpp
+++ b/include/cru/ui/ui_manager.hpp
@@ -2,6 +2,8 @@
 #include "base.hpp"
 #include "cru/common/base.hpp"
 
+#include "controls/button.hpp"
+
 #include <memory>
 
 namespace cru::platform::graph {
@@ -29,6 +31,10 @@ class PredefineResources : public Object {
   std::shared_ptr<platform::graph::Font> text_block_font;
 };
 
+struct ThemeResources {
+  controls::ButtonStyle button_style;
+};
+
 class UiManager : public Object {
  public:
   static UiManager* GetInstance();
@@ -47,7 +53,13 @@ class UiManager : public Object {
     return predefine_resources_.get();
   }
 
+  ThemeResources* GetThemeResources() {
+    return &theme_resource_;
+  }
+
  private:
   std::unique_ptr<PredefineResources> predefine_resources_;
+
+  ThemeResources theme_resource_;
 };
 }  // namespace cru::ui