From 4466f721192844fe542d02aced2c8b3860e1433c Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Sun, 8 Jun 2025 22:03:14 +0200 Subject: gui: make TurnOrderView default constructible --- gui/src/turn_order_view.cpp | 53 +++++++++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 16 deletions(-) (limited to 'gui/src') diff --git a/gui/src/turn_order_view.cpp b/gui/src/turn_order_view.cpp index 5239269..0398351 100644 --- a/gui/src/turn_order_view.cpp +++ b/gui/src/turn_order_view.cpp @@ -10,12 +10,14 @@ #include "template_widget.hpp" #include +#include #include #include #include #include +#include #include #include #include @@ -33,23 +35,42 @@ namespace Turns::gui auto constexpr static TEMPLATE = resource::turn_order_view_ui; } // namespace - TurnOrderView::TurnOrderView(Glib::RefPtr model) - : Glib::ObjectBase(TYPE_NAME) + TurnOrderView::TurnOrderView() + : Glib::ObjectBase{TYPE_NAME} , template_widget{TEMPLATE} - , m_model{model} - , m_progress{get_widget("progress")} - , m_view{get_widget("view")} { - if (!model) - { - return; - } - set_orientation(Gtk::Orientation::VERTICAL); + } + + TurnOrderView::TurnOrderView(Glib::RefPtr const & turn_order) + : TurnOrderView{} + { + set_turn_order(turn_order); + } + + auto TurnOrderView::get_turn_order() const -> Glib::RefPtr + { + return m_turn_order.get_value(); + } - m_view->bind_model(m_model, sigc::mem_fun(*this, &TurnOrderView::handle_create_row)); - Glib::Binding::bind_property(m_model->property_round_progress(), m_progress->property_fraction(), Glib::Binding::Flags::SYNC_CREATE); - Glib::Binding::bind_property(m_model->property_running(), m_progress->property_visible(), Glib::Binding::Flags::SYNC_CREATE); + auto TurnOrderView::set_turn_order(Glib::RefPtr const & turn_order) -> void + { + m_turn_order.set_value(turn_order); + m_view->bind_model(get_turn_order(), sigc::mem_fun(*this, &TurnOrderView::handle_create_row)); + Glib::Binding::bind_property(get_turn_order()->property_round_progress(), + m_progress->property_fraction(), + Glib::Binding::Flags::SYNC_CREATE); + Glib::Binding::bind_property(get_turn_order()->property_running(), m_progress->property_visible(), Glib::Binding::Flags::SYNC_CREATE); + } + + auto TurnOrderView::property_turn_order() -> Glib::PropertyProxy> + { + return m_turn_order.get_proxy(); + } + + auto TurnOrderView::property_turn_order() const -> Glib::PropertyProxy_ReadOnly> + { + return m_turn_order.get_proxy(); } auto TurnOrderView::handle_create_row(Glib::RefPtr const item) -> Gtk::Widget * @@ -57,15 +78,15 @@ namespace Turns::gui auto participant = std::dynamic_pointer_cast(item); auto row = Gtk::make_managed(participant); - Glib::Binding::bind_property(m_model->property_running(), + Glib::Binding::bind_property(get_turn_order()->property_running(), row->delete_enabled(), Glib::Binding::Flags::SYNC_CREATE | Glib::Binding::Flags::INVERT_BOOLEAN); - Glib::Binding::bind_property(m_model->property_running(), + Glib::Binding::bind_property(get_turn_order()->property_running(), row->edit_enabled(), Glib::Binding::Flags::SYNC_CREATE | Glib::Binding::Flags::INVERT_BOOLEAN); return row; } -} // namespace Turns::gui \ No newline at end of file +} // namespace Turns::gui -- cgit v1.2.3