gap can draw rectangle

Author: igagis

src/ruis/widget/base/color_widget.cpp

@@ -25,7 +25,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 using namespace ruis;
 
-color_widget::color_widget(utki::shared_ref<ruis::context> context, parameters params) :
+color_widget::color_widget(
+	utki::shared_ref<ruis::context> context,
+	parameters params //
+) :
 	widget(std::move(context), {}, {}),
 	params(std::move(params))
 {}

src/ruis/widget/base/color_widget.hpp

@@ -47,7 +47,10 @@ class color_widget : public virtual widget
 	parameters params;
 
 protected:
-	color_widget(utki::shared_ref<ruis::context> context, parameters params);
+	color_widget(
+		utki::shared_ref<ruis::context> context,
+		parameters params //
+	);
 
 public:
 	color_widget(const color_widget&) = delete;

src/ruis/widget/label/gap.cpp

@@ -23,6 +23,36 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 using namespace ruis;
 
-gap::gap(utki::shared_ref<ruis::context> context, all_parameters params) :
-	widget(std::move(context), std::move(params.layout_params), std::move(params.widget_params))
+gap::gap(
+	utki::shared_ref<ruis::context> context,
+	all_parameters params //
+) :
+	widget(
+		std::move(context),
+		std::move(params.layout_params),
+		std::move(params.widget_params) //
+	),
+	color_widget(
+		this->context,
+		std::move(params.color_params) //
+	)
 {}
+
+void gap::render(const mat4& matrix) const
+{
+	if (this->get_current_color().is_undefined()) {
+		return;
+	}
+
+	// draw rectangle
+	auto& r = this->context.get().renderer.get();
+
+	ruis::matrix4 matr(matrix);
+	matr.scale(this->rect().d);
+
+	r.shaders().color_pos->render(
+		matr, //
+		r.obj().pos_quad_01_vao.get(),
+		this->get_current_color().to_vec4f()
+	);
+}

src/ruis/widget/label/gap.hpp

@@ -21,23 +21,35 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "../widget.hpp"
+#include "../base/color_widget.hpp"
 
 namespace ruis {
 
-class gap : virtual public widget
+class gap : public color_widget
 {
 public:
 	struct all_parameters {
 		layout_parameters layout_params;
 		widget::parameters widget_params;
+		color_widget::parameters color_params = {
+			.color = {},
+			.disabled_color = {} //
+		};
 	};
 
-	gap(utki::shared_ref<ruis::context> context, all_parameters params);
+	gap(
+		utki::shared_ref<ruis::context> context,
+		all_parameters params //
+	);
+
+	void render(const mat4& matrix) const override;
 };
 
 namespace make {
-inline utki::shared_ref<ruis::gap> gap(utki::shared_ref<ruis::context> context, ruis::gap::all_parameters params)
+inline utki::shared_ref<ruis::gap> gap(
+	utki::shared_ref<ruis::context> context, //
+	ruis::gap::all_parameters params
+)
 {
 	return utki::make_shared<ruis::gap>( //
 		std::move(context),

src/ruis/widget/label/rectangle.cpp

@@ -380,11 +380,31 @@ rectangle::rounded_corners_texture::rounded_corners_texture(
 
 void rectangle::update_rounded_corners_texture()
 {
-	if (!this->params.rounded_corners) {
+	if (std::find_if(
+			this->params.corner_radius.begin(),
+			this->params.corner_radius.end(),
+			[](const auto& e) {
+				return !e.get().is_undefined();
+			}
+		) == this->params.corner_radius.end())
+	{
 		this->rounded_corners_tex.reset();
 		return;
 	}
 
+	// std::array<real, 4> actual_corner_radius;
+	// std::transform(
+	// 	this->params.corner_radius.begin(),
+	// 	this->params.corner_radius.end(),
+	// 	actual_corner_radius.begin(),
+	// 	[this](const auto& r) -> real {
+	// 		if (r.get().is_undefined()) {
+	// 			return 0;
+	// 		}
+	// 		return r.get().get(this->context);
+	// 	} //
+	// );
+
 	auto borders = this->get_actual_borders();
 
 	// TODO: develop algorithm to go through cache from time to time and drop zombie textures

src/ruis/widget/label/rectangle.hpp

@@ -37,7 +37,8 @@ class rectangle :
 {
 public:
 	struct parameters {
-		bool rounded_corners = false;
+		// TODO: comment
+		sides<styled<length>> corner_radius;
 	};
 
 private:

tests/app2/src/rectangles_window.cpp

@@ -86,7 +86,7 @@ utki::shared_ref<ruis::widget> make_rectangles_window(
                         .color = 0xff800000
                     },
                     .rectangle_params{
-                        .rounded_corners = true
+                        .corner_radius = {0, 3_pp, 5_pp, 10_pp}
                     }
                 },
                 {
@@ -111,7 +111,7 @@ utki::shared_ref<ruis::widget> make_rectangles_window(
                         }
                     },
                     .rectangle_params{
-                        .rounded_corners = true
+                        .corner_radius = {3_pp}
                     },
                     .rectangle_button_params{
                         // TODO: