summaryrefslogtreecommitdiff
path: root/adw/include/adwaitamm
diff options
context:
space:
mode:
Diffstat (limited to 'adw/include/adwaitamm')
-rw-r--r--adw/include/adwaitamm/actionrow.hpp28
-rw-r--r--adw/include/adwaitamm/breakpoint.hpp1
-rw-r--r--adw/include/adwaitamm/helpers/properties.hpp35
-rw-r--r--adw/include/adwaitamm/preferencesrow.hpp62
-rw-r--r--adw/include/adwaitamm/switchrow.hpp20
-rw-r--r--adw/include/adwaitamm/toast.hpp9
-rw-r--r--adw/include/adwaitamm/toastoverlay.hpp1
7 files changed, 46 insertions, 110 deletions
diff --git a/adw/include/adwaitamm/actionrow.hpp b/adw/include/adwaitamm/actionrow.hpp
index c7ff6c2..5b99ab7 100644
--- a/adw/include/adwaitamm/actionrow.hpp
+++ b/adw/include/adwaitamm/actionrow.hpp
@@ -1,8 +1,8 @@
#ifndef LIBADWAITAMM_ACTION_ROW_HPP
#define LIBADWAITAMM_ACTION_ROW_HPP
-#include "helpers/gobj_mixin.hpp"
#include "adwaitamm/preferencesrow.hpp"
+#include "helpers/gobj_mixin.hpp"
#include <glibmm/class.h>
#include <glibmm/object.h>
@@ -55,9 +55,9 @@ namespace Adwaita
auto static get_type() -> GType;
auto static get_base_type() -> GType;
- auto add_prefix(Gtk::Widget & widget) -> ActionRow &;
- auto add_suffix(Gtk::Widget & widget) -> ActionRow &;
- auto remove(Gtk::Widget & widget) -> ActionRow &;
+ auto add_prefix(Gtk::Widget & widget) -> void;
+ auto add_suffix(Gtk::Widget & widget) -> void;
+ auto remove(Gtk::Widget & widget) -> void;
auto get_activatable_widget() const noexcept -> Glib::RefPtr<Gtk::Widget>;
[[deprecated("replaced by add_prefix")]] auto get_icon_name() const -> Glib::ustring;
@@ -66,19 +66,25 @@ namespace Adwaita
auto get_subtitle_selectable() const noexcept -> bool;
auto get_title_lines() const noexcept -> int;
+ auto set_activatable_widget(Gtk::Widget & widget) noexcept -> void;
+ [[deprecated("replaced by add_prefix")]] auto set_icon_name(Glib::ustring const & name) -> void;
+ auto set_subtitle(Glib::ustring const & subtitle) -> void;
+ auto set_subtitle_lines(int subtitle_lines) noexcept -> void;
+ auto set_subtitle_selectable(bool subtitle_selectable) noexcept -> void;
+ auto set_title_lines(int title_lines) noexcept -> void;
+
auto property_activatable_widget() noexcept -> Glib::PropertyProxy<Gtk::Widget *>;
+ auto property_activatable_widget() const noexcept -> Glib::PropertyProxy_ReadOnly<Gtk::Widget *>;
[[deprecated("replaced by add_prefix")]] auto property_icon_name() noexcept -> Glib::PropertyProxy<Glib::ustring>;
+ [[deprecated("replaced by add_prefix")]] auto property_icon_name() const noexcept -> Glib::PropertyProxy_ReadOnly<Glib::ustring>;
auto property_subtitle() noexcept -> Glib::PropertyProxy<Glib::ustring>;
+ auto property_subtitle() const noexcept -> Glib::PropertyProxy_ReadOnly<Glib::ustring>;
auto property_subtitle_lines() noexcept -> Glib::PropertyProxy<int>;
+ auto property_subtitle_lines() const noexcept -> Glib::PropertyProxy_ReadOnly<int>;
auto property_subtitle_selectable() noexcept -> Glib::PropertyProxy<bool>;
+ auto property_subtitle_selectable() const noexcept -> Glib::PropertyProxy_ReadOnly<bool>;
auto property_title_lines() noexcept -> Glib::PropertyProxy<int>;
-
- auto set_activatable_widget(Gtk::Widget & widget) noexcept -> CppObjectType &;
- [[deprecated("replaced by add_prefix")]] auto set_icon_name(Glib::ustring const & name) -> CppObjectType &;
- auto set_subtitle(Glib::ustring const & subtitle) -> CppObjectType &;
- auto set_subtitle_lines(int subtitle_lines) noexcept -> CppObjectType &;
- auto set_subtitle_selectable(bool subtitle_selectable) noexcept -> CppObjectType &;
- auto set_title_lines(int title_lines) noexcept -> CppObjectType &;
+ auto property_title_lines() const noexcept -> Glib::PropertyProxy_ReadOnly<int>;
protected:
explicit ActionRow(Glib::ConstructParams const & params);
diff --git a/adw/include/adwaitamm/breakpoint.hpp b/adw/include/adwaitamm/breakpoint.hpp
index 529344d..13e9f1e 100644
--- a/adw/include/adwaitamm/breakpoint.hpp
+++ b/adw/include/adwaitamm/breakpoint.hpp
@@ -84,6 +84,7 @@ namespace Adwaita
auto static get_base_type() -> GType;
auto property_condition() -> Glib::PropertyProxy<BreakpointCondition *>;
+ auto property_condition() const -> Glib::PropertyProxy_ReadOnly<BreakpointCondition *>;
protected:
explicit Breakpoint(BreakpointCondition & condition);
diff --git a/adw/include/adwaitamm/helpers/properties.hpp b/adw/include/adwaitamm/helpers/properties.hpp
deleted file mode 100644
index fad99d6..0000000
--- a/adw/include/adwaitamm/helpers/properties.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef LIBADWAITAMM_HELPERS_PROPERTIES_HPP
-#define LIBADWAITAMM_HELPERS_PROPERTIES_HPP
-
-#include <glibmm/propertyproxy.h>
-#include <glibmm/ustring.h>
-
-#include <type_traits>
-
-namespace Adwaita::helpers
-{
-
- template<typename ProxiedType, typename ObjectType>
- struct deduced_property_proxy
- {
- using type = Glib::PropertyProxy<ProxiedType>;
- };
-
- template<typename ProxiedType, typename ObjectType>
- struct deduced_property_proxy<ProxiedType, ObjectType const>
- {
- using type = Glib::PropertyProxy_ReadOnly<ProxiedType>;
- };
-
- template<typename ProxiedType, typename ObjectType>
- using deduced_property_proxy_t = typename deduced_property_proxy<ProxiedType, ObjectType>::type;
-
- template<typename ProxiedType, typename ObjectType>
- auto make_property_proxy(ObjectType && object, char const * property)
- {
- return deduced_property_proxy_t<ProxiedType, std::remove_reference_t<ObjectType>>{&object, property};
- }
-
-} // namespace Adwaita::helpers
-
-#endif \ No newline at end of file
diff --git a/adw/include/adwaitamm/preferencesrow.hpp b/adw/include/adwaitamm/preferencesrow.hpp
index b4fde1e..6c1d6bb 100644
--- a/adw/include/adwaitamm/preferencesrow.hpp
+++ b/adw/include/adwaitamm/preferencesrow.hpp
@@ -2,11 +2,11 @@
#define LIBADWAITAMM_PREFERENCES_ROW_HPP
#include "helpers/gobj_mixin.hpp"
-#include "adwaitamm/helpers/properties.hpp"
#include <glibmm/class.h>
#include <glibmm/object.h>
#include <glibmm/objectbase.h>
+#include <glibmm/propertyproxy.h>
#include <glibmm/refptr.h>
#include <glibmm/ustring.h>
@@ -53,66 +53,30 @@ namespace Adwaita
auto static get_type() -> GType;
auto static get_base_type() -> GType;
- auto get_title(this auto && self);
- auto get_title_selectable(this auto && self) noexcept;
- auto get_use_markup(this auto && self) noexcept;
- auto get_use_underline(this auto && self) noexcept;
+ auto get_title() const -> Glib::ustring;
+ auto get_title_selectable() const noexcept -> bool;
+ auto get_use_markup() const noexcept -> bool;
+ auto get_use_underline() const noexcept -> bool;
auto set_title(Glib::ustring const & title) -> CppObjectType &;
auto set_title_selectable(bool selectable) noexcept -> CppObjectType &;
auto set_use_markup(bool use) noexcept -> CppObjectType &;
auto set_use_underline(bool use) noexcept -> CppObjectType &;
- auto property_title(this auto && self);
- auto property_title_selectable(this auto && self);
- auto property_use_markup(this auto && self);
- auto property_use_underline(this auto && self);
+ auto property_title_selectable() -> Glib::PropertyProxy<bool>;
+ auto property_title_selectable() const -> Glib::PropertyProxy_ReadOnly<bool>;
+ auto property_title() -> Glib::PropertyProxy<Glib::ustring>;
+ auto property_title() const -> Glib::PropertyProxy_ReadOnly<Glib::ustring>;
+ auto property_use_markup() -> Glib::PropertyProxy<bool>;
+ auto property_use_markup() const -> Glib::PropertyProxy_ReadOnly<bool>;
+ auto property_use_underline() -> Glib::PropertyProxy<bool>;
+ auto property_use_underline() const -> Glib::PropertyProxy_ReadOnly<bool>;
protected:
explicit PreferencesRow(Glib::ConstructParams const & params);
explicit PreferencesRow(BaseObjectType * gobj);
};
- auto PreferencesRow::get_title(this auto && self)
- {
- return self.property_title().value();
- }
-
- auto PreferencesRow::get_title_selectable(this auto && self) noexcept
- {
- return self.property_title_selectable().value();
- }
-
- auto PreferencesRow::get_use_markup(this auto && self) noexcept
- {
- return self.property_use_markup().value();
- }
-
- auto PreferencesRow::get_use_underline(this auto && self) noexcept
- {
- return self.property_use_underline().value();
- }
-
- auto PreferencesRow::property_title(this auto && self)
- {
- return helpers::make_property_proxy<Glib::ustring>(self, "title");
- }
-
- auto PreferencesRow::property_title_selectable(this auto && self)
- {
- return helpers::make_property_proxy<bool>(self, "title-selectable");
- }
-
- auto PreferencesRow::property_use_markup(this auto && self)
- {
- return helpers::make_property_proxy<bool>(self, "use-markup");
- }
-
- auto PreferencesRow::property_use_underline(this auto && self)
- {
- return helpers::make_property_proxy<bool>(self, "use-underline");
- }
-
} // namespace Adwaita
namespace Glib
diff --git a/adw/include/adwaitamm/switchrow.hpp b/adw/include/adwaitamm/switchrow.hpp
index 37e2e05..622b58a 100644
--- a/adw/include/adwaitamm/switchrow.hpp
+++ b/adw/include/adwaitamm/switchrow.hpp
@@ -3,11 +3,11 @@
#include "helpers/gobj_mixin.hpp"
#include "adwaitamm/actionrow.hpp"
-#include "adwaitamm/helpers/properties.hpp"
#include <glibmm/class.h>
#include <glibmm/object.h>
#include <glibmm/objectbase.h>
+#include <glibmm/propertyproxy.h>
#include <glibmm/refptr.h>
#include <glibmm/ustring.h>
@@ -57,27 +57,17 @@ namespace Adwaita
auto static get_type() -> GType;
auto static get_base_type() -> GType;
- auto get_active(this auto && self) noexcept;
+ auto get_active() const noexcept -> bool;
+ auto set_active(bool value) noexcept -> void;
- auto get_active(Gtk::Widget & widget) noexcept -> CppObjectType &;
-
- auto property_active(this auto && self);
+ auto property_active() -> Glib::PropertyProxy<bool>;
+ auto property_active() const -> Glib::PropertyProxy_ReadOnly<bool>;
protected:
explicit SwitchRow(Glib::ConstructParams const & params);
explicit SwitchRow(BaseObjectType * gobj);
};
- auto SwitchRow::get_active(this auto && self) noexcept
- {
- return self.property_active().value();
- }
-
- auto SwitchRow::property_active(this auto && self)
- {
- return helpers::make_property_proxy<bool>(self, "active");
- }
-
} // namespace Adwaita
namespace Glib
diff --git a/adw/include/adwaitamm/toast.hpp b/adw/include/adwaitamm/toast.hpp
index ba82497..2c4718b 100644
--- a/adw/include/adwaitamm/toast.hpp
+++ b/adw/include/adwaitamm/toast.hpp
@@ -2,6 +2,7 @@
#define LIBADWAITAMM_TOAST_HPP
#include "adwaitamm/helpers/gobj_mixin.hpp"
+
#include <sigc++/signal.h>
#include <glibmm/object.h>
@@ -80,13 +81,21 @@ namespace Adwaita
auto set_use_markup(bool value) -> void;
auto property_action_name() -> Glib::PropertyProxy<Glib::ustring>;
+ auto property_action_name() const -> Glib::PropertyProxy_ReadOnly<Glib::ustring>;
auto property_action_target() -> Glib::PropertyProxy<Glib::VariantBase>;
+ auto property_action_target() const -> Glib::PropertyProxy_ReadOnly<Glib::VariantBase>;
auto property_button_label() -> Glib::PropertyProxy<Glib::ustring>;
+ auto property_button_label() const -> Glib::PropertyProxy_ReadOnly<Glib::ustring>;
auto property_custom_title() -> Glib::PropertyProxy<Gtk::Widget *>;
+ auto property_custom_title() const -> Glib::PropertyProxy_ReadOnly<Gtk::Widget *>;
auto property_priority() -> Glib::PropertyProxy<ToastPriority>;
+ auto property_priority() const -> Glib::PropertyProxy_ReadOnly<ToastPriority>;
auto property_timeout() -> Glib::PropertyProxy<unsigned>;
+ auto property_timeout() const -> Glib::PropertyProxy_ReadOnly<unsigned>;
auto property_title() -> Glib::PropertyProxy<Glib::ustring>;
+ auto property_title() const -> Glib::PropertyProxy_ReadOnly<Glib::ustring>;
auto property_use_markup() -> Glib::PropertyProxy<bool>;
+ auto property_use_markup() const -> Glib::PropertyProxy_ReadOnly<bool>;
auto signal_button_clicked() -> Glib::SignalProxy<void()>;
auto signal_dismissed() -> Glib::SignalProxy<void()>;
diff --git a/adw/include/adwaitamm/toastoverlay.hpp b/adw/include/adwaitamm/toastoverlay.hpp
index 9872c1b..5e2742d 100644
--- a/adw/include/adwaitamm/toastoverlay.hpp
+++ b/adw/include/adwaitamm/toastoverlay.hpp
@@ -59,6 +59,7 @@ namespace Adwaita
auto set_child(Gtk::Widget & value) -> void;
auto property_child() -> Glib::PropertyProxy<Gtk::Widget *>;
+ auto property_child() const -> Glib::PropertyProxy_ReadOnly<Gtk::Widget *>;
protected:
explicit ToastOverlay(Glib::ConstructParams const & params);
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-19 14:03:55 +0000