diff options
| -rw-r--r-- | examples/hello-world/hello.cpp | 4 | ||||
| -rw-r--r-- | include/adwaitamm/adwaitamm.hpp | 3 | ||||
| -rw-r--r-- | include/adwaitamm/enums.hpp | 7 | ||||
| -rw-r--r-- | include/adwaitamm/headerbar.hpp | 97 | ||||
| -rw-r--r-- | include/adwaitamm/private/headerbar_p.hpp | 39 | ||||
| -rw-r--r-- | src/enums.cpp | 4 | ||||
| -rw-r--r-- | src/headerbar.cpp | 231 | ||||
| -rw-r--r-- | src/private/headerbar_p.cpp | 42 | ||||
| -rw-r--r-- | src/wrap_init.cpp | 4 |
9 files changed, 430 insertions, 1 deletions
diff --git a/examples/hello-world/hello.cpp b/examples/hello-world/hello.cpp index 5351370..af9123b 100644 --- a/examples/hello-world/hello.cpp +++ b/examples/hello-world/hello.cpp @@ -13,8 +13,12 @@ auto main(int argc, char ** argv) -> int window->set_title("Hello"); auto toolbar_view = Adwaita::ToolbarView{}; + auto header_bar = Adwaita::HeaderBar{}; + auto window_title = Adwaita::WindowTitle{"Hello", "World"}; auto label = Gtk::Label{"Hello World"}; + header_bar.set_title_widget(window_title); + toolbar_view.add_top_bar(header_bar); toolbar_view.set_content(label); window->set_content(toolbar_view); diff --git a/include/adwaitamm/adwaitamm.hpp b/include/adwaitamm/adwaitamm.hpp index 1bee898..6f4e73a 100644 --- a/include/adwaitamm/adwaitamm.hpp +++ b/include/adwaitamm/adwaitamm.hpp @@ -11,6 +11,7 @@ #include <adwaitamm/dialog.hpp> // IWYU pragma: export #include <adwaitamm/entryrow.hpp> // IWYU pragma: export #include <adwaitamm/enums.hpp> // IWYU pragma: export +#include <adwaitamm/headerbar.hpp> // IWYU pragma: export #include <adwaitamm/preferencesdialog.hpp> // IWYU pragma: export #include <adwaitamm/preferencespage.hpp> // IWYU pragma: export #include <adwaitamm/preferencesrow.hpp> // IWYU pragma: export @@ -19,7 +20,7 @@ #include <adwaitamm/switchrow.hpp> // IWYU pragma: export #include <adwaitamm/toast.hpp> // IWYU pragma: export #include <adwaitamm/toastoverlay.hpp> // IWYU pragma: export -#include <adwaitamm/toolbarview.hpp> // IWYU pragma: export +#include <adwaitamm/toolbarview.hpp> // IWYU pragma: export #include <adwaitamm/windowtitle.hpp> // IWYU pragma: export #include <adwaitamm/wrap_init.hpp> // IWYU pragma: export diff --git a/include/adwaitamm/enums.hpp b/include/adwaitamm/enums.hpp index 159b20d..0809a49 100644 --- a/include/adwaitamm/enums.hpp +++ b/include/adwaitamm/enums.hpp @@ -26,6 +26,12 @@ namespace Adwaita Slate, }; + enum struct CenteringPolicy + { + Loose, + Strict, + }; + enum struct ColorScheme { Default, @@ -90,6 +96,7 @@ namespace Glib } VALUE_SPECIALIZATION(AccentColor); + VALUE_SPECIALIZATION(CenteringPolicy); VALUE_SPECIALIZATION(ColorScheme); VALUE_SPECIALIZATION(LengthType); VALUE_SPECIALIZATION(PresentationMode); diff --git a/include/adwaitamm/headerbar.hpp b/include/adwaitamm/headerbar.hpp new file mode 100644 index 0000000..338b189 --- /dev/null +++ b/include/adwaitamm/headerbar.hpp @@ -0,0 +1,97 @@ +/** + * @author Felix Morgner (felix.morgner@gmail.com) + * @copyright Copyright (c) 2025 + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + +#ifndef LIBADWAITAMM_HEADER_BAR_HPP +#define LIBADWAITAMM_HEADER_BAR_HPP + +#include "adwaitamm/enums.hpp" +#include "helpers/gobj_mixin.hpp" + +#include <glibmm/object.h> +#include <glibmm/propertyproxy.h> +#include <glibmm/ustring.h> + +#include <gtkmm/widget.h> + +#include <glib-object.h> + +#define _ADWAITA_INSIDE +#include <adw-header-bar.h> +#undef _ADWAITA_INSIDE + +namespace Adwaita +{ + struct HeaderBar final : Gtk::Widget, + helpers::gobj_mixin<HeaderBar, AdwHeaderBar> + { + + using BaseObjectType = AdwHeaderBar; + using BaseClassType = AdwHeaderBarClass; + using CppObjectType = HeaderBar; + using CppClassType = struct HeaderBar_Class; + + using helpers::gobj_mixin<CppObjectType, BaseObjectType>::gobj; + using helpers::gobj_mixin<CppObjectType, BaseObjectType>::gobj_copy; + + HeaderBar(); + HeaderBar(HeaderBar const & other) = delete; + HeaderBar(HeaderBar && other) noexcept = default; + + auto operator=(HeaderBar const & other) noexcept -> HeaderBar & = delete; + auto operator=(HeaderBar && other) noexcept -> HeaderBar & = default; + + auto static get_type() -> GType; + auto static get_base_type() -> GType; + + auto pack_end(Gtk::Widget & widget) -> void; + auto pack_start(Gtk::Widget & widget) -> void; + auto remove(Gtk::Widget & widget) -> void; + + [[nodiscard]] auto get_centering_policy() -> CenteringPolicy; + [[nodiscard]] auto get_decoration_layout() -> Glib::ustring; + [[nodiscard]] auto get_show_back_button() -> bool; + [[nodiscard]] auto get_show_end_title_buttons() -> bool; + [[nodiscard]] auto get_show_start_title_buttons() -> bool; + [[nodiscard]] auto get_show_title() -> bool; + [[nodiscard]] auto get_title_widget() -> Gtk::Widget *; + + auto set_centering_policy(CenteringPolicy value) -> void; + auto set_decoration_layout(Glib::ustring const & value) -> void; + auto set_show_back_button(bool value) -> void; + auto set_show_end_title_buttons(bool value) -> void; + auto set_show_start_title_buttons(bool value) -> void; + auto set_show_title(bool value) -> void; + auto set_title_widget(Gtk::Widget & value) -> void; + + auto property_centering_policy() -> Glib::PropertyProxy<CenteringPolicy>; + auto property_centering_policy() const -> Glib::PropertyProxy_ReadOnly<CenteringPolicy>; + auto property_decoration_layout() -> Glib::PropertyProxy<Glib::ustring>; + auto property_decoration_layout() const -> Glib::PropertyProxy_ReadOnly<Glib::ustring>; + auto property_show_back_button() -> Glib::PropertyProxy<bool>; + auto property_show_back_button() const -> Glib::PropertyProxy_ReadOnly<bool>; + auto property_show_end_title_buttons() -> Glib::PropertyProxy<bool>; + auto property_show_end_title_buttons() const -> Glib::PropertyProxy_ReadOnly<bool>; + auto property_show_start_title_buttons() -> Glib::PropertyProxy<bool>; + auto property_show_start_title_buttons() const -> Glib::PropertyProxy_ReadOnly<bool>; + auto property_show_title() -> Glib::PropertyProxy<bool>; + auto property_show_title() const -> Glib::PropertyProxy_ReadOnly<bool>; + auto property_title_widget() -> Glib::PropertyProxy<Gtk::Widget *>; + auto property_title_widget() const -> Glib::PropertyProxy_ReadOnly<Gtk::Widget *>; + + protected: + friend HeaderBar_Class; + + explicit HeaderBar(Glib::ConstructParams const & params); + explicit HeaderBar(BaseObjectType * gobj); + }; +} // namespace Adwaita + +namespace Glib +{ + auto wrap(AdwHeaderBar * object, bool copy = false) -> Adwaita::HeaderBar *; +} // namespace Glib + +#endif
\ No newline at end of file diff --git a/include/adwaitamm/private/headerbar_p.hpp b/include/adwaitamm/private/headerbar_p.hpp new file mode 100644 index 0000000..dac73ef --- /dev/null +++ b/include/adwaitamm/private/headerbar_p.hpp @@ -0,0 +1,39 @@ +/** + * @author Felix Morgner (felix.morgner@gmail.com) + * @copyright Copyright (c) 2025 + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + +#ifndef LIBADWAITAMM_PRIVATE_HEADER_BAR_P_HPP +#define LIBADWAITAMM_PRIVATE_HEADER_BAR_P_HPP + +#include <glibmm/class.h> +#include <glibmm/objectbase.h> + +#include <gtkmm/widget.h> + +#define _ADWAITA_INSIDE +#include <adw-header-bar.h> +#undef _ADWAITA_INSIDE + +namespace Adwaita +{ + struct HeaderBar_Class : Glib::Class + { + using BaseClassParent = GtkWidgetClass; + using BaseClassType = AdwHeaderBarClass; + using BaseObjectType = AdwHeaderBar; + using CppClassParent = Gtk::Widget_Class; + using CppObjectType = struct HeaderBar; + + auto init() -> Glib::Class const &; + auto static class_init_function(void * gclass, void * data) -> void; + auto static wrap_new(GObject * object) -> Glib::ObjectBase *; + + protected: + auto static close_attempt(BaseObjectType * self) -> void; + auto static closed(BaseObjectType * self) -> void; + }; +} // namespace Adwaita + +#endif
\ No newline at end of file diff --git a/src/enums.cpp b/src/enums.cpp index 57a6c32..13d515b 100644 --- a/src/enums.cpp +++ b/src/enums.cpp @@ -31,6 +31,9 @@ namespace Adwaita static_assert(matches<AccentColor::Purple, ADW_ACCENT_COLOR_PURPLE>); static_assert(matches<AccentColor::Slate, ADW_ACCENT_COLOR_SLATE>); + static_assert(matches<CenteringPolicy::Loose, ADW_CENTERING_POLICY_LOOSE>); + static_assert(matches<CenteringPolicy::Strict, ADW_CENTERING_POLICY_STRICT>); + static_assert(matches<ColorScheme::Default, ADW_COLOR_SCHEME_DEFAULT>); static_assert(matches<ColorScheme::ForceLight, ADW_COLOR_SCHEME_FORCE_LIGHT>); static_assert(matches<ColorScheme::PreferLight, ADW_COLOR_SCHEME_PREFER_LIGHT>); @@ -71,6 +74,7 @@ namespace Glib } VALUE_SPECIALIZATION(AccentColor, accent_color) + VALUE_SPECIALIZATION(CenteringPolicy, centering_policy) VALUE_SPECIALIZATION(ColorScheme, color_scheme) VALUE_SPECIALIZATION(LengthType, breakpoint_condition) VALUE_SPECIALIZATION(PresentationMode, dialog_presentation_mode) diff --git a/src/headerbar.cpp b/src/headerbar.cpp new file mode 100644 index 0000000..d7eec35 --- /dev/null +++ b/src/headerbar.cpp @@ -0,0 +1,231 @@ +/** + * @author Felix Morgner (felix.morgner@gmail.com) + * @copyright Copyright (c) 2025 + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + +#include "adwaitamm/headerbar.hpp" + +#include "adwaitamm/enums.hpp" +#include "adwaitamm/private/headerbar_p.hpp" + +#include <glibmm/object.h> +#include <glibmm/objectbase.h> +#include <glibmm/propertyproxy.h> +#include <glibmm/ustring.h> +#include <glibmm/wrap.h> + +#include <gtkmm/widget.h> + +#include <glib-object.h> +#include <gtk/gtk.h> + +namespace Adwaita +{ + + namespace + { + auto constinit _class = HeaderBar_Class{}; + + namespace property_name + { + auto constexpr centering_policy = "centering-policy"; + auto constexpr decoration_layout = "decoration-layout"; + auto constexpr show_back_button = "show-back-button"; + auto constexpr show_end_title_buttons = "show-end-title-buttons"; + auto constexpr show_start_title_buttons = "show-start-title-buttons"; + auto constexpr show_title = "show-title"; + auto constexpr title_widget = "title-widget"; + } // namespace property_name + } // namespace + + HeaderBar::HeaderBar() + : Glib::ObjectBase{nullptr} + , Gtk::Widget{Glib::ConstructParams{_class.init()}} + { + } + + auto HeaderBar::get_type() -> GType + { + return _class.init().get_type(); + } + + auto HeaderBar::get_base_type() -> GType + { + return adw_header_bar_get_type(); + } + + auto HeaderBar::pack_end(Gtk::Widget & widget) -> void + { + adw_header_bar_pack_end(unwrap(this), unwrap(&widget)); + } + + auto HeaderBar::pack_start(Gtk::Widget & widget) -> void + { + adw_header_bar_pack_start(unwrap(this), unwrap(&widget)); + } + + auto HeaderBar::remove(Gtk::Widget & widget) -> void + { + adw_header_bar_remove(unwrap(this), unwrap(&widget)); + } + + auto HeaderBar::get_centering_policy() -> CenteringPolicy + { + return static_cast<CenteringPolicy>(adw_header_bar_get_centering_policy(const_cast<BaseObjectType *>(unwrap(this)))); + } + + auto HeaderBar::get_decoration_layout() -> Glib::ustring + { + return adw_header_bar_get_decoration_layout(const_cast<BaseObjectType *>(unwrap(this))); + } + + auto HeaderBar::get_show_back_button() -> bool + { + return adw_header_bar_get_show_back_button(const_cast<BaseObjectType *>(unwrap(this))); + } + + auto HeaderBar::get_show_end_title_buttons() -> bool + { + return adw_header_bar_get_show_end_title_buttons(const_cast<BaseObjectType *>(unwrap(this))); + } + + auto HeaderBar::get_show_start_title_buttons() -> bool + { + return adw_header_bar_get_show_start_title_buttons(const_cast<BaseObjectType *>(unwrap(this))); + } + + auto HeaderBar::get_show_title() -> bool + { + return adw_header_bar_get_show_title(const_cast<BaseObjectType *>(unwrap(this))); + } + + auto HeaderBar::get_title_widget() -> Gtk::Widget * + { + return Glib::wrap(adw_header_bar_get_title_widget(const_cast<BaseObjectType *>(unwrap(this)))); + } + + auto HeaderBar::set_centering_policy(CenteringPolicy value) -> void + { + return adw_header_bar_set_centering_policy(unwrap(this), static_cast<AdwCenteringPolicy>(value)); + } + + auto HeaderBar::set_decoration_layout(Glib::ustring const & value) -> void + { + return adw_header_bar_set_decoration_layout(unwrap(this), value.c_str()); + } + + auto HeaderBar::set_show_back_button(bool value) -> void + { + return adw_header_bar_set_show_back_button(unwrap(this), value); + } + + auto HeaderBar::set_show_end_title_buttons(bool value) -> void + { + return adw_header_bar_set_show_end_title_buttons(unwrap(this), value); + } + + auto HeaderBar::set_show_start_title_buttons(bool value) -> void + { + return adw_header_bar_set_show_start_title_buttons(unwrap(this), value); + } + + auto HeaderBar::set_show_title(bool value) -> void + { + return adw_header_bar_set_show_title(unwrap(this), value); + } + + auto HeaderBar::set_title_widget(Gtk::Widget & value) -> void + { + return adw_header_bar_set_title_widget(unwrap(this), unwrap(&value)); + } + + auto HeaderBar::property_centering_policy() -> Glib::PropertyProxy<CenteringPolicy> + { + return {this, property_name::centering_policy}; + } + + auto HeaderBar::property_centering_policy() const -> Glib::PropertyProxy_ReadOnly<CenteringPolicy> + { + return {this, property_name::centering_policy}; + } + + auto HeaderBar::property_decoration_layout() -> Glib::PropertyProxy<Glib::ustring> + { + return {this, property_name::decoration_layout}; + } + + auto HeaderBar::property_decoration_layout() const -> Glib::PropertyProxy_ReadOnly<Glib::ustring> + { + return {this, property_name::decoration_layout}; + } + + auto HeaderBar::property_show_back_button() -> Glib::PropertyProxy<bool> + { + return {this, property_name::show_back_button}; + } + + auto HeaderBar::property_show_back_button() const -> Glib::PropertyProxy_ReadOnly<bool> + { + return {this, property_name::show_back_button}; + } + + auto HeaderBar::property_show_end_title_buttons() -> Glib::PropertyProxy<bool> + { + return {this, property_name::show_end_title_buttons}; + } + + auto HeaderBar::property_show_end_title_buttons() const -> Glib::PropertyProxy_ReadOnly<bool> + { + return {this, property_name::show_end_title_buttons}; + } + + auto HeaderBar::property_show_start_title_buttons() -> Glib::PropertyProxy<bool> + { + return {this, property_name::show_start_title_buttons}; + } + + auto HeaderBar::property_show_start_title_buttons() const -> Glib::PropertyProxy_ReadOnly<bool> + { + return {this, property_name::show_start_title_buttons}; + } + + auto HeaderBar::property_show_title() -> Glib::PropertyProxy<bool> + { + return {this, property_name::show_title}; + } + + auto HeaderBar::property_show_title() const -> Glib::PropertyProxy_ReadOnly<bool> + { + return {this, property_name::show_title}; + } + + auto HeaderBar::property_title_widget() -> Glib::PropertyProxy<Gtk::Widget *> + { + return {this, property_name::title_widget}; + } + + auto HeaderBar::property_title_widget() const -> Glib::PropertyProxy_ReadOnly<Gtk::Widget *> + { + return {this, property_name::title_widget}; + } + + HeaderBar::HeaderBar(Glib::ConstructParams const & params) + : Gtk::Widget{params} + { + } + + HeaderBar::HeaderBar(BaseObjectType * gobj) + : Gtk::Widget(GTK_WIDGET(gobj)) + { + } + +} // namespace Adwaita + +namespace Glib +{ + auto wrap(AdwHeaderBar * object, bool copy) -> Adwaita::HeaderBar * + { + return dynamic_cast<Adwaita::HeaderBar *>(Glib::wrap_auto(G_OBJECT(object), copy)); + } +} // namespace Glib
\ No newline at end of file diff --git a/src/private/headerbar_p.cpp b/src/private/headerbar_p.cpp new file mode 100644 index 0000000..00e774a --- /dev/null +++ b/src/private/headerbar_p.cpp @@ -0,0 +1,42 @@ +/** + * @author Felix Morgner (felix.morgner@gmail.com) + * @copyright Copyright (c) 2025 + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + +#include "adwaitamm/private/headerbar_p.hpp" + +#include "adwaitamm/headerbar.hpp" + +#include <glibmm/class.h> +#include <glibmm/object.h> +#include <glibmm/objectbase.h> + +#include <gtkmm/object.h> +#include <gtkmm/private/widget_p.h> + +namespace Adwaita +{ + + auto HeaderBar_Class::init() -> Glib::Class const & + { + if (!gtype_) + { + class_init_func_ = &class_init_function; + gtype_ = adw_header_bar_get_type(); + } + return *this; + } + + auto HeaderBar_Class::class_init_function(void * gclass, void * data) -> void + { + auto const klass = static_cast<BaseClassType *>(gclass); + CppClassParent::class_init_function(klass, data); + } + + auto HeaderBar_Class::wrap_new(GObject * object) -> Glib::ObjectBase * + { + return Gtk::manage(new HeaderBar(ADW_HEADER_BAR(object))); + } + +} // namespace Adwaita
\ No newline at end of file diff --git a/src/wrap_init.cpp b/src/wrap_init.cpp index 1e3195c..a8adf08 100644 --- a/src/wrap_init.cpp +++ b/src/wrap_init.cpp @@ -15,6 +15,7 @@ #include "adwaitamm/comborow.hpp" #include "adwaitamm/dialog.hpp" #include "adwaitamm/entryrow.hpp" +#include "adwaitamm/headerbar.hpp" #include "adwaitamm/preferencesdialog.hpp" #include "adwaitamm/preferencespage.hpp" #include "adwaitamm/preferencesrow.hpp" @@ -27,6 +28,7 @@ #include "adwaitamm/private/comborow_p.hpp" // IWYU pragma: keep - required for gobj class definition. #include "adwaitamm/private/dialog_p.hpp" // IWYU pragma: keep - required for gobj class definition. #include "adwaitamm/private/entryrow_p.hpp" // IWYU pragma: keep - required for gobj class definition. +#include "adwaitamm/private/headerbar_p.hpp" // IWYU pragma: keep - required for gobj class definition. #include "adwaitamm/private/preferencesdialog_p.hpp" // IWYU pragma: keep - required for gobj class definition. #include "adwaitamm/private/preferencespage_p.hpp" // IWYU pragma: keep - required for gobj class definition. #include "adwaitamm/private/preferencesrow_p.hpp" // IWYU pragma: keep - required for gobj class definition. @@ -66,6 +68,7 @@ namespace Adwaita WRAP_CLASS(ComboRow, combo_row); WRAP_CLASS(Dialog, dialog); WRAP_CLASS(EntryRow, entry_row); + WRAP_CLASS(HeaderBar, header_bar); WRAP_CLASS(PreferencesDialog, preferences_dialog); WRAP_CLASS(PreferencesPage, preferences_page); WRAP_CLASS(PreferencesRow, preferences_row); @@ -86,6 +89,7 @@ namespace Adwaita ENSURE_TYPE(ComboRow); ENSURE_TYPE(Dialog); ENSURE_TYPE(EntryRow); + ENSURE_TYPE(HeaderBar); ENSURE_TYPE(PreferencesDialog); ENSURE_TYPE(PreferencesPage); ENSURE_TYPE(PreferencesRow); |
