stuff

Author: igagis

res/ruis_res/style_light.tml

@@ -0,0 +1,21 @@
+version{1}
+// TODO: support inherit
+ruis{
+    color_background{0xffd5d5d5}
+    color_middleground{0xffc2c2c2}
+    color_foreground{0xffb0b0b0}
+
+    color_text_normal{0xff000000}
+    color_text_selection_bg{0xff80b0b0}
+
+    color_highlight{0xffad9869}
+
+    color_cursor{0xffff8080}
+
+    // TODO: support include
+    dim_tree_view_item_indent{17pp}
+
+    font_size_normal{12pp}
+    font_face_normal{ruis_fnt_normal}
+}
+user{}

src/ruis/gui.cpp

@@ -70,7 +70,6 @@ void gui::init_standard_widgets(const fsif::file& fi)
 			fi.set_path(s);
 			this->context.get().loader().mount_res_pack(fi);
 		} catch (std::runtime_error&) {
-			// utki::logcat_debug("could not mount respack: ", s, '\n');
 			continue;
 		}
 

src/ruis/style/style_provider.cpp

@@ -90,14 +90,15 @@ void style_provider::store_to_cache(
 	std::weak_ptr<style_value_base> v
 ) const
 {
-	ASSERT(!utki::contains(this->cache, id))
+	utki::assert(!utki::contains(this->cache, id));
 
 	[[maybe_unused]] auto res = this->cache.insert(std::make_pair(
 		std::string(id), //
 		std::move(v)
 	));
 
-	ASSERT(res.second) // insert took place
+	// insert took place
+	utki::assert(res.second);
 }
 
 styled<color> style_provider::get_color_background() const

src/ruis/style/style_provider.hpp

@@ -118,11 +118,10 @@ template <typename value_type>
 styled<value_type> style_provider::get(std::string_view id) const
 {
 	if (auto svb = this->get_from_cache(id)) {
-		auto sv = std::dynamic_pointer_cast<const typename styled<value_type>::style_value>(svb);
-		if (!sv) {
-			throw std::invalid_argument("style::get(id): requested value_type does not match the one stored in cache");
+		if (auto sv = std::dynamic_pointer_cast<const typename styled<value_type>::style_value>(svb)) {
+			return {utki::shared_ref<const typename styled<value_type>::style_value>(std::move(sv))};
 		}
-		return {utki::shared_ref<const typename styled<value_type>::style_value>(std::move(sv))};
+		throw std::invalid_argument("style::get(id): requested value_type does not match the one stored in cache");
 	}
 
 	const auto* desc = this->cur_style_sheet.get().get(id);

src/ruis/style/styled.hpp

@@ -133,21 +133,21 @@ class styled
 
 	const style_value_ref_type& get_ref() const noexcept
 	{
-		ASSERT(!this->value.valueless_by_exception())
-		ASSERT(this->is_from_style())
+		utki::assert(!this->value.valueless_by_exception());
+		utki::assert(this->is_from_style());
 		// use std::get_if() to avoid throwing exceptions
 		const auto* r = std::get_if<style_value_ref_type>(&this->value);
-		ASSERT(r)
+		utki::assert(r);
 		return *r;
 	}
 
 	const actual_value_type& get_value() const noexcept
 	{
-		ASSERT(!this->value.valueless_by_exception())
-		ASSERT(!this->is_from_style())
+		utki::assert(!this->value.valueless_by_exception());
+		utki::assert(!this->is_from_style());
 		// use std::get_if() to avoid throwing exceptions
 		const auto* v = std::get_if<actual_value_type>(&this->value);
-		ASSERT(v)
+		utki::assert(v);
 		return *v;
 	}