modernize busy test app

Author: igagis

src/ruis/widget/label/busy.cpp

@@ -28,6 +28,30 @@ busy::busy(const utki::shared_ref<ruis::context>& c, const tml::forest& desc) :
 	spinner(this->context, desc)
 {}
 
+busy::busy(
+	utki::shared_ref<ruis::context> context, //
+	all_parameters params
+) :
+	widget(
+		std::move(context), //
+		std::move(params.layout_params),
+		std::move(params.widget_params)
+	),
+	spinner(
+		this->context, //
+		// clang-format off
+		{
+			.image_params = std::move(params.image_params),
+			.blending_params = std::move(params.blending_params)
+		}
+		// clang-format on
+	)
+{
+	if (!this->get_image()) {
+		this->set_image(this->context.get().loader.load<ruis::res::image>("ruis_img_busy"));
+	}
+}
+
 void busy::set_active(bool active)
 {
 	this->set_visible(active);

src/ruis/widget/label/busy.hpp

@@ -34,7 +34,32 @@ class busy : public spinner
 public:
 	busy(const utki::shared_ref<ruis::context>& c, const tml::forest& desc);
 
+	struct all_parameters {
+		layout_parameters layout_params;
+		widget::parameters widget_params;
+		image::parameters image_params;
+		blending_widget::parameters blending_params;
+	};
+
+	busy(
+		utki::shared_ref<ruis::context> context, //
+		all_parameters params
+	);
+
 	void set_active(bool active);
 };
 
+namespace make {
+inline utki::shared_ref<ruis::busy> busy(
+	utki::shared_ref<ruis::context> context, //
+	ruis::busy::all_parameters params
+)
+{
+	return utki::make_shared<ruis::busy>(
+		std::move(context), //
+		std::move(params)
+	);
+}
+} // namespace make
+
 } // namespace ruis

src/ruis/widget/label/spinner.cpp

@@ -25,6 +25,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include <utki/math.hpp>
 
+using namespace std::string_view_literals;
+
 using namespace ruis;
 
 spinner::spinner(const utki::shared_ref<ruis::context>& c, const tml::forest& desc) :
@@ -72,3 +74,21 @@ void spinner::update(uint32_t dt_ms)
 {
 	angle += real(utki::pi) / real(std::milli::den) * real(dt_ms);
 }
+
+utki::shared_ref<ruis::spinner> ruis::make::refresh(
+	utki::shared_ref<ruis::context> context, //
+	spinner::all_parameters params
+)
+{
+	if (!params.image_params.img) {
+		params.image_params.img = context.get().loader.load<res::image>("ruis_img_refresh"sv);
+	}
+	if (!params.image_params.disabled_img) {
+		params.image_params.disabled_img = context.get().loader.load<res::image>("ruis_img_refresh_disabled"sv);
+	}
+
+	return utki::make_shared<ruis::spinner>(
+		std::move(context), //
+		std::move(params)
+	);
+}

src/ruis/widget/label/spinner.hpp

@@ -67,6 +67,11 @@ inline utki::shared_ref<ruis::spinner> spinner(
 	return utki::make_shared<ruis::spinner>(std::move(context), std::move(params));
 }
 
+utki::shared_ref<ruis::spinner> refresh(
+	utki::shared_ref<ruis::context> context, //
+	spinner::all_parameters params
+);
+
 } // namespace make
 
 } // namespace ruis

tests/busy/res/test.gui

@@ -7,6 +7,8 @@
 #include <ruis/widget/button/push_button.hpp>
 #include <ruis/widget/label/busy.hpp>
 
+#include "root_gui.hpp"
+
 class application : public ruisapp::application{
 public:
 	application() :
@@ -18,9 +20,7 @@ class application : public ruisapp::application{
 	{
 		this->gui.init_standard_widgets(*this->get_res_file("../../res/ruis_res/"));
 
-		auto c = this->gui.context.get().inflater.inflate(
-				*this->get_res_file("res/test.gui")
-			);
+		auto c = make_root_gui(this->gui.context);
 		this->gui.set_root(c);
 
 		{

tests/busy/src/main.cpp

@@ -0,0 +1,81 @@
+#include "root_gui.hpp"
+
+#include <ruis/widget/label/busy.hpp>
+#include <ruis/widget/button/push_button.hpp>
+#include <ruis/widget/label/text.hpp>
+
+using namespace std::string_literals;
+using namespace std::string_view_literals;
+
+namespace m{
+    using namespace ruis::make;
+}
+
+utki::shared_ref<ruis::widget> make_root_gui(utki::shared_ref<ruis::context> c){
+    // clang-format off
+    return m::pile(c,
+        {},
+        {
+            m::column(c,
+                {},
+                {
+                    m::busy(c,
+                        {
+                            .widget_params{
+                                .id = "busy_spinner"s,
+                                .visible = false
+                            }
+                        }
+                    ),
+                    m::push_button(c,
+                        {
+                            .widget_params{
+                                .id = "busy_toggle_button"s
+                            }
+                        },
+                        {
+                            m::text(c,
+                                {},
+                                U"toggle busy spinner"s
+                            )
+                        }
+                    ),
+                    m::busy(c,
+                        {
+                            .widget_params{
+                                .id = "busy_spinner2"s
+                            }
+                        }
+                    ),
+                    m::push_button(c,
+                        {
+                            .widget_params{
+                                .id = "refresh_toggle_button"s
+                            }
+                        },
+                        {
+                            m::refresh(c,
+                                {
+                                    .widget_params{
+                                        .id = "refresh_spinner"s
+                                    }
+                                }
+                            )
+                        }
+                    ),
+                    m::push_button(c,
+                        {
+                            .widget_params{
+                                .id = "refresh_disable_button"s
+                            }
+                        },
+                        {
+                            m::refresh(c, {})
+                        }
+                    )
+                }
+            )
+        }
+    );
+    // clang-format on
+}

tests/busy/src/root_gui.cpp

@@ -0,0 +1,5 @@
+#pragma once
+
+#include <ruis/widget/widget.hpp>
+
+utki::shared_ref<ruis::widget> make_root_gui(utki::shared_ref<ruis::context> c);