@bobfrankston/msger 0.1.149 → 0.1.151

package/msger-native/src/main.rs

@@ -32,13 +32,33 @@ use windows::core::PCWSTR;
 #[cfg(windows)]
 use std::sync::atomic::{AtomicBool, Ordering};
 
-// Custom menu ID for About item (must be < 0xF000 to avoid conflicts with system commands)
+// Custom menu IDs (must be < 0xF000 to avoid conflicts with system commands)
 #[cfg(windows)]
 const IDM_ABOUT: u32 = 0x1000;
+#[cfg(windows)]
+const IDM_ZOOM_IN: u32 = 0x1001;
+#[cfg(windows)]
+const IDM_ZOOM_OUT: u32 = 0x1002;
+#[cfg(windows)]
+const IDM_ZOOM_RESET: u32 = 0x1003;
+#[cfg(windows)]
+const IDM_ZOOM_50: u32 = 0x1010;
+#[cfg(windows)]
+const IDM_ZOOM_75: u32 = 0x1011;
+#[cfg(windows)]
+const IDM_ZOOM_100: u32 = 0x1012;
+#[cfg(windows)]
+const IDM_ZOOM_125: u32 = 0x1013;
+#[cfg(windows)]
+const IDM_ZOOM_150: u32 = 0x1014;
+#[cfg(windows)]
+const IDM_ZOOM_200: u32 = 0x1015;
 
-// Global flag to signal About menu was clicked
+// Global flags
 #[cfg(windows)]
 static ABOUT_CLICKED: AtomicBool = AtomicBool::new(false);
+#[cfg(windows)]
+static ZOOM_ACTION: std::sync::atomic::AtomicI32 = std::sync::atomic::AtomicI32::new(0);
 
 // Window subclass procedure to intercept WM_SYSCOMMAND
 #[cfg(windows)]
@@ -52,10 +72,48 @@ unsafe extern "system" fn subclass_proc(
 ) -> LRESULT {
     if msg == WM_SYSCOMMAND {
         let cmd = wparam.0 & 0xFFF0;
-        if cmd == IDM_ABOUT as usize {
-            // Set flag that About was clicked
-            ABOUT_CLICKED.store(true, Ordering::SeqCst);
-            return LRESULT(0);
+        match cmd as u32 {
+            IDM_ABOUT => {
+                ABOUT_CLICKED.store(true, Ordering::SeqCst);
+                return LRESULT(0);
+            }
+            IDM_ZOOM_IN => {
+                ZOOM_ACTION.store(1, Ordering::SeqCst); // Zoom in
+                return LRESULT(0);
+            }
+            IDM_ZOOM_OUT => {
+                ZOOM_ACTION.store(2, Ordering::SeqCst); // Zoom out
+                return LRESULT(0);
+            }
+            IDM_ZOOM_RESET => {
+                ZOOM_ACTION.store(100, Ordering::SeqCst); // Reset to 100%
+                return LRESULT(0);
+            }
+            IDM_ZOOM_50 => {
+                ZOOM_ACTION.store(50, Ordering::SeqCst);
+                return LRESULT(0);
+            }
+            IDM_ZOOM_75 => {
+                ZOOM_ACTION.store(75, Ordering::SeqCst);
+                return LRESULT(0);
+            }
+            IDM_ZOOM_100 => {
+                ZOOM_ACTION.store(100, Ordering::SeqCst);
+                return LRESULT(0);
+            }
+            IDM_ZOOM_125 => {
+                ZOOM_ACTION.store(125, Ordering::SeqCst);
+                return LRESULT(0);
+            }
+            IDM_ZOOM_150 => {
+                ZOOM_ACTION.store(150, Ordering::SeqCst);
+                return LRESULT(0);
+            }
+            IDM_ZOOM_200 => {
+                ZOOM_ACTION.store(200, Ordering::SeqCst);
+                return LRESULT(0);
+            }
+            _ => {}
         }
     }
     DefSubclassProc(hwnd, msg, wparam, lparam)
@@ -389,8 +447,22 @@ fn main() {
     let icon = if let Some(ref icon_path) = options.icon {
         load_icon(icon_path)
     } else {
-        // Try default icon.png in current directory
-        load_icon("icon.png")
+        // Try default msger.png next to the binary
+        if let Ok(exe_path) = std::env::current_exe() {
+            if let Some(exe_dir) = exe_path.parent() {
+                let default_icon = exe_dir.join("msger.png");
+                if default_icon.exists() {
+                    load_icon(default_icon.to_str().unwrap_or("msger.png"))
+                } else {
+                    // Fallback to msger.png in current directory
+                    load_icon("msger.png")
+                }
+            } else {
+                load_icon("msger.png")
+            }
+        } else {
+            load_icon("msger.png")
+        }
     };
 
     let mut window_builder = WindowBuilder::new()
@@ -434,9 +506,45 @@ fn main() {
         if !hmenu.is_invalid() {
             // Add separator
             AppendMenuW(hmenu, MF_SEPARATOR, 0, PCWSTR::null()).ok();
+            
             // Add About item
-            let about_text: Vec<u16> = "About (Window Info)\0".encode_utf16().collect();
+            let about_text: Vec<u16> = "About msger (Window Info)\0".encode_utf16().collect();
             AppendMenuW(hmenu, MF_STRING, IDM_ABOUT as usize, PCWSTR(about_text.as_ptr())).ok();
+            
+            // Add another separator
+            AppendMenuW(hmenu, MF_SEPARATOR, 0, PCWSTR::null()).ok();
+            
+            // Add Zoom controls
+            let zoom_in: Vec<u16> = "Zoom In\tCtrl++\0".encode_utf16().collect();
+            AppendMenuW(hmenu, MF_STRING, IDM_ZOOM_IN as usize, PCWSTR(zoom_in.as_ptr())).ok();
+            
+            let zoom_out: Vec<u16> = "Zoom Out\tCtrl+-\0".encode_utf16().collect();
+            AppendMenuW(hmenu, MF_STRING, IDM_ZOOM_OUT as usize, PCWSTR(zoom_out.as_ptr())).ok();
+            
+            let zoom_reset: Vec<u16> = "Reset Zoom\tCtrl+0\0".encode_utf16().collect();
+            AppendMenuW(hmenu, MF_STRING, IDM_ZOOM_RESET as usize, PCWSTR(zoom_reset.as_ptr())).ok();
+            
+            // Add separator before preset zooms
+            AppendMenuW(hmenu, MF_SEPARATOR, 0, PCWSTR::null()).ok();
+            
+            // Add preset zoom levels
+            let zoom_50: Vec<u16> = "Zoom 50%\0".encode_utf16().collect();
+            AppendMenuW(hmenu, MF_STRING, IDM_ZOOM_50 as usize, PCWSTR(zoom_50.as_ptr())).ok();
+            
+            let zoom_75: Vec<u16> = "Zoom 75%\0".encode_utf16().collect();
+            AppendMenuW(hmenu, MF_STRING, IDM_ZOOM_75 as usize, PCWSTR(zoom_75.as_ptr())).ok();
+            
+            let zoom_100: Vec<u16> = "Zoom 100%\0".encode_utf16().collect();
+            AppendMenuW(hmenu, MF_STRING, IDM_ZOOM_100 as usize, PCWSTR(zoom_100.as_ptr())).ok();
+            
+            let zoom_125: Vec<u16> = "Zoom 125%\0".encode_utf16().collect();
+            AppendMenuW(hmenu, MF_STRING, IDM_ZOOM_125 as usize, PCWSTR(zoom_125.as_ptr())).ok();
+            
+            let zoom_150: Vec<u16> = "Zoom 150%\0".encode_utf16().collect();
+            AppendMenuW(hmenu, MF_STRING, IDM_ZOOM_150 as usize, PCWSTR(zoom_150.as_ptr())).ok();
+            
+            let zoom_200: Vec<u16> = "Zoom 200%\0".encode_utf16().collect();
+            AppendMenuW(hmenu, MF_STRING, IDM_ZOOM_200 as usize, PCWSTR(zoom_200.as_ptr())).ok();
         }
         // Install window subclass to intercept WM_SYSCOMMAND
         let _ = SetWindowSubclass(hwnd, Some(subclass_proc), 1, 0).ok();
@@ -696,6 +804,13 @@ fn main() {
         // Check for About menu click
         #[cfg(windows)]
         if ABOUT_CLICKED.swap(false, Ordering::SeqCst) {
+            // Get current zoom from the page
+            let zoom_script = "document.body.style.zoom || '100%'";
+            let current_zoom = match webview.evaluate_script(zoom_script) {
+                Ok(_) => "100%".to_string(), // Default if can't get it
+                Err(_) => "100%".to_string(),
+            };
+            
             // Get window information
             let position = window_clone.outer_position().unwrap_or_default();
             let inner_size = window_clone.inner_size();
@@ -712,27 +827,29 @@ fn main() {
             let logical_outer_height = (outer_size.height as f64 / scale_factor) as i32;
 
             let info = format!(
-                "Window Information\\n\\n\
-                Position: x={}, y={}\\n\\n\
+                "msger v{}\\n\\n\
+                Rust/wry-based message viewer\\n\\n\
+                Position: x={}, y={}\\n\
                 Logical Size (API): {}x{} inner\\n\
                 Physical Size (Screen): {}x{} inner\\n\
                 Outer Size (Physical): {}x{}\\n\
                 Outer Size (Logical): {}x{}\\n\\n\
+                Current Zoom: {}\\n\
                 Scale Factor: {:.2} ({}% DPI)\\n\
                 Maximized: {}\\n\
                 Fullscreen: {}\\n\
-                Always On Top: {}\\n\\n\
-                Version: {}",
+                Always On Top: {}",
+                get_package_version().unwrap_or_else(|| "unknown".to_string()),
                 position.x, position.y,
                 logical_inner_width, logical_inner_height,
                 inner_size.width, inner_size.height,
                 outer_size.width, outer_size.height,
                 logical_outer_width, logical_outer_height,
+                current_zoom,
                 scale_factor, (scale_factor * 100.0) as i32,
                 is_maximized,
                 is_fullscreen,
-                is_always_on_top,
-                get_package_version().unwrap_or_else(|| "unknown".to_string())
+                is_always_on_top
             );
 
             // Show the info in an alert
@@ -742,6 +859,32 @@ fn main() {
             }
         }
 
+        // Check for zoom menu actions
+        #[cfg(windows)]
+        {
+            let zoom_action = ZOOM_ACTION.swap(0, Ordering::SeqCst);
+            if zoom_action != 0 {
+                let zoom_script = match zoom_action {
+                    1 => {
+                        // Zoom in - get current and increase by 25%
+                        "var currentZoom = parseFloat(document.body.style.zoom || '100'); document.body.style.zoom = (currentZoom + 25) + '%';"
+                    }
+                    2 => {
+                        // Zoom out - get current and decrease by 25%
+                        "var currentZoom = parseFloat(document.body.style.zoom || '100'); document.body.style.zoom = Math.max(25, currentZoom - 25) + '%';"
+                    }
+                    percent => {
+                        // Set specific zoom level
+                        &format!("document.body.style.zoom = '{}%';", percent)
+                    }
+                };
+                
+                if let Err(e) = webview.evaluate_script(zoom_script) {
+                    eprintln!("Failed to set zoom: {}", e);
+                }
+            }
+        }
+
         // Check timeout
         if let Some(deadline) = timeout_instant {
             if std::time::Instant::now() >= deadline {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bobfrankston/msger",
-    "version": "0.1.149",
+    "version": "0.1.151",
     "description": "Fast, lightweight, cross-platform message box - Rust-powered alternative to msgview",
     "type": "module",
     "main": "./index.js",