refactor window

Author: igagis

src/ruis/widget/group/window.cpp

@@ -208,9 +208,8 @@ utki::shared_ref<container> make_caption(
 
 utki::shared_ref<container> make_middle(
 	utki::shared_ref<context> c, //
-	container::parameters container_params,
-	string title,
-	widget_list children
+	utki::shared_ref<container> content_conatiner,
+	string title
 )
 {
 	// clang-format off
@@ -228,30 +227,16 @@ utki::shared_ref<container> make_middle(
 			make_caption(c,
 				std::move(title)
 			),
-			m::container(c,
-				{
-					.layout_params = {
-						.dims = {ruis::dim::fill, ruis::dim::fill},
-						.weight = 1
-					},
-					.widget_params = {
-						.id = "ruis_content"s,
-						.clip = true
-					},
-					.container_params = std::move(container_params)
-				},
-				std::move(children)
-			)
+			std::move(content_conatiner)
 		}
 	);
 	// clang-format on
 }
 
 utki::shared_ref<container> make_middle_row(
 	utki::shared_ref<context> c, //
-	container::parameters container_params,
-	string title,
-	widget_list children
+	utki::shared_ref<container> content_container,
+	string title
 )
 {
 	// clang-format off
@@ -277,9 +262,8 @@ utki::shared_ref<container> make_middle_row(
 				}
 			),
 			make_middle(c,
-				std::move(container_params),
-				std::move(title),
-				std::move(children)
+				std::move(content_container),
+				std::move(title)
 			),
 			m::mouse_proxy(c,
 				{
@@ -298,9 +282,8 @@ utki::shared_ref<container> make_middle_row(
 
 std::vector<utki::shared_ref<widget>> make_children(
 	utki::shared_ref<context> c, //
-	container::parameters container_params,
-	string title,
-	widget_list children
+	utki::shared_ref<container> content_container,
+	string title
 )
 {
 	// clang-format off
@@ -317,9 +300,8 @@ std::vector<utki::shared_ref<widget>> make_children(
 			{
 				make_top_row(c),
 				make_middle_row(c,
-					std::move(container_params),
-					std::move(title),
-					std::move(children)
+					std::move(content_container),
+					std::move(title)
 				),
 				make_bottom_row(c)
 			}
@@ -351,6 +333,23 @@ window::window(
 		std::move(params.layout_params),
 		std::move(params.widget_params)
 	),
+	content_wrapping(
+		m::container(this->context,
+			// clang-format off
+			{
+				.layout_params = {
+					.dims = {ruis::dim::fill, ruis::dim::fill},
+					.weight = 1
+				},
+				.widget_params = {
+					.clip = true
+				},
+				.container_params = std::move(params.container_params)
+			},
+			// clang-format on
+			std::move(children)
+		)
+	),
 	// clang-format off
 	container( //
 		this->context,
@@ -361,9 +360,8 @@ window::window(
 		},
 		make_children(
 			this->context, //
-			std::move(params.container_params),
-			std::move(params.title),
-			std::move(children)
+			this->content_container,
+			std::move(params.title)
 		)
 	)
 // clang-format on
@@ -414,9 +412,6 @@ window::window(
 void ruis::window::setup_widgets()
 {
 	// TODO: refactor to avoid widget lookup by id.
-	this->content_area = this->try_get_widget_as<container>("ruis_content");
-	ASSERT(this->content_area)
-
 	this->title = this->try_get_widget_as<text>("ruis_title");
 	ASSERT(this->title)
 

src/ruis/widget/group/window.hpp

@@ -21,6 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
+#include "../../util/content_wrapping.hpp"
 #include "../../util/length.hpp"
 #include "../label/rectangle.hpp"
 #include "../label/text.hpp"
@@ -37,10 +38,10 @@ namespace ruis {
  * @param title - text of the window title.
  * @param look - style settings.
  */
-// TODO: derive from padding
 // NOLINTNEXTLINE(bugprone-incorrect-enable-shared-from-this, "std::shared_from_this is public via widget")
 class window :
 	virtual public widget, //
+	public content_wrapping,
 	private container
 {
 	ruis::vector2 empty_min_dim; // minimal dimension of empty window
@@ -53,8 +54,6 @@ class window :
 
 	std::shared_ptr<text> title;
 
-	std::shared_ptr<container> content_area;
-
 	std::shared_ptr<widget> lt_border;
 	std::shared_ptr<widget> rt_border;
 	std::shared_ptr<widget> t_border;
@@ -110,16 +109,6 @@ class window :
 
 	void set_title(std::u32string str);
 
-	/**
-	 * @brief Get window content area.
-	 * This is where child widgets are stored.
-	 * @return Window content area.
-	 */
-	container& content()
-	{
-		return *this->content_area;
-	}
-
 	/**
 	 * @brief Move the window to the Z order top within its parent.
 	 */