GNOME sdk 48, fix narrow text view

Author: ranfdev

build-aux/com.ranfdev.Geopard.Devel.json

@@ -1,11 +1,11 @@
 {
     "app-id" : "com.ranfdev.Geopard.Devel",
     "runtime" : "org.gnome.Platform",
-    "runtime-version" : "47",
+    "runtime-version" : "48",
     "sdk" : "org.gnome.Sdk",
     "sdk-extensions" : [
         "org.freedesktop.Sdk.Extension.rust-stable",
-        "org.freedesktop.Sdk.Extension.llvm18"
+        "org.freedesktop.Sdk.Extension.llvm19"
     ],
     "command" : "geopard",
     "tags" : [
@@ -20,7 +20,7 @@
         "--filesystem=xdg-download"
     ],
     "build-options" : {
-        "append-path" : "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm18/bin",
+        "append-path" : "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm19/bin",
         "build-args" : [
             "--share=network"
         ],

data/resources/ui/tab.blp

@@ -7,7 +7,6 @@ template $Tab: Adw.Bin {
       vexpand: true;
 
       Adw.ClampScrollable clamp {
-        halign: center;
         maximum-size: 768;
         tightening-threshold: 720;
       }

src/common/mod.rs

@@ -1,4 +1,4 @@
-use gtk::{glib, gio};
+use gtk::{gio, glib};
 use once_cell::sync::Lazy;
 use url::Url;
 
@@ -68,9 +68,13 @@ pub fn open_uri_externally(uri: &str) {
 
 pub fn open_file_externally(path: &std::path::Path) {
     let file = gio::File::for_path(path);
-    gtk::FileLauncher::new(Some(&file)).launch(None::<&gtk::Window>, None::<&gio::Cancellable>, |res| {
-        if let Err(e) = res {
-            log::error!("error opening external file {:?}", e);
-        }
-    });
+    gtk::FileLauncher::new(Some(&file)).launch(
+        None::<&gtk::Window>,
+        None::<&gio::Cancellable>,
+        |res| {
+            if let Err(e) = res {
+                log::error!("error opening external file {:?}", e);
+            }
+        },
+    );
 }

src/macros.rs

@@ -1,14 +1,16 @@
 #[macro_export]
 macro_rules! self_action {
-    ($self:ident, $name:literal, $method:ident) => {
-        {
-            let this = &$self;
-            let action = gio::SimpleAction::new($name, None);
-            action.connect_activate(clone!(#[weak] this, move |_,_| this.$method()));
-            $self.add_action(&action);
-            action
-        }
-    }
+    ($self:ident, $name:literal, $method:ident) => {{
+        let this = &$self;
+        let action = gio::SimpleAction::new($name, None);
+        action.connect_activate(clone!(
+            #[weak]
+            this,
+            move |_, _| this.$method()
+        ));
+        $self.add_action(&action);
+        action
+    }};
 }
 
 #[macro_export]

src/widgets/pages/hypertext.rs

@@ -236,25 +236,33 @@ impl Hypertext {
         let right_click_ctrl = gtk::GestureClick::builder().button(3).build();
         let motion_ctrl = gtk::EventControllerMotion::new();
 
-        left_click_ctrl.connect_released(
-            clone!(#[strong] this, move |ctrl, _n_press, x, y| {
+        left_click_ctrl.connect_released(clone!(
+            #[strong]
+            this,
+            move |ctrl, _n_press, x, y| {
                 if let Err(e) = this.handle_click(ctrl, x, y) {
                     log::info!("{}", e);
                 };
-            }),
-        );
+            }
+        ));
 
-        right_click_ctrl.connect_pressed(
-            clone!(#[strong] this, move |_ctrl, _n_press, x, y| {
+        right_click_ctrl.connect_pressed(clone!(
+            #[strong]
+            this,
+            move |_ctrl, _n_press, x, y| {
                 if let Err(e) = this.handle_right_click(x, y) {
                     log::info!("{}", e);
                 };
-            }),
-        );
+            }
+        ));
 
-        motion_ctrl.connect_motion(clone!(#[strong] this, move |_ctrl, x, y|  {
-            let _ = this.handle_motion(x, y);
-        }));
+        motion_ctrl.connect_motion(clone!(
+            #[strong]
+            this,
+            move |_ctrl, x, y| {
+                let _ = this.handle_motion(x, y);
+            }
+        ));
 
         text_view.add_controller(left_click_ctrl);
         text_view.add_controller(right_click_ctrl);

src/widgets/tab.rs

@@ -22,7 +22,7 @@ use url::Url;
 
 use super::pages::{self, hypertext};
 use crate::common;
-use crate::common::{glibctx, open_uri_externally, open_file_externally};
+use crate::common::{glibctx, open_file_externally, open_uri_externally};
 use crate::lossy_text_read::*;
 use crate::session_provider::SessionProvider;
 
@@ -615,16 +615,21 @@ impl Tab {
         p.connect_local(
             "open",
             false,
-            clone!(#[weak(rename_to = this)] self, #[upgrade_or_panic] move |s| {
-                let s: String = s[1].get().unwrap();
-                let url = Url::parse(&s);
-                if let Ok(url) = url {
-                    this.spawn_open_url(url);
-                } else {
-                    log::error!("Invalid url {:?}", url);
+            clone!(
+                #[weak(rename_to = this)]
+                self,
+                #[upgrade_or_panic]
+                move |s| {
+                    let s: String = s[1].get().unwrap();
+                    let url = Url::parse(&s);
+                    if let Ok(url) = url {
+                        this.spawn_open_url(url);
+                    } else {
+                        log::error!("Invalid url {:?}", url);
+                    }
+                    None
                 }
-                None
-            }),
+            ),
         );
         p
     }
@@ -705,12 +710,18 @@ impl Tab {
         p.set_icon_name(Some("dialog-error-symbolic"));
 
         let override_btn = gtk::Button::with_label("Trust New Certificate");
-        override_btn.connect_clicked(clone!(#[weak(rename_to = this)] self, move |_| {
-            let url = Url::parse(&this.url()).unwrap();
-
-            this.session().validator().remove_known(url.host_str().unwrap());
-            this.reload();
-        }));
+        override_btn.connect_clicked(clone!(
+            #[weak(rename_to = this)]
+            self,
+            move |_| {
+                let url = Url::parse(&this.url()).unwrap();
+
+                this.session()
+                    .validator()
+                    .remove_known(url.host_str().unwrap());
+                this.reload();
+            }
+        ));
         override_btn.set_halign(gtk::Align::Center);
         override_btn.add_css_class("destructive-action");
         override_btn.add_css_class("pill");
@@ -733,12 +744,18 @@ impl Tab {
         p.set_icon_name(Some("dialog-error-symbolic"));
 
         let override_btn = gtk::Button::with_label("Continue");
-        override_btn.connect_clicked(clone!(#[weak(rename_to = this)] self, move |_| {
-            let url = Url::parse(&this.url()).unwrap();
-
-            this.session().validator().override_trust(url.host_str().unwrap());
-            this.reload();
-        }));
+        override_btn.connect_clicked(clone!(
+            #[weak(rename_to = this)]
+            self,
+            move |_| {
+                let url = Url::parse(&this.url()).unwrap();
+
+                this.session()
+                    .validator()
+                    .override_trust(url.host_str().unwrap());
+                this.reload();
+            }
+        ));
         override_btn.set_halign(gtk::Align::Center);
         override_btn.add_css_class("destructive-action");
         override_btn.add_css_class("pill");