styles as resources

Author: igagis

res/ruis_res/main.res

@@ -1,8 +1,3 @@
 include{ui.res}
-// include{fonts/font.res}
-include_subdirs
 
-// TODO: remove
-ruis_gui_defs{
-	file{defs.gui}
-}
+include_subdirs

res/ruis_res/styles/main.res

@@ -0,0 +1,7 @@
+ruis_tml_style_dark{
+	file{style_dark.tml}
+}
+
+ruis_tml_style_light{
+	file{style_light.tml}
+}

res/ruis_res/style_dark.tml res/ruis_res/styles/style_dark.tmlres/ruis_res/style_dark.tml renamed to res/ruis_res/styles/style_dark.tml

@@ -67,16 +67,17 @@ void gui::init_standard_widgets(const fsif::file& fi)
 			continue;
 		}
 
-		fi.set_path(utki::cat(s, "style_dark.tml"));
-		this->context.get().style_provider.get().set(utki::make_shared<style_sheet>(tml::read(fi)));
-
 		mounted = true;
 		break;
 	}
 
 	if (!mounted) {
 		throw std::runtime_error("gui::init_standard_widgets(): could not mount default resource pack");
 	}
+
+	// TODO: pass which style to load via parameter
+	auto style_res = this->context.get().loader().load<ruis::res::tml>("ruis_tml_style_dark"sv);
+	this->context.get().style_provider.get().set(utki::make_shared<style_sheet>(style_res.get().forest));
 }
 
 void gui::set_viewport(const ruis::rect& rect)

res/ruis_res/style_light.tml res/ruis_res/styles/style_light.tmlres/ruis_res/style_light.tml renamed to res/ruis_res/styles/style_light.tml

@@ -28,8 +28,8 @@ using namespace std::string_view_literals;
 
 using namespace ruis::res;
 
-ruis::res::tml::tml(::tml::forest tml_forest) :
-	tml_forest(std::move(tml_forest))
+ruis::res::tml::tml(::tml::forest forest) :
+	forest(std::move(forest))
 {}
 
 utki::shared_ref<ruis::res::tml> ruis::res::tml::load( //

src/ruis/gui.cpp

@@ -46,8 +46,6 @@ class tml : public resource
 {
 	friend class ruis::resource_loader;
 
-	::tml::forest tml_forest;
-
 public:
 	/**
 	 * @brief Create tml resource.
@@ -63,10 +61,7 @@ class tml : public resource
 
 	~tml() override = default;
 
-	const ::tml::forest& forest() const noexcept
-	{
-		return this->tml_forest;
-	}
+	const ::tml::forest forest;
 
 private:
 	static utki::shared_ref<tml> load( //

src/ruis/res/tml.cpp

@@ -212,7 +212,7 @@ const tst::set set("style", [](tst::suite& suite){
 
         auto tml_sv = s.get<ruis::res::tml>("tml_style_value"sv);
         tst::check(tml_sv.get(), SL);
-        tst::check_eq(tml_sv.get()->forest(), tml::read("Hello world!"s), SL);
+        tst::check_eq(tml_sv.get()->forest, tml::read("Hello world!"s), SL);
 
         auto ss2 = utki::make_shared<ruis::style_sheet>(
             tml::read(
@@ -227,12 +227,12 @@ const tst::set set("style", [](tst::suite& suite){
 
         s.set(ss2);
 
-        tst::check_eq(tml_sv.get()->forest(), tml::read("World, hello!"s), SL);
+        tst::check_eq(tml_sv.get()->forest, tml::read("World, hello!"s), SL);
 
         {
             auto tml_sv = s.get<ruis::res::tml>("tml_style_value"sv);
             tst::check(tml_sv.get(), SL);
-            tst::check_eq(tml_sv.get()->forest(), tml::read("World, hello!"s), SL);
+            tst::check_eq(tml_sv.get()->forest, tml::read("World, hello!"s), SL);
         }
     });
 
@@ -268,7 +268,7 @@ const tst::set set("style", [](tst::suite& suite){
 
         ruis::styled<ruis::res::tml> tml = std::make_shared<ruis::res::tml>(tml::read("Hello{world!}"));
         tst::check(tml.get() != nullptr, SL);
-        tst::check_eq(tml.get()->forest(), tml::read("Hello{world!}"), SL);
+        tst::check_eq(tml.get()->forest, tml::read("Hello{world!}"), SL);
     });
 });
 }