Merge pull request #138 from ahkohd/share-picker

refactor: use position

Author: ahkohd

libs/share-picker/README.md

@@ -23,22 +23,26 @@ share-picker = { git = "https://github.com/ahkohd/tauri-toolkit", branch = "v2"
 ## Usage
 ```rust
 use share_picker::{SharePicker, PreferredEdge};
+use tauri::PhysicalPosition;
 
 fn main() {
     let window = app_handle.get_webview_window("window_name");
 
     let item = Path::from("/foo/bar.pdf");
 
-    window.share(vec![item.to_path_buf()], None, PreferredEdge::BottomLeft);
+    window.share(vec![item.to_path_buf()], PhysicalPosition {
+        x: 0.0,
+        y: 0.0
+    }, PreferredEdge::BottomLeft);
 }
 ```
 
 ## Functions
 
-- `share(window: &tauri::WebviewWindow, items: Vec<PathBuf>, offset: Option<(f64, f64)>, preferred_edge: PreferredEdge)`:
+- `share(window: &tauri::WebviewWindow, items: Vec<PathBuf>, position: PhysicalPosition<f64>, preferred_edge: PreferredEdge)`:
   Displays the Share picker at the cursor position within a WebviewWindow. 
   - `items: Vec<PathBuf>`: A list of paths to items to share.
-  - `offset: Option<(f64, f64)>`: Adjust the position of the share picker relative to the cursor.
+  - `position: PhysicalPosition<f64>`: Set the position to display the share picker. The origin is the top left corner of the window.
   - `preferred_edge: PreferredEdge`: The preferred edge for displaying the share picker at the cursor position's rectangle.
 
 

libs/share-picker/src/macos/share.rs

@@ -1,11 +1,11 @@
 use std::path::PathBuf;
 
 use objc2::{msg_send_id, rc::Retained, ClassType};
-use objc2_app_kit::{NSEvent, NSSharingServicePicker, NSView, NSWindow};
+use objc2_app_kit::{NSSharingServicePicker, NSView, NSWindow};
 use objc2_foundation::{
     MainThreadMarker, NSArray, NSPoint, NSRect, NSRectEdge, NSSize, NSString, NSURL,
 };
-use tauri::{Runtime, WebviewWindow};
+use tauri::{PhysicalPosition, Runtime, WebviewWindow};
 
 pub enum PreferredEdge {
     TopLeft,
@@ -26,14 +26,19 @@ impl PreferredEdge {
 }
 
 pub trait SharePicker<R: Runtime> {
-    fn share(&self, items: Vec<PathBuf>, offset: Option<(f64, f64)>, preferred_edge: PreferredEdge);
+    fn share(
+        &self,
+        items: Vec<PathBuf>,
+        position: PhysicalPosition<f64>,
+        preferred_edge: PreferredEdge,
+    );
 }
 
 impl<R: Runtime> SharePicker<R> for WebviewWindow<R> {
     fn share(
         &self,
         items: Vec<PathBuf>,
-        offset: Option<(f64, f64)>,
+        position: PhysicalPosition<f64>,
         preferred_edge: PreferredEdge,
     ) {
         let items = items
@@ -58,29 +63,23 @@ impl<R: Runtime> SharePicker<R> for WebviewWindow<R> {
 
         let content_view = window.contentView().unwrap();
 
-        let mouse_location_in_screen = unsafe { NSEvent::mouseLocation() };
+        let scale_factor = self.scale_factor().unwrap();
+
+        let position = PhysicalPosition {
+            x: position.x,
+            y: window.frame().size.height - position.y,
+        };
 
-        let mouse_location_in_window = window.convertPointFromScreen(mouse_location_in_screen);
+        let point_in_window = NSPoint::new(position.x, position.y);
 
-        let mouse_location_in_content_view =
-            content_view.convertPoint_fromView(mouse_location_in_window, None);
+        let point_in_content_view = content_view.convertPoint_fromView(point_in_window, None);
 
         let mtm = MainThreadMarker::new().unwrap();
 
         let view = unsafe { NSView::new(mtm) };
 
         unsafe {
-            view.setFrame(NSRect::new(
-                if let Some((x, y)) = offset {
-                    NSPoint::new(
-                        mouse_location_in_content_view.x + x,
-                        mouse_location_in_content_view.y + y,
-                    )
-                } else {
-                    mouse_location_in_content_view
-                },
-                NSSize::new(1.0, 1.0),
-            ));
+            view.setFrame(NSRect::new(point_in_content_view, NSSize::new(1.0, 1.0)));
 
             content_view.addSubview(&view);
         }