diff options
| author | Felix Morgner <felix.morgner@gmail.com> | 2024-08-15 11:25:30 +0200 |
|---|---|---|
| committer | Felix Morgner <felix.morgner@gmail.com> | 2024-08-15 11:25:30 +0200 |
| commit | b6252045a1340a42a39426dfbb877d2a1f357b7f (patch) | |
| tree | 53c78490bc035595f16ca7f8b416f825df952e13 /ui | |
| parent | a2cc1d08fdb5b991e5a47e74e6e534747e330c7c (diff) | |
| download | turns-b6252045a1340a42a39426dfbb877d2a1f357b7f.tar.xz turns-b6252045a1340a42a39426dfbb877d2a1f357b7f.zip | |
adw: add Toast and ToastOverlay classes
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ui/include/turns/ui/windows/tracker.hpp | 4 | ||||
| -rw-r--r-- | ui/src/windows/tracker.cpp | 8 |
3 files changed, 9 insertions, 5 deletions
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt index b0f790d..b3a03c9 100644 --- a/ui/CMakeLists.txt +++ b/ui/CMakeLists.txt @@ -26,9 +26,9 @@ target_include_directories("ui" PUBLIC ) target_link_libraries("ui" PUBLIC + "turns::adw" "turns::core" "turns::lang" - "PkgConfig::adwaita" "PkgConfig::gtkmm" ) diff --git a/ui/include/turns/ui/windows/tracker.hpp b/ui/include/turns/ui/windows/tracker.hpp index 4dd0c7a..7e5f799 100644 --- a/ui/include/turns/ui/windows/tracker.hpp +++ b/ui/include/turns/ui/windows/tracker.hpp @@ -1,6 +1,8 @@ #ifndef TURNS_UI_WINDOWS_TRACKER_HPP #define TURNS_UI_WINDOWS_TRACKER_HPP +#include "turns/adw/toast.hpp" +#include "turns/adw/toastoverlay.hpp" #include "turns/core/turn_order.hpp" #include "turns/ui/widgets/turn_order_view.hpp" @@ -58,7 +60,7 @@ namespace turns::ui::windows Gtk::Revealer * m_controls; Gtk::Widget * m_empty; - Gtk::Widget * m_overlay; + adw::ToastOverlay * m_overlay; Gtk::Stack * m_stack; Gtk::Button * m_start; Gtk::Widget * m_title; diff --git a/ui/src/windows/tracker.cpp b/ui/src/windows/tracker.cpp index 66e241b..0b581af 100644 --- a/ui/src/windows/tracker.cpp +++ b/ui/src/windows/tracker.cpp @@ -1,5 +1,7 @@ #include "turns/ui/windows/tracker.hpp" +#include "turns/adw/toast.hpp" +#include "turns/adw/toastoverlay.hpp" #include "turns/core/turn_order.hpp" #include "turns/lang/messages.hpp" #include "turns/ui/widgets/turn_order_view.hpp" @@ -29,6 +31,7 @@ #include <exception> #include <format> +#include <print> #include <string> namespace turns::ui::windows @@ -38,7 +41,7 @@ namespace turns::ui::windows : Gtk::ApplicationWindow{base} , m_controls{builder->get_widget<Gtk::Revealer>("controls")} , m_empty{builder->get_widget<Gtk::Widget>("empty")} - , m_overlay{builder->get_widget<Gtk::Widget>("overlay")} + , m_overlay{builder->get_widget<adw::ToastOverlay>("overlay")} , m_stack{builder->get_widget<Gtk::Stack>("stack")} , m_start{builder->get_widget<Gtk::Button>("start")} , m_title{builder->get_widget<Gtk::Widget>("title")} @@ -170,8 +173,7 @@ namespace turns::ui::windows auto tracker::show_toast(std::string const & message) -> void { - auto toast = adw_toast_new(message.c_str()); - adw_toast_overlay_add_toast(ADW_TOAST_OVERLAY(m_overlay->gobj()), toast); + m_overlay->add(adw::Toast{message}); } auto tracker::update_subtitle() -> void |