test app

Author: igagis

src/ruis/context.cpp

@@ -33,7 +33,6 @@ context::context(
 ) :
 	post_to_ui_thread_function(std::move(params.post_to_ui_thread_function)),
 	style_provider(std::move(style_provider)),
-	res_loader(this->style_provider.get().res_loader),
 	renderer(std::move(renderer)),
 	updater(std::move(updater)),
 	localization(std::move(params.localization)),

src/ruis/context.hpp

@@ -69,19 +69,13 @@ class context : public std::enable_shared_from_this<context>
 		return this->style_provider.get();
 	}
 
-	/**
-	 * @brief Resource loader.
-	 * Allows loading and managing life time of resources.
-	 */
-	const utki::shared_ref<resource_loader> res_loader;
-
 	/**
 	 * @brief Shorthand alias for resource loader.
 	 * @return this->res_loader.get().
 	 */
 	resource_loader& loader() noexcept
 	{
-		return this->res_loader.get();
+		return this->style().res_loader.get();
 	}
 
 	/**

src/ruis/render/native_window.hpp

@@ -14,7 +14,7 @@ class native_window
 
 	bool is_fullscreen_v = false;
 
-	virtual void bind_rendering_context(){}
+	virtual void bind_rendering_context() {}
 
 	virtual void set_fullscreen_internal(bool enable) {}
 

src/ruis/widget/base/text_widget.hpp

@@ -53,7 +53,11 @@ class text_widget : virtual public widget
 private:
 	parameters params;
 
-	utki::enum_array<std::shared_ptr<const ruis::font>, res::font::style> fonts;
+	utki::enum_array<
+		std::shared_ptr<const ruis::font>, //
+		res::font::style //
+		>
+		fonts;
 
 	void update_fonts();
 	void update_fonts_and_notify();

tests/app/src/main.cpp

@@ -68,7 +68,7 @@ class application : public ruisapp::application{
 							.buffers = {ruisapp::buffer::depth}
 						}))
 	{
-		this->window.close_hander = [this](ruisapp::window&){
+		this->window.close_handler = [this](ruisapp::window&){
 			this->quit();
 		};
 

tests/app/src/new_native_window.cpp

@@ -0,0 +1,48 @@
+#include "new_native_window.hpp"
+
+#include <ruis/widget/button/push_button.hpp>
+#include <ruis/widget/label/text.hpp>
+#include <ruis/widget/container.hpp>
+
+using namespace std::string_literals;
+
+namespace m{
+using namespace ruis::make;
+}
+
+utki::shared_ref<ruis::widget> make_new_native_window_root_widget(utki::shared_ref<ruis::context> c){
+    // clang-format off
+    auto button = m::push_button(c,
+        {
+            .layout_params{
+                .dims{ruis::dim::fill, ruis::dim::fill},
+                .weight = 1
+            }
+        },
+        {
+            m::text(c, {}, U"the button"s)
+        }
+    );
+    // clang-format on
+
+    button.get().click_handler = [](ruis::push_button& b){
+        utki::logcat("the button clicked", '\n');
+    };
+
+    // clang-format off
+    return m::column(c,
+        {},
+        {
+            m::text(c,
+                {
+                    .layout_params{
+                        .align = {ruis::align::front, ruis::align::center}
+                    }
+                },
+                U"Native window"s
+            ),
+            std::move(button)
+        }
+    );
+    // clang-format on
+}

tests/app/src/new_native_window.hpp

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

tests/app/src/text_input_window.cpp

@@ -7,6 +7,9 @@
 #include <ruis/widget/label/gap.hpp>
 #include <ruis/widget/input/text_input_line.hpp>
 #include <ruis/default_style.hpp>
+#include <ruisapp/application.hpp>
+
+#include "new_native_window.hpp"
 
 using namespace std::string_literals;
 using namespace std::string_view_literals;
@@ -58,7 +61,20 @@ utki::shared_ref<ruis::window> make_text_input_window(
 
     new_native_window_button.get().click_handler = [](ruis::push_button& b){
         utki::logcat("new native window button clicked", '\n');
-        // TODO:
+
+        auto& nw = ruisapp::inst().make_window(
+            {
+                .title = "new native_window"s
+            }
+        );
+
+        auto c = make_new_native_window_root_widget(nw.gui.context);
+        nw.gui.set_root(c);
+
+        nw.close_handler = [](ruisapp::window& w){
+            utki::logcat("native window close handler called", '\n');
+            ruisapp::inst().destroy_window(w);
+        };
     };
 
     // clang-format off