Add zoom shortcuts hints, reset zoom, zoom range

Author: ranfdev

data/resources/ui/shortcuts.blp

@@ -66,6 +66,22 @@ Gtk.ShortcutsWindow help_overlay {
         action-name: "win.show-bookmarks";
       }
     }
+    Gtk.ShortcutsGroup {
+      title: C_("shortcut window", "Zoom");
+
+      Gtk.ShortcutsShortcut {
+        title: C_("shortcut window", "Zoom In");
+        action-name: "win.zoom-in";
+      }
+      Gtk.ShortcutsShortcut {
+        title: C_("shortcut window", "Zoom Out");
+        action-name: "win.zoom-out";
+      }
+      Gtk.ShortcutsShortcut {
+        title: C_("shortcut window", "Reset Zoom");
+        action-name: "win.reset-zoom";
+      }
+    }
   }
 }
 

src/main.rs

@@ -97,6 +97,7 @@ fn main() {
     application.set_accels_for_action("win.focus-url-bar", &["F6"]);
     application.set_accels_for_action("win.zoom-in", &["<Ctrl>plus"]);
     application.set_accels_for_action("win.zoom-out", &["<Ctrl>minus"]);
+    application.set_accels_for_action("win.reset-zoom", &["<Ctrl>0"]);
     // Sadly Tab doesn't work as an accelerator in gtk...
     application.set_accels_for_action("win.focus-next-tab", &["<Ctrl>Tab"]);
     application.set_accels_for_action("win.focus-previous-tab", &["<Ctrl><Shift>Tab"]);

src/widgets/window.rs

@@ -21,6 +21,8 @@ use crate::self_action;
 use crate::widgets::tab::{HistoryStatus, Tab};
 
 const ZOOM_CHANGE_FACTOR: f32 = 1.15;
+const ZOOM_MAX_FACTOR: f32 = 5.0;
+
 #[derive(Debug, Clone, Default)]
 pub(crate) struct Zoom {
     value: f32,
@@ -58,7 +60,6 @@ pub mod imp {
         pub(crate) action_previous: RefCell<Option<gio::SimpleAction>>,
         pub(crate) action_next: RefCell<Option<gio::SimpleAction>>,
         pub(crate) style_provider: RefCell<gtk::CssProvider>,
-
         #[property(get = Self::zoom, set = Self::set_zoom, type = f32, member = value)]
         pub(crate) zoom: RefCell<Zoom>,
     }
@@ -98,7 +99,7 @@ pub mod imp {
         }
         fn set_zoom(&self, v: f32) {
             let Zoom { value, provider } = &mut *self.zoom.borrow_mut();
-            *value = v;
+            *value = v.clamp(1.0 / ZOOM_MAX_FACTOR, ZOOM_MAX_FACTOR);
             provider.load_from_data(
                 format!(
                     "textview {{
@@ -200,6 +201,7 @@ impl Window {
         self_action!(self, "donate", donate);
         self_action!(self, "zoom-in", zoom_in);
         self_action!(self, "zoom-out", zoom_out);
+        self_action!(self, "reset-zoom", reset_zoom);
 
         let act_open_page = gio::SimpleAction::new("open-omni", Some(glib::VariantTy::STRING));
         act_open_page.connect_activate(
@@ -227,6 +229,7 @@ impl Window {
         );
         self.add_action(&act_set_clipboard);
 
+        // Signals
         self.add_controller(&imp.scroll_ctrl);
         imp.scroll_ctrl
             .set_propagation_phase(gtk::PropagationPhase::Capture);
@@ -516,4 +519,7 @@ impl Window {
     fn zoom_out(&self) {
         self.set_zoom(&(self.zoom() * 1.0 / ZOOM_CHANGE_FACTOR));
     }
+    fn reset_zoom(&self) {
+        self.set_zoom(&1.0);
+    }
 }