fix: type, singleton not single_tone

waycrate · Nov 28, 2024 · d258d5f · d258d5f
1 parent 25fb62c
commit d258d5f
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 31 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,22 +18,22 @@ authors = [
   "Aakash Sen Sharma <[email protected]>",
 ]
 edition = "2021"
-version = "0.10.0"
+version = "0.10.1"
 license = "MIT"
 repository = "https://github.com/waycrate/exwlshelleventloop"
 description = "Wayland extra shell lib"
 keywords = ["wayland", "wlroots"]
 readme = "README.md"
 
 [workspace.dependencies]
-layershellev = { version = "0.10.0", path = "./layershellev" }
-sessionlockev = { version = "0.10.0", path = "./sessionlockev" }
-
-iced_layershell = { version = "0.10.0", path = "./iced_layershell" }
-iced_layershell_macros = { version = "0.10.0", path = "./iced_layershell_macros" }
-iced_sessionlock = { version = "0.10.0", path = "./iced_sessionlock" }
-iced_sessionlock_macros = { version = "0.10.0", path = "./iced_sessionlock_macros" }
-waycrate_xkbkeycode = { version = "0.10.0", path = "./waycrate_xkbkeycode" }
+layershellev = { version = "0.10.1", path = "./layershellev" }
+sessionlockev = { version = "0.10.1", path = "./sessionlockev" }
+
+iced_layershell = { version = "0.10.1", path = "./iced_layershell" }
+iced_layershell_macros = { version = "0.10.1", path = "./iced_layershell_macros" }
+iced_sessionlock = { version = "0.10.1", path = "./iced_sessionlock" }
+iced_sessionlock_macros = { version = "0.10.1", path = "./iced_sessionlock_macros" }
+waycrate_xkbkeycode = { version = "0.10.1", path = "./waycrate_xkbkeycode" }
 
 tempfile = "3.14.0"
 thiserror = "1.0.69"

diff --git a/iced_examples/counter_muti/src/main.rs b/iced_examples/counter_muti/src/main.rs
@@ -184,7 +184,7 @@ impl MultiApplication for Counter {
                     ..Default::default()
                 },
                 info: WindowInfo::Left,
-                single_tone: true,
+                singleton: true,
             }),
             Message::NewWindowRight => Command::done(Message::NewLayerShell {
                 settings: NewLayerShellSettings {
@@ -198,7 +198,7 @@ impl MultiApplication for Counter {
                     ..Default::default()
                 },
                 info: WindowInfo::Right,
-                single_tone: true,
+                singleton: true,
             }),
             Message::Close(id) => task::effect(Action::Window(WindowAction::Close(id))),
             _ => unreachable!(),

diff --git a/iced_examples/zbus_invoked_widget/src/main.rs b/iced_examples/zbus_invoked_widget/src/main.rs
@@ -57,7 +57,7 @@ impl TryInto<LaLaShellIdAction> for Message {
                         ..Default::default()
                     },
                     info: (),
-                    single_tone: false,
+                    singleton: false,
                 },
             )),
             _ => Err(self),

diff --git a/iced_layershell/src/actions.rs b/iced_layershell/src/actions.rs
@@ -49,7 +49,7 @@ pub enum LayershellCustomActionsWithInfo<INFO: Clone> {
     NewLayerShell {
         settings: NewLayerShellSettings,
         info: INFO,
-        single_tone: bool,
+        singleton: bool,
     },
     NewPopUp {
         settings: IcedNewPopupSettings,

diff --git a/iced_layershell/src/multi_window.rs b/iced_layershell/src/multi_window.rs
@@ -1010,7 +1010,7 @@ pub(crate) fn run_action<A, C>(
                 let action: LayershellCustomActionsWithIdAndInfo<A::WindowInfo> = action;
                 if let LayershellCustomActionsWithInfo::NewLayerShell {
                     info,
-                    single_tone: true,
+                    singleton: true,
                     ..
                 } = &action.1
                 {

diff --git a/iced_layershell_macros/src/lib.rs b/iced_layershell_macros/src/lib.rs
@@ -44,7 +44,7 @@ pub fn to_layer_message(attr: TokenStream2, input: TokenStream2) -> manyhow::Res
                     time: u32,
                     key: u32,
                 },
-                NewLayerShell { settings: iced_layershell::reexport::NewLayerShellSettings, info: #info, single_tone: bool },
+                NewLayerShell { settings: iced_layershell::reexport::NewLayerShellSettings, info: #info, singleton: bool },
                 NewPopUp { settings: iced_layershell::actions::IcedNewPopupSettings, info: #info },
                 NewMenu { settings: iced_layershell::actions::IcedNewMenuSettings, info: #info },
                 RemoveWindow(iced::window::Id),
@@ -69,7 +69,7 @@ pub fn to_layer_message(attr: TokenStream2, input: TokenStream2) -> manyhow::Res
                                 None,
                                 InnerLayerAction::VirtualKeyboardPressed { time, key })
                             ),
-                            Self::NewLayerShell {settings, info, single_tone } => Ok(InnerLayerActionId::new(None, InnerLayerAction::NewLayerShell { settings, info, single_tone })),
+                            Self::NewLayerShell {settings, info, singleton } => Ok(InnerLayerActionId::new(None, InnerLayerAction::NewLayerShell { settings, info, singleton })),
                             Self::NewPopUp { settings, info } => Ok(InnerLayerActionId::new(None, InnerLayerAction::NewPopUp { settings, info })),
                             Self::NewMenu { settings, info } =>  Ok(InnerLayerActionId::new(None, InnerLayerAction::NewMenu {settings, info })),
                             Self::RemoveWindow(id) => Ok(InnerLayerActionId::new(None, InnerLayerAction::RemoveWindow(id))),