Update to iced 0.14.0

Author: Kn4ughty

Cargo.lock

@@ -25,7 +25,7 @@ rustflags = ["-Clink-arg=-fuse-ld=lld", "-Clink-arg=-Wl,--no-rosegment"]
 
 
 [dependencies]
-iced = { git = "https://github.com/iced-rs/iced", features = ["advanced", "tokio", "image"], rev= "8bfd099c5929d927a3fdde666d4c645d0bd83cb7" }
+iced = { version = "0.14.0", features = ["advanced", "tokio", "image"] }
 shared-mime-info = { git = "https://github.com/Kn4ughty/shared-mime-info" }
 # shared-mime-info = { path = "../shared-mime-info" } # This is useful for rapid testing
 anyhow = "1.0.99"

Cargo.toml

@@ -185,6 +185,7 @@ impl State {
                 log::debug!("Loaded font successfully");
                 Task::none()
             }
+            Message::DoNothing => Task::none(),
         }
     }
 
@@ -331,10 +332,21 @@ fn subscription(_state: &State) -> iced::Subscription<Message> {
     iced::Subscription::batch(vec![
         iced::window::open_events().map(Message::WindowOpened),
         // Thank you https://kressle.in/keystrokes
-        iced::keyboard::on_key_press(handle_press_hotkeys),
-        iced::keyboard::on_key_release(handle_release_hotkeys),
-        // Todo, work out how to subscribe to mouse movement
-        // https://docs.iced.rs/iced/mouse/index.html
+        // iced::keyboard::on_key_press(handle_press_hotkeys),
+        // iced::keyboard::on_key_release(handle_release_hotkeys),
+        iced::keyboard::listen().map(|ke| {
+            match ke {
+                keyboard::Event::KeyPressed { key, modifiers, .. } => {
+                    handle_press_hotkeys(key, modifiers)
+                }
+                keyboard::Event::KeyReleased { key, modifiers, .. } => {
+                    handle_release_hotkeys(key, modifiers)
+                }
+                keyboard::Event::ModifiersChanged(_) => None,
+            }
+            .unwrap_or(Message::DoNothing)
+        }), // Todo, work out how to subscribe to mouse movement
+            // https://docs.iced.rs/iced/mouse/index.html
     ])
 }
 

src/main.rs

@@ -8,6 +8,7 @@ pub enum Message {
     TextInputSubmitted(String),
     #[allow(clippy::enum_variant_names)]
     PluginMessage(ModuleMessage),
+    DoNothing,
     Close,
     KeyboardUp,
     KeyboardDown,