modernize tab

Author: igagis

src/ruis/widget/button/choice_button.cpp

@@ -25,6 +25,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 using namespace ruis;
 
+choice_button::choice_button(utki::shared_ref<ruis::context> context) :
+	widget(std::move(context), {}, {}),
+	button(this->context, ruis::button::parameters{}),
+	toggle_button(this->context)
+{}
+
 choice_button::choice_button(const utki::shared_ref<ruis::context>& c, const tml::forest& desc) :
 	widget(c, desc),
 	button(this->context, desc),

src/ruis/widget/button/choice_button.hpp

@@ -44,6 +44,8 @@ class choice_button : virtual public toggle_button
 
 	choice_button(const utki::shared_ref<ruis::context>& c, const tml::forest& desc);
 
+	choice_button(utki::shared_ref<ruis::context> context);
+
 public:
 	choice_button(const choice_button&) = delete;
 	choice_button& operator=(const choice_button&) = delete;

src/ruis/widget/button/impl/nine_patch_toggle.cpp

@@ -29,6 +29,32 @@ void nine_patch_toggle::on_pressed_change()
 	this->toggle_button::on_pressed_change();
 }
 
+nine_patch_toggle::nine_patch_toggle(
+	utki::shared_ref<ruis::context> context, //
+	container::parameters container_params,
+	button::parameters button_params,
+	blending_widget::parameters blending_params,
+	nine_patch::parameters nine_patch_params,
+	nine_patch_button::parameters nine_patch_button_params,
+	utki::span<const utki::shared_ref<ruis::widget>> children
+) :
+	widget(std::move(context), {}, {}),
+	button(
+		this->context, //
+		std::move(button_params)
+	),
+	toggle_button(this->context),
+	nine_patch_button(
+		this->context, //
+		std::move(container_params),
+		button::parameters{},
+		std::move(blending_params),
+		std::move(nine_patch_params),
+		std::move(nine_patch_button_params),
+		children
+	)
+{}
+
 nine_patch_toggle::nine_patch_toggle(const utki::shared_ref<ruis::context>& c, const tml::forest& desc) :
 	widget(c, desc),
 	button(this->context, desc),

src/ruis/widget/button/impl/nine_patch_toggle.hpp

@@ -30,7 +30,17 @@ class nine_patch_toggle :
 	virtual public toggle_button, //
 	public nine_patch_button
 {
-public:
+protected:
+	nine_patch_toggle(//
+		utki::shared_ref<ruis::context> context,
+		container::parameters container_params,
+		button::parameters button_params,
+		blending_widget::parameters blending_params,
+		nine_patch::parameters nine_patch_params,
+		nine_patch_button::parameters nine_patch_button_params,
+		utki::span<const utki::shared_ref<ruis::widget>> children
+	);
+
 	nine_patch_toggle(const utki::shared_ref<ruis::context>& c, const tml::forest& desc);
 
 protected:

src/ruis/widget/button/tab.cpp

@@ -85,6 +85,44 @@ void tab::on_pressed_change()
 	this->nine_patch_toggle::on_pressed_change();
 }
 
+tab::tab(
+	utki::shared_ref<ruis::context> context, //
+	all_parameters params,
+	utki::span<const utki::shared_ref<ruis::widget>> children
+) :
+	widget(
+		std::move(context), //
+		std::move(params.layout_params),
+		std::move(params.widget_params)
+	),
+	button(this->context, ruis::button::parameters{}),
+	toggle_button(this->context),
+	choice_button(this->context),
+	nine_patch_toggle(
+		this->context,
+		std::move(params.container_params),
+		std::move(params.button_params),
+		std::move(params.blending_params),
+		std::move(params.nine_patch_params),
+		std::move(params.nine_patch_button_params),
+		children
+	)
+{
+	if (!this->get_pressed_nine_patch()) {
+		this->set_pressed_nine_patch(
+			this->context.get().loader.load<res::nine_patch>("ruis_npt_tab_active").to_shared_ptr()
+		);
+	}
+	if (!this->get_unpressed_nine_patch()) {
+		this->set_unpressed_nine_patch(
+			this->context.get().loader.load<res::nine_patch>("ruis_npt_tab_inactive").to_shared_ptr()
+		);
+	}
+
+	// initialize nine-patch
+	this->tab::on_pressed_change();
+}
+
 tab::tab(const utki::shared_ref<ruis::context>& c, const tml::forest& desc) :
 	widget(c, desc),
 	button(this->context, desc),

src/ruis/widget/button/tab.hpp

@@ -38,6 +38,22 @@ class tab :
 public:
 	tab(const utki::shared_ref<ruis::context>& c, const tml::forest& desc);
 
+	struct all_parameters {
+		ruis::layout_parameters layout_params;
+		ruis::widget::parameters widget_params;
+		container::parameters container_params;
+		button::parameters button_params;
+		blending_widget::parameters blending_params;
+		nine_patch::parameters nine_patch_params;
+		nine_patch_button::parameters nine_patch_button_params;
+	};
+
+	tab( //
+		utki::shared_ref<ruis::context> context,
+		all_parameters params,
+		utki::span<const utki::shared_ref<ruis::widget>> children
+	);
+
 	tab(const tab&) = delete;
 	tab& operator=(const tab&) = delete;
 

src/ruis/widget/container.hpp

@@ -254,7 +254,8 @@ class container : virtual public widget
 	 */
 	widget_list::const_reverse_iterator erase(widget_list::const_reverse_iterator child)
 	{
-		return widget_list::const_reverse_iterator(this->erase(--child.base())
+		return widget_list::const_reverse_iterator(
+			this->erase(--child.base())
 		); // the base iterator points to the next element to the one the reverse iterator points, so use decrement
 	}