Merge pull request #404 from squidowl/fix/iced-upgrade-part2

Fix macos build error after iced update
squidowl · Jun 21, 2024 · fb52571 · fb52571
2 parents 0a242b3 + 9c9571c
commit fb52571
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/url.rs b/src/url.rs
@@ -5,7 +5,7 @@ use iced::{self, Subscription};
 #[cfg(target_os = "macos")]
 pub fn listen() -> Subscription<String> {
     use futures::stream::StreamExt;
-    use iced::event::{self, Event};
+    use iced::advanced::graphics::futures::subscription::{Event, MacOS, PlatformSpecific};
 
     struct OnUrl;
 
@@ -24,15 +24,19 @@ pub fn listen() -> Subscription<String> {
             input: subscription::EventStream,
         ) -> BoxStream<'static, Self::Output> {
             input
-                .filter_map(move |(event, status)| {
-                    if let event::Status::Captured = status {
-                        return futures::future::ready(None);
+                .filter_map(move |event| {
+                    if let Event::Interaction { status, .. } = &event {
+                        if *status == iced::event::Status::Captured {
+                            return futures::future::ready(None);
+                        }
                     }
 
                     let result = match event {
-                        Event::PlatformSpecific(event::PlatformSpecific::MacOS(
-                            event::MacOS::ReceivedUrl(url),
-                        )) => Some(url),
+                        Event::PlatformSpecific(event) => match event {
+                            PlatformSpecific::MacOS(macos) => match macos {
+                                MacOS::ReceivedUrl(url) => Some(url),
+                            },
+                        },
                         _ => None,
                     };