refactor: peek_dnd try to parse data

pop-os · Oct 11, 2024 · 7d3b789 · 7d3b789
1 parent 67cb1eb
commit 7d3b789
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -163,7 +163,6 @@ bytemuck = { version = "1.0", features = ["derive"] }
 bytes = "1.6"
 
 cosmic-text = { git = "https://github.com/pop-os/cosmic-text.git" }
-# cosmic-text = "0.10"
 
 dark-light = "1.0"
 futures = "0.3"
@@ -195,7 +194,7 @@ rustc-hash = "2.0"
 sctk = { package = "smithay-client-toolkit", version = "0.19.1" }
 smol = "1.0"
 smol_str = "0.2"
-softbuffer = { git = "https://github.com/pop-os/softbuffer", tag = "cosmic-4.0" }
+softbuffer = { version = "0.4" }
 syntect = "5.2"
 sysinfo = "0.30"
 thiserror = "1.0"

diff --git a/runtime/src/dnd.rs b/runtime/src/dnd.rs
@@ -78,7 +78,7 @@ impl std::fmt::Debug for DndAction {
 }
 
 /// Read the current contents of the Dnd operation.
-pub fn peek_dnd<T: AllowedMimeTypes>() -> Task<Option<(Vec<u8>, String)>> {
+pub fn peek_dnd<T: AllowedMimeTypes>() -> Task<Option<T>> {
     task::oneshot(|tx| {
         Action::Dnd(DndAction::PeekDnd(
             T::allowed()
@@ -87,6 +87,7 @@ pub fn peek_dnd<T: AllowedMimeTypes>() -> Task<Option<(Vec<u8>, String)>> {
             tx,
         ))
     })
+    .map(|data| data.and_then(|data| T::try_from(data).ok()))
 }
 
 /// Register a Dnd destination.