Peter/tauri-sys
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update drag drop events to match new Tauri updates.

Browse source
This commit is contained in:
Brian Carlsen 2024-07-23 13:43:37 +02:00
parent eae62c1e5c
commit 4698574b7d
No known key found for this signature in database
GPG key ID: B14D281A79B2DDB7
2 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/event.rs
View file

@ -17,10 +17,10 @@ pub const WINDOW_SCALE_FACTOR_CHANGED: &str = "tauri://scale-change";
pub const WINDOW_THEME_CHANGED: &str = "tauri://theme-changed"; pub const WINDOW_THEME_CHANGED: &str = "tauri://theme-changed";
pub const WINDOW_CREATED: &str = "tauri://window-created"; pub const WINDOW_CREATED: &str = "tauri://window-created";
pub const WEBVIEW_CREATED: &str = "tauri://webview-created"; pub const WEBVIEW_CREATED: &str = "tauri://webview-created";
pub const DRAG: &str = "tauri://drag"; pub const DRAG_ENTER: &str = "tauri://drag-enter";
pub const DROP: &str = "tauri://drop"; pub const DRAG_OVER: &str = "tauri://drag-over";
pub const DROP_OVER: &str = "tauri://drop-over"; pub const DRAG_DROP: &str = "tauri://drag-drop";
pub const DROP_CANCELLED: &str = "tauri://drag-cancelled"; pub const DRAG_LEAVE: &str = "tauri://drag-leave";
#[derive(Debug, Clone, PartialEq, Deserialize)] #[derive(Debug, Clone, PartialEq, Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]

48
src/window.rs
View file

@ -55,25 +55,25 @@ impl<T> Stream for Listen<T> {
pub(crate) struct DragDropListen { pub(crate) struct DragDropListen {
pub rx: mpsc::UnboundedReceiver<Event<DragDropEvent>>, pub rx: mpsc::UnboundedReceiver<Event<DragDropEvent>>,
pub unlisten_drag: js_sys::Function, pub unlisten_enter: js_sys::Function,
pub unlisten_drop: js_sys::Function, pub unlisten_drop: js_sys::Function,
pub unlisten_drag_over: js_sys::Function, pub unlisten_over: js_sys::Function,
pub unlisten_cancel: js_sys::Function, pub unlisten_leave: js_sys::Function,
} }
impl Drop for DragDropListen { impl Drop for DragDropListen {
fn drop(&mut self) { fn drop(&mut self) {
log::debug!("Calling unlisten for listen callback"); log::debug!("Calling unlisten for listen callback");
self.unlisten_drag self.unlisten_enter
.call0(&wasm_bindgen::JsValue::NULL) .call0(&wasm_bindgen::JsValue::NULL)
.unwrap(); .unwrap();
self.unlisten_drop self.unlisten_drop
.call0(&wasm_bindgen::JsValue::NULL) .call0(&wasm_bindgen::JsValue::NULL)
.unwrap(); .unwrap();
self.unlisten_drag_over self.unlisten_over
.call0(&wasm_bindgen::JsValue::NULL) .call0(&wasm_bindgen::JsValue::NULL)
.unwrap(); .unwrap();
self.unlisten_cancel self.unlisten_leave
.call0(&wasm_bindgen::JsValue::NULL) .call0(&wasm_bindgen::JsValue::NULL)
.unwrap(); .unwrap();
} }
@ -97,10 +97,10 @@ struct WindowLabel {
#[derive(Deserialize, Debug)] #[derive(Deserialize, Debug)]
pub enum DragDropEvent { pub enum DragDropEvent {
Dragged(DragDropPayload), Enter(DragDropPayload),
DragOver(DragOverPayload), Over(DragOverPayload),
Dropped(DragDropPayload), Drop(DragDropPayload),
Cancelled, Leave,
} }
#[derive(Deserialize, Debug)] #[derive(Deserialize, Debug)]
@ -340,12 +340,12 @@ impl Window {
let _ = tx.unbounded_send(Event { let _ = tx.unbounded_send(Event {
event, event,
id, id,
payload: DragDropEvent::Dragged(payload), payload: DragDropEvent::Enter(payload),
}); });
}) })
}; };
let unlisten = event::inner::listen( let unlisten = event::inner::listen(
event::DRAG, event::DRAG_ENTER,
&closure, &closure,
serde_wasm_bindgen::to_value(&event::Options { serde_wasm_bindgen::to_value(&event::Options {
target: event::EventTarget::Window(self.label.clone()), target: event::EventTarget::Window(self.label.clone()),
@ -354,7 +354,7 @@ impl Window {
.await?; .await?;
closure.forget(); closure.forget();
let unlisten_drag = js_sys::Function::from(unlisten); let unlisten_enter = js_sys::Function::from(unlisten);
let closure = { let closure = {
let tx = tx.clone(); let tx = tx.clone();
@ -364,12 +364,12 @@ impl Window {
let _ = tx.unbounded_send(Event { let _ = tx.unbounded_send(Event {
event, event,
id, id,
payload: DragDropEvent::Dropped(payload), payload: DragDropEvent::Drop(payload),
}); });
}) })
}; };
let unlisten = event::inner::listen( let unlisten = event::inner::listen(
event::DROP, event::DRAG_DROP,
&closure, &closure,
serde_wasm_bindgen::to_value(&event::Options { serde_wasm_bindgen::to_value(&event::Options {
target: event::EventTarget::Window(self.label.clone()), target: event::EventTarget::Window(self.label.clone()),
@ -388,12 +388,12 @@ impl Window {
let _ = tx.unbounded_send(Event { let _ = tx.unbounded_send(Event {
event, event,
id, id,
payload: DragDropEvent::DragOver(payload), payload: DragDropEvent::Over(payload),
}); });
}) })
}; };
let unlisten = event::inner::listen( let unlisten = event::inner::listen(
event::DROP_OVER, event::DRAG_OVER,
&closure, &closure,
serde_wasm_bindgen::to_value(&event::Options { serde_wasm_bindgen::to_value(&event::Options {
target: event::EventTarget::Window(self.label.clone()), target: event::EventTarget::Window(self.label.clone()),
@ -402,7 +402,7 @@ impl Window {
.await?; .await?;
closure.forget(); closure.forget();
let unlisten_drag_over = js_sys::Function::from(unlisten); let unlisten_over = js_sys::Function::from(unlisten);
let closure = { let closure = {
let tx = tx.clone(); let tx = tx.clone();
@ -412,12 +412,12 @@ impl Window {
let _ = tx.unbounded_send(Event { let _ = tx.unbounded_send(Event {
event, event,
id, id,
payload: DragDropEvent::Cancelled, payload: DragDropEvent::Leave,
}); });
}) })
}; };
let unlisten = event::inner::listen( let unlisten = event::inner::listen(
event::DROP_CANCELLED, event::DRAG_LEAVE,
&closure, &closure,
serde_wasm_bindgen::to_value(&event::Options { serde_wasm_bindgen::to_value(&event::Options {
target: event::EventTarget::Window(self.label.clone()), target: event::EventTarget::Window(self.label.clone()),
@ -426,14 +426,14 @@ impl Window {
.await?; .await?;
closure.forget(); closure.forget();
let unlisten_cancel = js_sys::Function::from(unlisten); let unlisten_leave = js_sys::Function::from(unlisten);
Ok(DragDropListen { Ok(DragDropListen {
rx, rx,
unlisten_drag, unlisten_enter,
unlisten_drop, unlisten_drop,
unlisten_drag_over, unlisten_over,
unlisten_cancel, unlisten_leave,
}) })
} }
} }