3 files changed, 6 insertions, 4 deletions
diff --git a/src/ui/controls/Button.cpp b/src/ui/controls/Button.cpp
index 7858eadb..8bd9f93f 100644
--- a/src/ui/controls/Button.cpp
+++ b/src/ui/controls/Button.cpp
@@ -42,8 +42,8 @@ Button::Button() : click_detector_(this) {
         }
       });
 
-  GetStyleRuleSet()->Set(
-      UiManager::GetInstance()->GetThemeResources()->button_style);
+  GetStyleRuleSet()->SetParent(
+      &UiManager::GetInstance()->GetThemeResources()->button_style);
 }
 
 Button::~Button() = default;
diff --git a/src/ui/controls/Control.cpp b/src/ui/controls/Control.cpp
index 1c4ffe51..29c2c46a 100644
--- a/src/ui/controls/Control.cpp
+++ b/src/ui/controls/Control.cpp
@@ -16,7 +16,9 @@ using platform::gui::IUiApplication;
 using platform::gui::SystemCursorType;
 
 Control::Control() {
-  style_rule_set_ = std::make_unique<style::StyleRuleSet>(this);
+  style_rule_set_ = std::make_unique<style::StyleRuleSet>();
+  style_rule_set_bind_ =
+      std::make_unique<style::StyleRuleSetBind>(this, style_rule_set_.get());
 
   MouseEnterEvent()->Direct()->AddHandler([this](event::MouseEventArgs&) {
     this->is_mouse_over_ = true;
diff --git a/src/ui/controls/TextBox.cpp b/src/ui/controls/TextBox.cpp
index 0d14dbcf..d8317a8c 100644
--- a/src/ui/controls/TextBox.cpp
+++ b/src/ui/controls/TextBox.cpp
@@ -36,7 +36,7 @@ TextBox::TextBox()
 
   border_render_object_->SetBorderEnabled(true);
 
-  GetStyleRuleSet()->Set(theme_resources->text_box_style);
+  GetStyleRuleSet()->SetParent(&theme_resources->text_box_style);
 }
 
 TextBox::~TextBox() {}