From 6bf5280f421fa5c92736494d6fcb192c474a5fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Fri, 17 Nov 2023 13:04:29 +0100 Subject: [PATCH] room-creation: Use ToastableWindow --- src/session/view/room_creation.rs | 15 +- src/session/view/room_creation.ui | 342 +++++++++++++++--------------- 2 files changed, 177 insertions(+), 180 deletions(-) diff --git a/src/session/view/room_creation.rs b/src/session/view/room_creation.rs index 879dd973..99f9b5ba 100644 --- a/src/session/view/room_creation.rs +++ b/src/session/view/room_creation.rs @@ -15,7 +15,10 @@ use ruma::events::{room::encryption::RoomEncryptionEventContent, InitialStateEve use tracing::error; use crate::{ - components::SpinnerButton, prelude::*, session::model::Session, spawn, spawn_tokio, Window, + components::{SpinnerButton, ToastableWindow}, + prelude::*, + session::model::Session, + spawn, spawn_tokio, toast, Window, }; // MAX length of room addresses @@ -31,8 +34,6 @@ mod imp { pub struct RoomCreation { pub session: WeakRef, #[template_child] - pub toast_overlay: TemplateChild, - #[template_child] pub create_button: TemplateChild, #[template_child] pub content: TemplateChild, @@ -58,7 +59,7 @@ mod imp { impl ObjectSubclass for RoomCreation { const NAME: &'static str = "RoomCreation"; type Type = super::RoomCreation; - type ParentType = adw::Window; + type ParentType = ToastableWindow; fn class_init(klass: &mut Self::Class) { Self::bind_template(klass); @@ -110,12 +111,13 @@ mod imp { impl WidgetImpl for RoomCreation {} impl WindowImpl for RoomCreation {} impl AdwWindowImpl for RoomCreation {} + impl ToastableWindowImpl for RoomCreation {} } glib::wrapper! { /// Preference Window to display and update room details. pub struct RoomCreation(ObjectSubclass) - @extends gtk::Widget, gtk::Window, adw::Window, @implements gtk::Accessible; + @extends gtk::Widget, gtk::Window, adw::Window, ToastableWindow, @implements gtk::Accessible; } #[gtk::template_callbacks] @@ -236,8 +238,7 @@ impl RoomCreation { } } - imp.toast_overlay - .add_toast(adw::Toast::new(&error.to_user_facing())); + toast!(self, error.to_user_facing()); } /// Check whether a room can be created with the current input. diff --git a/src/session/view/room_creation.ui b/src/session/view/room_creation.ui index a08ceda4..59fde852 100644 --- a/src/session/view/room_creation.ui +++ b/src/session/view/room_creation.ui @@ -1,178 +1,95 @@ -