modernize book test app 2

Author: igagis

src/ruis/gui.cpp

@@ -349,13 +349,13 @@ void gui::set_viewport(const ruis::vector2& size)
 	this->root_widget.get().resize(this->viewport_size);
 }
 
-void gui::set_root(const utki::shared_ref<ruis::widget>& w)
+void gui::set_root(utki::shared_ref<ruis::widget> w)
 {
 	if (w.get().parent()) {
 		throw std::invalid_argument("given widget is already added to some container");
 	}
 
-	this->root_widget = w;
+	this->root_widget = std::move(w);
 
 	this->root_widget.get().move_to(ruis::vector2(0));
 	this->root_widget.get().resize(this->viewport_size);

src/ruis/gui.hpp

@@ -56,7 +56,7 @@ class gui final
 	 * @brief Set the root widget of the application.
 	 * @param w - the widget to set as a root widget.
 	 */
-	void set_root(const utki::shared_ref<ruis::widget>& w);
+	void set_root(utki::shared_ref<ruis::widget> w);
 
 	/**
 	 * @brief Get current root widget.

src/ruis/widget/group/book.cpp

@@ -28,13 +28,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 using namespace ruis;
 
-book::book(utki::shared_ref<ruis::context> context, all_parameters params) :
+book::book(utki::shared_ref<ruis::context> context, //
+	all_parameters params) :
 	widget( //
 		std::move(context),
 		std::move(params.layout_params),
 		std::move(params.widget_params)
 	),
-	container(this->context, {.container_params = {.layout = layout::pile}}, {})
+	container(
+		this->context,
+		{.container_params = {.layout = layout::pile}},
+		{}
+	)
 {}
 
 book::book(const utki::shared_ref<ruis::context>& c, const tml::forest& desc) :

src/ruis/widget/group/book.hpp

@@ -91,7 +91,10 @@ class book :
 		widget::parameters widget_params;
 	};
 
-	book(utki::shared_ref<ruis::context> context, all_parameters params);
+	book(
+		utki::shared_ref<ruis::context> context, //
+		all_parameters params
+	);
 
 	book(const utki::shared_ref<ruis::context>& c, const tml::forest& desc);
 
@@ -132,9 +135,15 @@ class book :
 };
 
 namespace make {
-inline utki::shared_ref<ruis::book> book(utki::shared_ref<ruis::context> context, ruis::book::all_parameters params)
+inline utki::shared_ref<ruis::book> book(
+	utki::shared_ref<ruis::context> context, //
+	ruis::book::all_parameters params
+)
 {
-	return utki::make_shared<ruis::book>(std::move(context), std::move(params));
+	return utki::make_shared<ruis::book>(
+		std::move(context), //
+		std::move(params)
+	);
 }
 } // namespace make
 

tests/book/res/test.gui

@@ -36,9 +36,25 @@ class application : public ruisapp::application{
 
 		this->gui.context.get().loader.mount_res_pack(*this->get_res_file("res/"));
 
-		auto c = this->gui.context.get().inflater.inflate(
-				*this->get_res_file("res/test.gui")
-			);
+		// clang-format off
+		auto c = m::column(this->gui.context,
+			{},
+			{
+				m::book(this->gui.context,
+					{
+						.layout_params{
+							.dims = {ruis::dim::fill, ruis::dim::max},
+							.weight = 1
+						},
+						.widget_params{
+							.id = "book"s
+						}
+					}
+				)
+			}
+		);
+		// clang-format on
+
 		this->gui.set_root(c);
 
 		auto& book = c.get().get_widget_as<ruis::book>("book");