diff options
Diffstat (limited to 'adw/src')
| -rw-r--r-- | adw/src/dialog.cpp | 237 | ||||
| -rw-r--r-- | adw/src/enums.cpp | 5 | ||||
| -rw-r--r-- | adw/src/private/dialog_p.cpp | 58 |
3 files changed, 287 insertions, 13 deletions
diff --git a/adw/src/dialog.cpp b/adw/src/dialog.cpp index c31fb8a..65da6a2 100644 --- a/adw/src/dialog.cpp +++ b/adw/src/dialog.cpp @@ -7,11 +7,14 @@ #include "adwaitamm/dialog.hpp" #include "adwaitamm/breakpoint.hpp" +#include "adwaitamm/enums.hpp" #include "adwaitamm/private/dialog_p.hpp" #include <glibmm/object.h> #include <glibmm/objectbase.h> +#include <glibmm/propertyproxy.h> #include <glibmm/refptr.h> +#include <glibmm/signalproxy.h> #include <glibmm/ustring.h> #include <glibmm/utility.h> #include <glibmm/wrap.h> @@ -19,6 +22,7 @@ #include <gtkmm/widget.h> #include <glib-object.h> +#include <glib.h> #include <gtk/gtk.h> namespace Adwaita @@ -27,6 +31,35 @@ namespace Adwaita namespace { auto constinit _class = Dialog_Class{}; + + namespace property_name + { + auto constexpr can_close = "can-close"; + auto constexpr child = "child"; + auto constexpr content_height = "content-height"; + auto constexpr content_width = "content-width"; + auto constexpr current_breakpoint = "current-breakpoint"; + auto constexpr default_widget = "default-widget"; + auto constexpr focus_widget = "focus-widget"; + auto constexpr follows_content_size = "follows_content_size"; + auto constexpr presentation_mode = "presentation_mode"; + auto constexpr title = "title"; + } // namespace property_name + + namespace signal_info + { + auto const close_attempt = Glib::SignalProxyInfo{ + "close-attempt", + reinterpret_cast<GCallback>(&Glib::SignalProxyNormal::slot0_void_callback), + reinterpret_cast<GCallback>(&Glib::SignalProxyNormal::slot0_void_callback), + }; + + auto const closed = Glib::SignalProxyInfo{ + "closed", + reinterpret_cast<GCallback>(&Glib::SignalProxyNormal::slot0_void_callback), + reinterpret_cast<GCallback>(&Glib::SignalProxyNormal::slot0_void_callback), + }; + } // namespace signal_info } // namespace auto Dialog::get_type() -> GType @@ -58,62 +91,240 @@ namespace Adwaita auto Dialog::add_breakpoint(Glib::RefPtr<Breakpoint> const & breakpoint) -> void { // Take a copy because the dialog will take ownership of the breakpoint. - adw_dialog_add_breakpoint(Glib::unwrap(this), Glib::unwrap_copy(breakpoint)); + adw_dialog_add_breakpoint(unwrap(this), Glib::unwrap_copy(breakpoint)); } auto Dialog::close() -> void { - adw_dialog_close(Glib::unwrap(this)); + adw_dialog_close(unwrap(this)); } auto Dialog::force_close() -> void { - adw_dialog_force_close(Glib::unwrap(this)); + adw_dialog_force_close(unwrap(this)); + } + + auto Dialog::present(Gtk::Widget * parent) -> void + { + adw_dialog_present(unwrap(this), Glib::unwrap(parent)); } auto Dialog::get_can_close() const -> bool { - return adw_dialog_get_can_close(const_cast<BaseObjectType *>(Glib::unwrap(this))); + return adw_dialog_get_can_close(const_cast<BaseObjectType *>(unwrap(this))); } auto Dialog::get_child() const -> Gtk::Widget * { - return Glib::wrap(adw_dialog_get_child(const_cast<BaseObjectType *>(Glib::unwrap(this))), true); + return Glib::wrap(adw_dialog_get_child(const_cast<BaseObjectType *>(unwrap(this))), true); } auto Dialog::get_content_height() const -> int { - return adw_dialog_get_content_height(const_cast<BaseObjectType *>(Glib::unwrap(this))); + return adw_dialog_get_content_height(const_cast<BaseObjectType *>(unwrap(this))); } auto Dialog::get_content_width() const -> int { - return adw_dialog_get_content_width(const_cast<BaseObjectType *>(Glib::unwrap(this))); + return adw_dialog_get_content_width(const_cast<BaseObjectType *>(unwrap(this))); } auto Dialog::get_current_breakpoint() const -> Glib::RefPtr<Breakpoint> { - return Glib::wrap(adw_dialog_get_current_breakpoint(const_cast<BaseObjectType *>(Glib::unwrap(this))), true); + return Glib::wrap(adw_dialog_get_current_breakpoint(const_cast<BaseObjectType *>(unwrap(this))), true); } auto Dialog::get_default_widget() const -> Gtk::Widget * { - return Glib::wrap(adw_dialog_get_default_widget(const_cast<BaseObjectType *>(Glib::unwrap(this)))); + return Glib::wrap(adw_dialog_get_default_widget(const_cast<BaseObjectType *>(unwrap(this)))); } auto Dialog::get_focus() const -> Gtk::Widget * { - return Glib::wrap(adw_dialog_get_focus(const_cast<BaseObjectType *>(Glib::unwrap(this)))); + return Glib::wrap(adw_dialog_get_focus(const_cast<BaseObjectType *>(unwrap(this)))); } - auto Dialog::present(Gtk::Widget * parent) -> void + auto Dialog::get_follows_content_size() const -> bool + { + return adw_dialog_get_follows_content_size(const_cast<BaseObjectType *>(unwrap(this))); + } + + auto Dialog::get_presentation_mode() const -> PresentationMode + { + return static_cast<PresentationMode>(adw_dialog_get_presentation_mode(const_cast<BaseObjectType *>(unwrap(this)))); + } + + auto Dialog::get_title() const -> Glib::ustring + { + return adw_dialog_get_title(const_cast<BaseObjectType *>(unwrap(this))); + } + + auto Dialog::set_can_close(bool value) -> void + { + return adw_dialog_set_can_close(unwrap(this), static_cast<gboolean>(value)); + } + + auto Dialog::set_child(Gtk::Widget & value) -> void + { + return adw_dialog_set_child(unwrap(this), unwrap(&value)); + } + + auto Dialog::set_content_height(int value) -> void + { + return adw_dialog_set_content_height(unwrap(this), value); + } + + auto Dialog::set_content_width(int value) -> void + { + return adw_dialog_set_content_width(unwrap(this), value); + } + + auto Dialog::set_default_widget(Gtk::Widget & value) -> void + { + return adw_dialog_set_default_widget(unwrap(this), unwrap(&value)); + } + + auto Dialog::set_focus(Gtk::Widget & value) -> void + { + return adw_dialog_set_focus(unwrap(this), unwrap(&value)); + } + + auto Dialog::set_follows_content_size(bool value) -> void + { + return adw_dialog_set_follows_content_size(unwrap(this), value); + } + + auto Dialog::set_presentation_mode(PresentationMode value) -> void { - adw_dialog_present(Glib::unwrap(this), Glib::unwrap(parent)); + return adw_dialog_set_presentation_mode(unwrap(this), static_cast<AdwDialogPresentationMode>(value)); } auto Dialog::set_title(Glib::ustring const & str) -> void { - adw_dialog_set_title(Glib::unwrap(this), Glib::c_str_or_nullptr(str)); + return adw_dialog_set_title(unwrap(this), Glib::c_str_or_nullptr(str)); + } + + auto Dialog::property_can_close() -> Glib::PropertyProxy<bool> + { + return {this, property_name::can_close}; + } + + auto Dialog::property_can_close() const -> Glib::PropertyProxy_ReadOnly<bool> + { + return {this, property_name::can_close}; + } + + auto Dialog::property_child() -> Glib::PropertyProxy<Gtk::Widget *> + { + return {this, property_name::child}; + } + + auto Dialog::property_child() const -> Glib::PropertyProxy_ReadOnly<Gtk::Widget *> + { + return {this, property_name::child}; + } + + auto Dialog::property_content_height() -> Glib::PropertyProxy<int> + { + return {this, property_name::content_height}; + } + + auto Dialog::property_content_height() const -> Glib::PropertyProxy_ReadOnly<int> + { + return {this, property_name::content_height}; + } + + auto Dialog::property_content_width() -> Glib::PropertyProxy<int> + { + return {this, property_name::content_width}; + } + + auto Dialog::property_content_width() const -> Glib::PropertyProxy_ReadOnly<int> + { + return {this, property_name::content_width}; + } + + auto Dialog::property_current_breakpoint() const -> Glib::PropertyProxy_ReadOnly<Glib::RefPtr<Breakpoint>> + { + return {this, property_name::current_breakpoint}; + } + + auto Dialog::property_default_widget() -> Glib::PropertyProxy<Gtk::Widget *> + { + return {this, property_name::default_widget}; + } + + auto Dialog::property_default_widget() const -> Glib::PropertyProxy_ReadOnly<Gtk::Widget *> + { + return {this, property_name::default_widget}; + } + + auto Dialog::property_focus_widget() -> Glib::PropertyProxy<Gtk::Widget *> + { + return {this, property_name::focus_widget}; + } + + auto Dialog::property_focus_widget() const -> Glib::PropertyProxy_ReadOnly<Gtk::Widget *> + { + return {this, property_name::focus_widget}; + } + + auto Dialog::property_follows_content_size() -> Glib::PropertyProxy<bool> + { + return {this, property_name::follows_content_size}; + } + + auto Dialog::property_follows_content_size() const -> Glib::PropertyProxy_ReadOnly<bool> + { + return {this, property_name::follows_content_size}; + } + + auto Dialog::property_presentation_mode() -> Glib::PropertyProxy<PresentationMode> + { + return {this, property_name::presentation_mode}; + } + + auto Dialog::property_presentation_mode() const -> Glib::PropertyProxy_ReadOnly<PresentationMode> + { + return {this, property_name::presentation_mode}; + } + + auto Dialog::property_title() -> Glib::PropertyProxy<Glib::ustring> + { + return {this, property_name::title}; + } + + auto Dialog::property_title() const -> Glib::PropertyProxy_ReadOnly<Glib::ustring> + { + return {this, property_name::title}; + } + + auto Dialog::signal_close_attempt() -> Glib::SignalProxy<void()> + { + return {this, &signal_info::close_attempt}; + } + + auto Dialog::signal_closed() -> Glib::SignalProxy<void()> + { + return {this, &signal_info::closed}; + } + + auto Dialog::on_close_attempt() -> void + { + auto base_class = static_cast<BaseClassType *>(g_type_class_peek_parent(G_OBJECT_GET_CLASS(gobject_))); + if (base_class && base_class->close_attempt) + { + return (base_class->close_attempt)(unwrap(this)); + } + } + + auto Dialog::on_closed() -> void + { + auto base_class = static_cast<BaseClassType *>(g_type_class_peek_parent(G_OBJECT_GET_CLASS(gobject_))); + if (base_class && base_class->closed) + { + return (base_class->closed)(unwrap(this)); + } } } // namespace Adwaita diff --git a/adw/src/enums.cpp b/adw/src/enums.cpp index bcc8290..b93ac3d 100644 --- a/adw/src/enums.cpp +++ b/adw/src/enums.cpp @@ -44,6 +44,10 @@ namespace Adwaita static_assert(matches<LengthType::MinHeight, ADW_BREAKPOINT_CONDITION_MIN_HEIGHT>); static_assert(matches<LengthType::MaxHeight, ADW_BREAKPOINT_CONDITION_MAX_HEIGHT>); + static_assert(matches<PresentationMode::Auto, ADW_DIALOG_AUTO>); + static_assert(matches<PresentationMode::Floating, ADW_DIALOG_FLOATING>); + static_assert(matches<PresentationMode::BottomSheet, ADW_DIALOG_BOTTOM_SHEET>); + static_assert(matches<RatioType::MinAspectRatio, ADW_BREAKPOINT_CONDITION_MIN_ASPECT_RATIO>); static_assert(matches<RatioType::MaxAspectRatio, ADW_BREAKPOINT_CONDITION_MAX_ASPECT_RATIO>); @@ -67,6 +71,7 @@ namespace Glib VALUE_SPECIALIZATION(AccentColor, accent_color) VALUE_SPECIALIZATION(ColorScheme, color_scheme) VALUE_SPECIALIZATION(LengthType, breakpoint_condition) + VALUE_SPECIALIZATION(PresentationMode, dialog_presentation_mode); VALUE_SPECIALIZATION(RatioType, breakpoint_condition) VALUE_SPECIALIZATION(ResponseAppearance, response_appearance) VALUE_SPECIALIZATION(ToastPriority, toast_priority) diff --git a/adw/src/private/dialog_p.cpp b/adw/src/private/dialog_p.cpp index e6ac6cd..7af615a 100644 --- a/adw/src/private/dialog_p.cpp +++ b/adw/src/private/dialog_p.cpp @@ -9,6 +9,7 @@ #include "adwaitamm/dialog.hpp" #include <glibmm/class.h> +#include <glibmm/exceptionhandler.h> #include <glibmm/objectbase.h> #include <gtkmm/object.h> @@ -16,9 +17,11 @@ #include <gtkmm/shortcutmanager.h> #include <adwaita.h> +#include <glib-object.h> namespace Adwaita { + auto Dialog_Class::init() -> Glib::Class const & { if (!gtype_) @@ -34,10 +37,65 @@ namespace Adwaita { auto const klass = static_cast<BaseClassType *>(gclass); CppClassParent::class_init_function(klass, data); + + klass->close_attempt = &close_attempt; + klass->closed = &closed; } auto Dialog_Class::wrap_new(GObject * object) -> Glib::ObjectBase * { return Gtk::manage(new Dialog(ADW_DIALOG(object))); } + + auto Dialog_Class::close_attempt(BaseObjectType * self) -> void + { + auto base_object = static_cast<Glib::ObjectBase *>(Glib::ObjectBase::_get_current_wrapper(G_OBJECT(self))); + if (base_object && base_object->is_derived_()) + { + auto object = dynamic_cast<CppObjectType *>(base_object); + if (object) + { + try + { + return object->on_close_attempt(); + } + catch (...) + { + Glib::exception_handlers_invoke(); + } + } + } + + auto base_class = static_cast<BaseClassType *>(g_type_class_peek_parent(G_OBJECT_GET_CLASS(self))); + if (base_class && base_class->close_attempt) + { + return (base_class->close_attempt)(self); + } + } + + auto Dialog_Class::closed(BaseObjectType * self) -> void + { + auto base_object = static_cast<Glib::ObjectBase *>(Glib::ObjectBase::_get_current_wrapper(G_OBJECT(self))); + if (base_object && base_object->is_derived_()) + { + auto object = dynamic_cast<CppObjectType *>(base_object); + if (object) + { + try + { + return object->on_closed(); + } + catch (...) + { + Glib::exception_handlers_invoke(); + } + } + } + + auto base_class = static_cast<BaseClassType *>(g_type_class_peek_parent(G_OBJECT_GET_CLASS(self))); + if (base_class && base_class->closed) + { + return (base_class->closed)(self); + } + } } // namespace Adwaita
\ No newline at end of file |