From e237959894f8fb24a660348041563d0f0fe6cca5 Mon Sep 17 00:00:00 2001
From: lisyarus <lisyarus@gmail.com>
Date: Fri, 11 Mar 2022 13:11:47 +0300
Subject: [PATCH] Add ui::element::style_updated & own_style_updated replacing
 set_style(style())

---
 libs/ui/include/psemek/ui/element.hpp |  3 ++
 libs/ui/include/psemek/ui/label.hpp   |  4 +-
 libs/ui/source/element.cpp            | 55 ++++++++++++---------------
 libs/ui/source/label.cpp              | 10 +++--
 libs/ui/source/style.cpp              |  4 +-
 5 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/libs/ui/include/psemek/ui/element.hpp b/libs/ui/include/psemek/ui/element.hpp
index 3b918b43..c26ed04a 100644
--- a/libs/ui/include/psemek/ui/element.hpp
+++ b/libs/ui/include/psemek/ui/element.hpp
@@ -56,6 +56,9 @@ namespace psemek::ui
 		virtual std::shared_ptr<struct style const> set_style(std::shared_ptr<struct style const> st);
 		virtual std::shared_ptr<struct style const> set_own_style(std::shared_ptr<struct style const> st);
 
+		virtual void style_updated();
+		virtual void own_style_updated();
+
 		virtual void update(float /* dt */) {}
 
 		virtual void draw(painter & p) const = 0;
diff --git a/libs/ui/include/psemek/ui/label.hpp b/libs/ui/include/psemek/ui/label.hpp
index f479aea6..66ad7889 100644
--- a/libs/ui/include/psemek/ui/label.hpp
+++ b/libs/ui/include/psemek/ui/label.hpp
@@ -60,8 +60,8 @@ namespace psemek::ui
 
 		geom::box<float, 2> size_constraints() const override;
 
-		std::shared_ptr<struct style const> set_style(std::shared_ptr<struct style const> st) override;
-		std::shared_ptr<struct style const> set_own_style(std::shared_ptr<struct style const> st) override;
+		void style_updated() override;
+		void own_style_updated() override;
 
 		void draw(painter & p) const override;
 
diff --git a/libs/ui/source/element.cpp b/libs/ui/source/element.cpp
index ccb149b8..36690205 100644
--- a/libs/ui/source/element.cpp
+++ b/libs/ui/source/element.cpp
@@ -57,52 +57,47 @@ namespace psemek::ui
 
 	std::shared_ptr<style const> element::set_style(std::shared_ptr<struct style const> st)
 	{
-		if (style_ != st)
-		{
-			if (style_)
-				style_->use_as_style.erase(this);
+		if (style_)
+			style_->use_as_style.erase(this);
 
-			std::swap(st, style_);
+		std::swap(st, style_);
 
-			if (style_)
-				style_->use_as_style.insert(this);
-		}
+		if (style_)
+			style_->use_as_style.insert(this);
 
-		auto visitor = util::recursive([](auto && self, element * e) -> void {
-			e->merged_style_ = nullptr;
-			e->merged_own_style_ = nullptr;
-			for (auto c : e->children())
-				if (c) self(c);
-		});
-		visitor(this);
+		style_updated();
 
 		return st;
 	}
 
 	std::shared_ptr<struct style const> element::set_own_style(std::shared_ptr<struct style const> st)
 	{
-		if (style_ != st)
-		{
-			if (style_)
-				style_->use_as_own_style.erase(this);
+		if (style_)
+			style_->use_as_own_style.erase(this);
 
-			std::swap(st, own_style_);
+		std::swap(st, own_style_);
 
-			if (style_)
-				style_->use_as_own_style.insert(this);
-		}
+		if (style_)
+			style_->use_as_own_style.insert(this);
 
-		auto visitor = util::recursive([](auto && self, element * e) -> void {
-			e->merged_style_ = nullptr;
-			e->merged_own_style_ = nullptr;
-			for (auto c : e->children())
-				if (c) self(c);
-		});
-		visitor(this);
+		own_style_updated();
 
 		return st;
 	}
 
+	void element::style_updated()
+	{
+		merged_style_ = nullptr;
+		own_style_updated();
+		for (auto c : children())
+			if (c) c->style_updated();
+	}
+
+	void element::own_style_updated()
+	{
+		merged_own_style_ = nullptr;
+	}
+
 	std::shared_ptr<struct style const> element::merged_style() const
 	{
 		if (!merged_style_)
diff --git a/libs/ui/source/label.cpp b/libs/ui/source/label.cpp
index 05ba747a..ae3e1510 100644
--- a/libs/ui/source/label.cpp
+++ b/libs/ui/source/label.cpp
@@ -62,16 +62,18 @@ namespace psemek::ui
 		return {{{cached_state_inf_->size[0], inf}, {cached_state_inf_->size[1], inf}}};
 	}
 
-	std::shared_ptr<style const> label::set_style(std::shared_ptr<struct style const> st)
+	void label::style_updated()
 	{
+		element::style_updated();
 		cached_state_.reset();
-		return element::set_style(st);
+		cached_state_inf_.reset();
 	}
 
-	std::shared_ptr<style const> label::set_own_style(std::shared_ptr<struct style const> st)
+	void label::own_style_updated()
 	{
+		element::own_style_updated();
 		cached_state_.reset();
-		return element::set_own_style(st);
+		cached_state_inf_.reset();
 	}
 
 	void label::draw(painter & p) const
diff --git a/libs/ui/source/style.cpp b/libs/ui/source/style.cpp
index e4557795..07dcb8e2 100644
--- a/libs/ui/source/style.cpp
+++ b/libs/ui/source/style.cpp
@@ -43,10 +43,10 @@ namespace psemek::ui
 	void style::on_changed()
 	{
 		for (auto e : use_as_style)
-			e->set_style(e->style());
+			e->style_updated();
 
 		for (auto e : use_as_own_style)
-			e->set_own_style(e->own_style());
+			e->own_style_updated();
 	}
 
 	void merge(style & dst, style const & src)