diff --git a/examples/clipboard.rs b/examples/clipboard.rs index 1e02c21..0c8e031 100644 --- a/examples/clipboard.rs +++ b/examples/clipboard.rs @@ -81,34 +81,32 @@ fn main() { return; }; match event { - smithay_clipboard::dnd::DndEvent::Offer(id, OfferEvent::Data { - data, mime_type - }) => { + smithay_clipboard::dnd::DndEvent::Offer(id, OfferEvent::Data { data, mime_type }) => { let s = smithay_clipboard::text::Text::try_from((data, mime_type)).unwrap(); println!("Received DnD data for {}: {}", id.unwrap_or_default(), s.0); }, - smithay_clipboard::dnd::DndEvent::Offer(id, OfferEvent::Leave) => - { - if state.internal_dnd { + smithay_clipboard::dnd::DndEvent::Offer(id, OfferEvent::Leave) => { + if state.internal_dnd { if state.pointer_focus { println!("Internal drop completed!"); } else { - // Internal DnD will be ignored after leaving the window in which it started. - // Another approach might be to allow it to re-enter before some time has passed. + // Internal DnD will be ignored after leaving the window in which it + // started. Another approach might be to allow it to + // re-enter before some time has passed. state.internal_dnd = false; state.clipboard.end_dnd(); } } else { println!("Dnd offer left {id:?}."); } - }, + }, smithay_clipboard::dnd::DndEvent::Source(SourceEvent::Finished) => { println!("Finished sending data."); state.internal_dnd = false; }, e => { dbg!(e); - } + }, } }); @@ -153,7 +151,6 @@ fn main() { actions: DndAction::Move, preferred: DndAction::Move, }, - ]); let mut simple_window = SimpleWindow { @@ -387,12 +384,12 @@ impl PointerHandler for SimpleWindow { DndAction::all(), ); }, - PointerEventKind::Leave {..} => { + PointerEventKind::Leave { .. } => { self.pointer_focus = false; - } - PointerEventKind::Enter {..} => { + }, + PointerEventKind::Enter { .. } => { self.pointer_focus = true; - } + }, _ => {}, } } diff --git a/src/dnd/mod.rs b/src/dnd/mod.rs index 77656fc..55d8992 100644 --- a/src/dnd/mod.rs +++ b/src/dnd/mod.rs @@ -43,8 +43,8 @@ impl RawSurface for WlSurface { pub trait RawSurface { /// # Safety /// - /// returned pointer must be a valid `*mut wl_surface` pointer, and it must remain - /// valid for as long as `RawSurface` object is alive. + /// returned pointer must be a valid `*mut wl_surface` pointer, and it must + /// remain valid for as long as `RawSurface` object is alive. unsafe fn get_ptr(&mut self) -> *mut c_void; } diff --git a/src/dnd/state.rs b/src/dnd/state.rs index c6826dd..fda2a13 100644 --- a/src/dnd/state.rs +++ b/src/dnd/state.rs @@ -115,7 +115,8 @@ where { dnd_state.set_actions(action, preferred_action); self.dnd_state.selected_mime = Some(mime_type.clone()); - dnd_state.accept_mime_type(self.dnd_state.accept_ctr, Some(mime_type.to_string())); + dnd_state + .accept_mime_type(self.dnd_state.accept_ctr, Some(mime_type.to_string())); self.dnd_state.accept_ctr = self.dnd_state.accept_ctr.wrapping_add(1); } (s.clone(), Some(dest)) diff --git a/src/state.rs b/src/state.rs index 5e4c786..259c4f2 100644 --- a/src/state.rs +++ b/src/state.rs @@ -488,7 +488,9 @@ impl DataSourceHandler for State { #[cfg(feature = "dnd")] { if let Some(s) = self.dnd_state.sender.as_ref() { - _ = s.send(DndEvent::Source(crate::dnd::SourceEvent::Mime(m.map(|s| MimeType::from(Cow::Owned(s)))))); + _ = s.send(DndEvent::Source(crate::dnd::SourceEvent::Mime( + m.map(|s| MimeType::from(Cow::Owned(s))), + ))); } } }