Merge branch 'master' into primary

src/key_bind.rs

@@ -1,49 +1,9 @@
-use cosmic::{
-    iced::keyboard::{Key, Modifiers},
-    iced_core::keyboard::key::Named,
-};
-use serde::{Deserialize, Serialize};
-use std::{collections::HashMap, fmt};
+use cosmic::widget::menu::key_bind::{KeyBind, Modifier};
+use cosmic::{iced::keyboard::Key, iced_core::keyboard::key::Named};
+use std::collections::HashMap;
 
 use crate::Action;
 
-#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize)]
-pub enum Modifier {
-    Super,
-    Ctrl,
-    Alt,
-    Shift,
-}
-
-#[derive(Clone, Debug, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize)]
-pub struct KeyBind {
-    pub modifiers: Vec<Modifier>,
-    pub key: Key,
-}
-
-impl KeyBind {
-    pub fn matches(&self, modifiers: Modifiers, key: &Key) -> bool {
-        key == &self.key
-            && modifiers.logo() == self.modifiers.contains(&Modifier::Super)
-            && modifiers.control() == self.modifiers.contains(&Modifier::Ctrl)
-            && modifiers.alt() == self.modifiers.contains(&Modifier::Alt)
-            && modifiers.shift() == self.modifiers.contains(&Modifier::Shift)
-    }
-}
-
-impl fmt::Display for KeyBind {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        for modifier in self.modifiers.iter() {
-            write!(f, "{:?} + ", modifier)?;
-        }
-        match &self.key {
-            Key::Character(c) => write!(f, "{}", c.to_uppercase()),
-            Key::Named(named) => write!(f, "{:?}", named),
-            other => write!(f, "{:?}", other),
-        }
-    }
-}
-
 //TODO: load from config
 pub fn key_binds() -> HashMap<KeyBind, Action> {
     let mut key_binds = HashMap::new();