-
-
Notifications
You must be signed in to change notification settings - Fork 278
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor!: refactor drag and drop events (#1187)
- Loading branch information
Showing
11 changed files
with
317 additions
and
220 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| --- | ||
| "wry": "patch" | ||
| --- | ||
|
|
||
| **Breaking change**: Refactored the file-drop handling on the webview for better representation of the actual drag and drop operation: | ||
|
|
||
| - Renamed `file-drop` cargo feature flag to `drag-drop`. | ||
| - Removed `FileDropEvent` enum and replaced with a new `DragDropEvent` enum. | ||
| - Renamed `WebViewAttributes::file_drop_handler` field to `WebViewAttributes::drag_drop_handler`. | ||
| - Renamed `WebViewAttributes::with_file_drop_handler` method to `WebViewAttributes::with_drag_drop_handler`. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| // Copyright 2020-2023 Tauri Programme within The Commons Conservancy | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // SPDX-License-Identifier: MIT | ||
|
|
||
| use std::{ | ||
| cell::{Cell, UnsafeCell}, | ||
| path::PathBuf, | ||
| rc::Rc, | ||
| }; | ||
|
|
||
| use gtk::{glib::GString, prelude::*}; | ||
| use webkit2gtk::WebView; | ||
|
|
||
| use crate::DragDropEvent; | ||
|
|
||
| struct DragDropController { | ||
| paths: UnsafeCell<Option<Vec<PathBuf>>>, | ||
| has_entered: Cell<bool>, | ||
| position: Cell<(i32, i32)>, | ||
| handler: Box<dyn Fn(DragDropEvent) -> bool>, | ||
| } | ||
|
|
||
| impl DragDropController { | ||
| fn new(handler: Box<dyn Fn(DragDropEvent) -> bool>) -> Self { | ||
| Self { | ||
| handler, | ||
| paths: UnsafeCell::new(None), | ||
| has_entered: Cell::new(false), | ||
| position: Cell::new((0, 0)), | ||
| } | ||
| } | ||
|
|
||
| fn store_paths(&self, paths: Vec<PathBuf>) { | ||
| unsafe { *self.paths.get() = Some(paths) }; | ||
| } | ||
|
|
||
| fn take_paths(&self) -> Option<Vec<PathBuf>> { | ||
| unsafe { &mut *self.paths.get() }.take() | ||
| } | ||
|
|
||
| fn store_position(&self, position: (i32, i32)) { | ||
| self.position.replace(position); | ||
| } | ||
|
|
||
| fn enter(&self) { | ||
| self.has_entered.set(true); | ||
| } | ||
|
|
||
| fn has_entered(&self) -> bool { | ||
| self.has_entered.get() | ||
| } | ||
|
|
||
| fn leave(&self) { | ||
| self.has_entered.set(false); | ||
| } | ||
|
|
||
| fn call(&self, event: DragDropEvent) -> bool { | ||
| (self.handler)(event) | ||
| } | ||
| } | ||
|
|
||
| pub(crate) fn connect_drag_event(webview: &WebView, handler: Box<dyn Fn(DragDropEvent) -> bool>) { | ||
| let controller = Rc::new(DragDropController::new(handler)); | ||
|
|
||
| { | ||
| let controller = controller.clone(); | ||
| webview.connect_drag_data_received(move |_, _, _, _, data, info, _| { | ||
| if info == 2 { | ||
| let uris = data.uris(); | ||
| let paths = uris.iter().map(path_buf_from_uri).collect::<Vec<_>>(); | ||
| controller.enter(); | ||
| controller.call(DragDropEvent::Enter { | ||
| paths: paths.clone(), | ||
| position: controller.position.get(), | ||
| }); | ||
| controller.store_paths(paths); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| { | ||
| let controller = controller.clone(); | ||
| webview.connect_drag_motion(move |_, _, x, y, _| { | ||
| if controller.has_entered() { | ||
| controller.call(DragDropEvent::Over { position: (x, y) }); | ||
| } else { | ||
| controller.store_position((x, y)); | ||
| } | ||
| false | ||
| }); | ||
| } | ||
|
|
||
| { | ||
| let controller = controller.clone(); | ||
| webview.connect_drag_drop(move |_, _, x, y, _| { | ||
| if controller.has_entered() { | ||
| if let Some(paths) = controller.take_paths() { | ||
| controller.leave(); | ||
| return controller.call(DragDropEvent::Drop { | ||
| paths, | ||
| position: (x, y), | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| false | ||
| }); | ||
| } | ||
|
|
||
| webview.connect_drag_leave(move |_, _, time| { | ||
| if time == 0 { | ||
| controller.leave(); | ||
| controller.call(DragDropEvent::Leave); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| fn path_buf_from_uri(gstr: &GString) -> PathBuf { | ||
| let path = gstr.as_str(); | ||
| let path = path.strip_prefix("file://").unwrap_or(path); | ||
| let path = percent_encoding::percent_decode(path.as_bytes()) | ||
| .decode_utf8_lossy() | ||
| .to_string(); | ||
| PathBuf::from(path) | ||
| } |
Oops, something went wrong.