modernize aspect_ratio_proxy test app

Author: igagis

.vscode/launch.json

@@ -54,6 +54,31 @@
 			],
 			"preLaunchTask": "build-dbg"
 		},
+		{
+			"name": "(gdb) aspect_ratio_proxy",
+			"type": "cppdbg",
+			"request": "launch",
+			"program": "${workspaceFolder}/tests/aspect_ratio_proxy/out/dbg/tests",
+			"args": [],
+			"stopAtEntry": false,
+			"cwd": "${workspaceFolder}/tests/aspect_ratio_proxy",
+			"environment": [
+				{
+					"name": "LD_LIBRARY_PATH",
+					"value": "../../src/out/dbg:../harness/modules/ruisapp/src/out/rel_no_install:../harness/modules/ruis-render-opengl/src/out/rel_no_install"
+				}
+			],
+			"externalConsole": false,
+			"MIMode": "gdb",
+			"setupCommands": [
+				{
+					"description": "Enable pretty-printing for gdb",
+					"text": "-enable-pretty-printing",
+					"ignoreFailures": true
+				}
+			],
+			"preLaunchTask": "build-dbg"
+		},
 		{
 			"name": "(gdb) busy",
 			"type": "cppdbg",

.vscode/tasks.json

@@ -94,16 +94,16 @@
             "group": "build"
 		},
 		{
-            "label": "run-ratio_proxy",
+            "label": "run-aspect_ratio_proxy",
             "type": "shell",
-            "command": "make run-ratio_proxy",
+            "command": "make run-aspect_ratio_proxy",
             "problemMatcher": [],
             "group": "build"
 		},
 		{
-            "label": "run-ratio_proxy-dbg",
+            "label": "run-aspect_ratio_proxy-dbg",
             "type": "shell",
-            "command": "make run-ratio_proxy config=dbg",
+            "command": "make run-aspect_ratio_proxy config=dbg",
             "problemMatcher": [],
             "group": "build"
         },

src/ruis/gui.cpp

@@ -48,10 +48,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #include "widget/label/image_mouse_cursor.hpp"
 #include "widget/label/spinner.hpp"
 #include "widget/label/text.hpp"
+#include "widget/proxy/aspect_ratio_proxy.hpp"
 #include "widget/proxy/click_proxy.hpp"
 #include "widget/proxy/key_proxy.hpp"
 #include "widget/proxy/min_proxy.hpp"
-#include "widget/proxy/ratio_proxy.hpp"
 #include "widget/proxy/resize_proxy.hpp"
 #include "widget/slider/scroll_bar.hpp"
 
@@ -225,7 +225,7 @@ gui::gui(const utki::shared_ref<ruis::context>& context) :
 	// proxy
 	this->context.get().inflater.register_widget<mouse_proxy>("mouse_proxy");
 	this->context.get().inflater.register_widget<click_proxy>("click_proxy");
-	this->context.get().inflater.register_widget<ratio_proxy>("ratio_proxy");
+	this->context.get().inflater.register_widget<aspect_ratio_proxy>("aspect_ratio_proxy");
 	this->context.get().inflater.register_widget<key_proxy>("key_proxy");
 	this->context.get().inflater.register_widget<resize_proxy>("resize_proxy");
 	this->context.get().inflater.register_widget<min_proxy>("min_proxy");

src/ruis/widget/proxy/aspect_ratio_proxy.cpp

@@ -0,0 +1,83 @@
+/*
+ruis - GUI framework
+
+Copyright (C) 2012-2025  Ivan Gagis <[email protected]>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/* ================ LICENSE END ================ */
+
+#include "aspect_ratio_proxy.hpp"
+
+using namespace ruis;
+
+aspect_ratio_proxy::aspect_ratio_proxy(const utki::shared_ref<ruis::context>& c, const tml::forest& desc) :
+	ruis::widget(c, desc)
+{
+	for (const auto& p : desc) {
+		if (!is_property(p)) {
+			continue;
+		}
+
+		if (p.value == "ratio") {
+			this->params.x_above_y = get_property_value(p).to_float();
+		}
+	}
+}
+
+aspect_ratio_proxy::aspect_ratio_proxy(
+	utki::shared_ref<ruis::context> context, //
+	aspect_ratio_proxy::all_parameters params
+) :
+	widget(
+		std::move(context), //
+		std::move(params.layout_params),
+		std::move(params.widget_params)
+	),
+	params(std::move(params.aspect_ratio_params))
+{}
+
+void aspect_ratio_proxy::set_aspect_ratio(real x_above_y)
+{
+	if (this->params.x_above_y == x_above_y) {
+		return;
+	}
+
+	this->params.x_above_y = x_above_y;
+	this->invalidate_layout();
+}
+
+ruis::vector2 aspect_ratio_proxy::measure(const ruis::vector2& quotum) const
+{
+	if (quotum.is_negative()) {
+		return {0, 0};
+	}
+
+	if (quotum.x() < 0) {
+		return ruis::vector2(
+			quotum.y() * this->params.x_above_y, //
+			quotum.y()
+		);
+	}
+
+	if (quotum.y() < 0) {
+		return ruis::vector2(
+			quotum.x(), //
+			quotum.x() / this->params.x_above_y
+		);
+	}
+
+	return quotum;
+}

src/ruis/widget/proxy/aspect_ratio_proxy.hpp

@@ -0,0 +1,83 @@
+/*
+ruis - GUI framework
+
+Copyright (C) 2012-2025  Ivan Gagis <[email protected]>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/* ================ LICENSE END ================ */
+
+#pragma once
+
+#include "../widget.hpp"
+
+namespace ruis {
+
+class aspect_ratio_proxy : virtual public widget
+{
+public:
+	struct parameters {
+		real x_above_y = 1;
+	};
+
+private:
+	parameters params;
+
+public:
+	aspect_ratio_proxy(const utki::shared_ref<ruis::context>& c, const tml::forest& desc);
+
+	struct all_parameters {
+		layout_parameters layout_params;
+		widget::parameters widget_params;
+		parameters aspect_ratio_params;
+	};
+
+	aspect_ratio_proxy(
+		utki::shared_ref<ruis::context> context, //
+		all_parameters params
+	);
+
+	aspect_ratio_proxy(const aspect_ratio_proxy&) = delete;
+	aspect_ratio_proxy& operator=(const aspect_ratio_proxy&) = delete;
+
+	aspect_ratio_proxy(aspect_ratio_proxy&&) = delete;
+	aspect_ratio_proxy& operator=(aspect_ratio_proxy&&) = delete;
+
+	~aspect_ratio_proxy() override = default;
+
+	void set_aspect_ratio(real x_above_y);
+
+	real get_aspect_ratio() const noexcept
+	{
+		return this->params.x_above_y;
+	}
+
+	ruis::vector2 measure(const ruis::vector2& quotum) const override;
+};
+
+namespace make {
+inline utki::shared_ref<ruis::aspect_ratio_proxy> aspect_ratio_proxy(
+	utki::shared_ref<ruis::context> context, //
+	ruis::aspect_ratio_proxy::all_parameters params
+)
+{
+	return utki::make_shared<ruis::aspect_ratio_proxy>(
+		std::move(context), //
+		std::move(params)
+	);
+}
+} // namespace make
+
+} // namespace ruis