Merge pull request #463 from melix99/melix99/misc-improvements

melix99 · web-flow · commit 07a75f548ad1 · 2023-02-10T23:59:53.000+01:00
General misc improvements
diff --git a/data/resources/style.css b/data/resources/style.css
@@ -128,9 +128,10 @@ sidebarsearchitemrow {
   margin: 0 6px;
 }
 
-.scroll-to-bottom-button {
-  margin: 12px;
-  padding: 3px;
+button.scroll-to-bottom {
+  background-color: @window_bg_color;
+  box-shadow: inset 0 0 0 1px @borders;
+  margin: 6px;
 }
 
 messagebubble {
@@ -265,7 +266,7 @@ messageindicators,
 
 .message-entry > overlay > entry {
   padding: 0 9px;
-  border-radius: 15px;
+  border-radius: 18px;
 }
 
 .message-entry > overlay > entry > scrolledwindow > scrollbar {
diff --git a/data/resources/ui/content-chat-history.ui b/data/resources/ui/content-chat-history.ui
@@ -74,9 +74,9 @@
                           <property name="label" translatable="yes">Scroll to bottom</property>
                         </accessibility>
                         <style>
-                          <class name="osd"/>
                           <class name="circular"/>
-                          <class name="scroll-to-bottom-button"/>
+                          <class name="opaque"/>
+                          <class name="scroll-to-bottom"/>
                         </style>
                       </object>
                     </child>
diff --git a/data/resources/ui/sidebar-row-menu.ui b/data/resources/ui/sidebar-row-menu.ui
@@ -26,5 +26,6 @@
   </menu>
   <object class="GtkPopoverMenu" id="menu">
     <property name="menu-model">model</property>
+    <property name="has-arrow">False</property>
   </object>
 </interface>
diff --git a/data/resources/ui/sidebar-row.ui b/data/resources/ui/sidebar-row.ui
@@ -15,7 +15,7 @@
     <child>
       <object class="GtkGestureLongPress">
         <property name="touch-only">True</property>
-        <signal name="pressed" handler="on_pressed" swapped="true"/>
+        <signal name="pressed" handler="on_long_pressed" swapped="true"/>
       </object>
     </child>
     <child>
diff --git a/src/login.rs b/src/login.rs
@@ -108,20 +108,14 @@ mod imp {
 
         fn class_init(klass: &mut Self::Class) {
             klass.bind_template();
-            klass.install_action("login.previous", None, move |widget, _, _| {
-                spawn(clone!(@weak widget => async move {
-                    widget.previous().await;
-                }));
+            klass.install_action_async("login.previous", None, |widget, _, _| async move {
+                widget.previous().await;
             });
-            klass.install_action("login.next", None, move |widget, _, _| {
-                spawn(clone!(@weak widget => async move {
-                    widget.next().await;
-                }));
+            klass.install_action_async("login.next", None, |widget, _, _| async move {
+                widget.next().await;
             });
-            klass.install_action("login.use-qr-code", None, move |widget, _, _| {
-                spawn(clone!(@weak widget => async move {
-                    widget.request_qr_code().await;
-                }));
+            klass.install_action_async("login.use-qr-code", None, |widget, _, _| async move {
+                widget.request_qr_code().await;
             });
             klass.install_action(
                 "login.go-to-forgot-password-page",
@@ -155,10 +149,8 @@ mod imp {
             klass.install_action("login.show-tos-dialog", None, move |widget, _, _| {
                 widget.show_tos_dialog(false)
             });
-            klass.install_action("login.resend-auth-code", None, move |widget, _, _| {
-                spawn(clone!(@weak widget => async move {
-                    widget.resend_auth_code().await;
-                }));
+            klass.install_action_async("login.resend-auth-code", None, |widget, _, _| async move {
+                widget.resend_auth_code().await;
             });
         }
 
diff --git a/src/session/content/chat_action_bar.rs b/src/session/content/chat_action_bar.rs
@@ -78,11 +78,13 @@ mod imp {
                     widget.cancel_action();
                 },
             );
-            klass.install_action("chat-action-bar.select-file", None, move |widget, _, _| {
-                spawn(clone!(@weak widget => async move {
+            klass.install_action_async(
+                "chat-action-bar.select-file",
+                None,
+                |widget, _, _| async move {
                     widget.select_file().await;
-                }));
-            });
+                },
+            );
             klass.install_action_async(
                 "chat-action-bar.send-message",
                 None,
@@ -94,7 +96,6 @@ mod imp {
                     }
                 },
             );
-
             klass.install_action_async(
                 "chat-action-bar.join-chat",
                 None,
@@ -111,7 +112,6 @@ mod imp {
                     }
                 },
             );
-
             klass.install_action_async(
                 "chat-action-bar.toggle-mute",
                 None,
@@ -125,7 +125,6 @@ mod imp {
                     }
                 },
             );
-
             klass.install_action_async(
                 "chat-action-bar.unblock-chat",
                 None,
@@ -225,8 +224,8 @@ mod imp {
         }
 
         fn dispose(&self) {
-            self.message_entry.unparent();
-            self.send_message_button.unparent();
+            self.top_bar_revealer.unparent();
+            self.action_bar_stack.unparent();
             if let Some(emoji_chooser) = self.emoji_chooser.take() {
                 emoji_chooser.unparent();
             }
diff --git a/src/session/content/chat_history.rs b/src/session/content/chat_history.rs
@@ -20,7 +20,7 @@ mod imp {
     use once_cell::unsync::OnceCell;
     use std::cell::{Cell, RefCell};
 
-    #[derive(Debug, CompositeTemplate)]
+    #[derive(Debug, Default, CompositeTemplate)]
     #[template(resource = "/com/github/melix99/telegrand/ui/content-chat-history.ui")]
     pub(crate) struct ChatHistory {
         pub(super) compact: Cell<bool>,
@@ -38,22 +38,6 @@ mod imp {
         pub(super) chat_action_bar: TemplateChild<ChatActionBar>,
     }
 
-    impl Default for ChatHistory {
-        fn default() -> Self {
-            Self {
-                compact: Default::default(),
-                chat: Default::default(),
-                message_menu: Default::default(),
-                is_auto_scrolling: Default::default(),
-                sticky: Cell::new(false),
-                window_title: Default::default(),
-                scrolled_window: Default::default(),
-                list_view: Default::default(),
-                chat_action_bar: Default::default(),
-            }
-        }
-    }
-
     #[glib::object_subclass]
     impl ObjectSubclass for ChatHistory {
         const NAME: &'static str = "ContentChatHistory";
diff --git a/src/session/content/message_row/video.rs b/src/session/content/message_row/video.rs
@@ -80,13 +80,9 @@ mod imp {
     impl ObjectImpl for MessageVideo {
         fn properties() -> &'static [glib::ParamSpec] {
             static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
-                vec![glib::ParamSpecObject::new(
-                    "message",
-                    "Message",
-                    "The message represented by this row",
-                    Message::static_type(),
-                    glib::ParamFlags::READWRITE | glib::ParamFlags::EXPLICIT_NOTIFY,
-                )]
+                vec![glib::ParamSpecObject::builder::<Message>("message")
+                    .explicit_notify()
+                    .build()]
             });
             PROPERTIES.as_ref()
         }
diff --git a/src/session/content/send_photo_dialog.rs b/src/session/content/send_photo_dialog.rs
@@ -9,7 +9,6 @@ use tdlib::types::{InputFileLocal, InputMessagePhoto};
 use crate::components::MessageEntry;
 use crate::expressions;
 use crate::tdlib::Chat;
-use crate::utils::spawn;
 
 mod imp {
     use super::*;
@@ -40,13 +39,11 @@ mod imp {
         fn class_init(klass: &mut Self::Class) {
             klass.bind_template();
 
-            klass.install_action(
+            klass.install_action_async(
                 "send-photo-dialog.send-message",
                 None,
-                move |widget, _, _| {
-                    spawn(clone!(@weak widget => async move {
-                        widget.send_message().await;
-                    }));
+                |widget, _, _| async move {
+                    widget.send_message().await;
                 },
             );
         }
diff --git a/src/session/mod.rs b/src/session/mod.rs
@@ -76,10 +76,8 @@ mod imp {
                     .leaflet
                     .navigate(adw::NavigationDirection::Back);
             });
-            klass.install_action("session.log-out", None, move |widget, _, _| {
-                spawn(clone!(@weak widget => async move {
-                    log_out(widget.client_id()).await;
-                }));
+            klass.install_action_async("session.log-out", None, |widget, _, _| async move {
+                log_out(widget.client_id()).await;
             });
             klass.install_action("session.show-preferences", None, move |widget, _, _| {
                 let parent_window = widget.root().and_then(|r| r.downcast().ok());
diff --git a/src/session/preferences_window.rs b/src/session/preferences_window.rs
@@ -34,11 +34,13 @@ mod imp {
         fn class_init(klass: &mut Self::Class) {
             klass.bind_template();
 
-            klass.install_action("preferences.clear-cache", None, move |widget, _, _| {
-                spawn(clone!(@weak widget => async move {
+            klass.install_action_async(
+                "preferences.clear-cache",
+                None,
+                |widget, _, _| async move {
                     widget.clear_cache().await;
-                }));
-            });
+                },
+            );
         }
 
         fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
diff --git a/src/session/sidebar/mod.rs b/src/session/sidebar/mod.rs
@@ -148,7 +148,23 @@ mod imp {
         }
     }
 
-    impl WidgetImpl for Sidebar {}
+    impl WidgetImpl for Sidebar {
+        fn direction_changed(&self, previous_direction: gtk::TextDirection) {
+            let obj = self.obj();
+
+            if obj.direction() == previous_direction {
+                return;
+            }
+
+            if let Some(menu) = self.row_menu.get() {
+                menu.set_halign(if obj.direction() == gtk::TextDirection::Rtl {
+                    gtk::Align::End
+                } else {
+                    gtk::Align::Start
+                });
+            }
+        }
+    }
 }
 
 glib::wrapper! {
@@ -169,9 +185,18 @@ impl Sidebar {
 
     pub(crate) fn row_menu(&self) -> &gtk::PopoverMenu {
         self.imp().row_menu.get_or_init(|| {
-            gtk::Builder::from_resource("/com/github/melix99/telegrand/ui/sidebar-row-menu.ui")
-                .object::<gtk::PopoverMenu>("menu")
-                .unwrap()
+            let menu =
+                gtk::Builder::from_resource("/com/github/melix99/telegrand/ui/sidebar-row-menu.ui")
+                    .object::<gtk::PopoverMenu>("menu")
+                    .unwrap();
+
+            menu.set_halign(if self.direction() == gtk::TextDirection::Rtl {
+                gtk::Align::End
+            } else {
+                gtk::Align::Start
+            });
+
+            menu
         })
     }
 
diff --git a/src/session/sidebar/row.rs b/src/session/sidebar/row.rs
@@ -87,15 +87,21 @@ mod imp {
     #[gtk::template_callbacks]
     impl Row {
         #[template_callback]
-        fn on_pressed(&self) {
-            self.show_menu();
+        fn on_pressed(&self, _n_press: i32, x: f64, y: f64) {
+            self.show_menu(x as i32, y as i32);
         }
 
-        fn show_menu(&self) {
+        #[template_callback]
+        fn on_long_pressed(&self, x: f64, y: f64) {
+            self.show_menu(x as i32, y as i32);
+        }
+
+        fn show_menu(&self, x: i32, y: i32) {
             let obj = self.obj();
             let sidebar = obj.ancestor(Sidebar::static_type()).unwrap();
             let menu = sidebar.downcast_ref::<Sidebar>().unwrap().row_menu();
 
+            menu.set_pointing_to(Some(&gdk::Rectangle::new(x, y, 0, 0)));
             menu.unparent();
             menu.set_parent(&*obj);
             menu.popup();
diff --git a/src/session/sidebar/search/mod.rs b/src/session/sidebar/search/mod.rs
@@ -58,21 +58,18 @@ mod imp {
             klass.install_action("sidebar-search.go-back", None, move |widget, _, _| {
                 widget.emit_by_name::<()>("close", &[]);
             });
-            klass.install_action(
+            klass.install_action_async(
                 "sidebar-search.clear-recent-chats",
                 None,
-                move |widget, _, _| {
-                    spawn(clone!(@weak widget => async move {
-                        let session = widget.session().unwrap();
-                        if let Err(e) =
-                            functions::clear_recently_found_chats(session.client_id()).await
-                        {
-                            log::warn!("Failed to clear recently found chats: {:?}", e);
-                        }
+                |widget, _, _| async move {
+                    let session = widget.session().unwrap();
+                    if let Err(e) = functions::clear_recently_found_chats(session.client_id()).await
+                    {
+                        log::warn!("Failed to clear recently found chats: {:?}", e);
+                    }
 
-                        // Update search view
-                        widget.search().await;
-                    }));
+                    // Update search view
+                    widget.search().await;
                 },
             );
         }

Original file line number	Diff line number	Diff line change
`@@ -128,9 +128,10 @@ sidebarsearchitemrow {`
`128`	`128`	`margin: 0 6px;`
`129`	`129`	`}`
`130`	`130`
`131`		`-.scroll-to-bottom-button {`
`132`		`- margin: 12px;`
`133`		`- padding: 3px;`
	`131`	`+button.scroll-to-bottom {`
	`132`	`+ background-color: @window_bg_color;`
	`133`	`+ box-shadow: inset 0 0 0 1px @borders;`
	`134`	`+ margin: 6px;`
`134`	`135`	`}`
`135`	`136`
`136`	`137`	`messagebubble {`
`@@ -265,7 +266,7 @@ messageindicators,`
`265`	`266`
`266`	`267`	`.message-entry > overlay > entry {`
`267`	`268`	`padding: 0 9px;`
`268`		`- border-radius: 15px;`
	`269`	`+ border-radius: 18px;`
`269`	`270`	`}`
`270`	`271`
`271`	`272`	`.message-entry > overlay > entry > scrolledwindow > scrollbar {`