From 226b862e95004bd79dbef4051fe991399bbd06a0 Mon Sep 17 00:00:00 2001
From: lisyarus <lisyarus@gmail.com>
Date: Sat, 27 Feb 2021 10:57:30 +0300
Subject: [PATCH] Remove style from element factory

---
 examples/ui.cpp                               |  2 +-
 .../psemek/ui/default_element_factory.hpp     |  3 --
 libs/ui/source/default_element_factory.cpp    | 39 +++----------------
 3 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/examples/ui.cpp b/examples/ui.cpp
index e034bf6c..4057a367 100644
--- a/examples/ui.cpp
+++ b/examples/ui.cpp
@@ -41,9 +41,9 @@ struct ui_example
 		auto style = std::make_shared<ui::style>();
 		style->font = ui::make_default_9x12_font();
 		style->text_scale = 2;
-		element_factory.set_style(style);
 
 		auto screen = element_factory.make_screen();
+		screen->set_style(style);
 
 		auto grid = element_factory.make_grid_layout();
 		grid->set_size(1, 1);
diff --git a/libs/ui/include/psemek/ui/default_element_factory.hpp b/libs/ui/include/psemek/ui/default_element_factory.hpp
index 66942764..7cebe2ec 100644
--- a/libs/ui/include/psemek/ui/default_element_factory.hpp
+++ b/libs/ui/include/psemek/ui/default_element_factory.hpp
@@ -17,9 +17,6 @@ namespace psemek::ui
 		default_element_factory();
 		~default_element_factory();
 
-		void set_style(std::shared_ptr<struct style> st);
-		std::shared_ptr<struct style> style() const;
-
 		std::shared_ptr<button> make_button(std::string text);
 		std::shared_ptr<label> make_label(std::string text);
 		std::shared_ptr<frame> make_frame();
diff --git a/libs/ui/source/default_element_factory.cpp b/libs/ui/source/default_element_factory.cpp
index 01f03041..d1333b0f 100644
--- a/libs/ui/source/default_element_factory.cpp
+++ b/libs/ui/source/default_element_factory.cpp
@@ -140,23 +140,7 @@ namespace psemek::ui
 	}
 
 	struct default_element_factory::impl
-	{
-		std::shared_ptr<struct style> style;
-
-		impl();
-
-		template <typename T>
-		std::shared_ptr<T> create()
-		{
-			auto r = std::make_shared<T>();
-			r->set_style(style);
-			return r;
-		}
-	};
-
-	default_element_factory::impl::impl()
-		: style{std::make_shared<struct style>()}
-	{}
+	{};
 
 	default_element_factory::default_element_factory()
 		: pimpl_{make_impl()}
@@ -164,44 +148,33 @@ namespace psemek::ui
 
 	default_element_factory::~default_element_factory() = default;
 
-	void default_element_factory::set_style(std::shared_ptr<struct style> st)
-	{
-		impl().style = st;
-	}
-
-	std::shared_ptr<struct style> default_element_factory::style() const
-	{
-		return impl().style;
-	}
-
 	std::shared_ptr<button> default_element_factory::make_button(std::string text)
 	{
-		auto r = impl().create<button_impl>();
+		auto r = std::make_shared<button_impl>();
 		r->label()->set_text(std::move(text));
-		r->label()->set_style(impl().style);
 		return r;
 	}
 
 	std::shared_ptr<label> default_element_factory::make_label(std::string text)
 	{
-		auto r = impl().create<label>();
+		auto r = std::make_shared<label>();
 		r->set_text(text);
 		return r;
 	}
 
 	std::shared_ptr<frame> default_element_factory::make_frame()
 	{
-		return impl().create<frame_impl>();
+		return std::make_shared<frame_impl>();
 	}
 
 	std::shared_ptr<screen> default_element_factory::make_screen()
 	{
-		return impl().create<screen>();
+		return std::make_shared<screen>();
 	}
 
 	std::shared_ptr<grid_layout> default_element_factory::make_grid_layout()
 	{
-		return impl().create<grid_layout>();
+		return std::make_shared<grid_layout>();
 	}
 
 }