chore: api adjust

waycrate · Dec 8, 2024 · b0853c8 · b0853c8
1 parent 69420b4
commit b0853c8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 17 deletions.
diff --git a/iced_layershell/src/actions.rs b/iced_layershell/src/actions.rs
@@ -67,15 +67,15 @@ pub enum LayershellCustomActions {
     // settings, info, single_tone
     NewLayerShell {
         settings: NewLayerShellSettings,
-        info: IcedId,
+        id: IcedId,
     },
     NewPopUp {
         settings: IcedNewPopupSettings,
-        info: IcedId,
+        id: IcedId,
     },
     NewMenu {
         settings: IcedNewMenuSettings,
-        info: IcedId,
+        id: IcedId,
     },
     /// is same with WindowAction::Close(id)
     RemoveWindow(IcedId),

diff --git a/iced_layershell/src/event.rs b/iced_layershell/src/event.rs
@@ -117,10 +117,7 @@ pub enum IcedLayerEvent<Message: 'static> {
 
 #[allow(unused)]
 #[derive(Debug)]
-pub struct MultiWindowIcedLayerEvent<Message: 'static>(
-    pub Option<Id>,
-    pub IcedLayerEvent<Message>,
-);
+pub struct MultiWindowIcedLayerEvent<Message: 'static>(pub Option<Id>, pub IcedLayerEvent<Message>);
 
 impl<Message: 'static> From<(Option<Id>, IcedLayerEvent<Message>)>
     for MultiWindowIcedLayerEvent<Message>

diff --git a/iced_layershell/src/multi_window.rs b/iced_layershell/src/multi_window.rs
@@ -372,7 +372,9 @@ where
                             )
                             .ok();
                         }
-                        LayershellCustomActions::NewLayerShell { settings, info, .. } => {
+                        LayershellCustomActions::NewLayerShell {
+                            settings, id: info, ..
+                        } => {
                             let id = layershellev::id::Id::unique();
                             ev.append_return_data(ReturnData::NewLayerShell((
                                 settings,
@@ -391,7 +393,7 @@ where
                         }
                         LayershellCustomActions::NewPopUp {
                             settings: menusettings,
-                            info,
+                            id: info,
                         } => {
                             let IcedNewPopupSettings { size, position } = menusettings;
                             let Some(id) = ev.current_surface_id() else {
@@ -407,7 +409,7 @@ where
                         }
                         LayershellCustomActions::NewMenu {
                             settings: menusetting,
-                            info,
+                            id: info,
                         } => {
                             let Some(id) = ev.current_surface_id() else {
                                 break 'out;

diff --git a/iced_layershell_macros/src/lib.rs b/iced_layershell_macros/src/lib.rs
@@ -4,10 +4,7 @@ use darling::{
     FromDeriveInput, FromMeta,
 };
 use proc_macro2::TokenStream as TokenStream2;
-use syn::{
-    DeriveInput, Generics, Ident,
-    Variant, Visibility,
-};
+use syn::{DeriveInput, Generics, Ident, Variant, Visibility};
 
 use quote::quote;
 
@@ -73,9 +70,9 @@ pub fn to_layer_message(attr: TokenStream2, input: TokenStream2) -> manyhow::Res
                                 None,
                                 LayershellCustomActions::VirtualKeyboardPressed { time, key })
                             ),
-                            Self::NewLayerShell {settings, id } => Ok(LayershellCustomActionsWithId::new(None, LayershellCustomActions::NewLayerShell { settings, info: id })),
-                            Self::NewPopUp { settings, id } => Ok(LayershellCustomActionsWithId::new(None, LayershellCustomActions::NewPopUp { settings, info: id })),
-                            Self::NewMenu { settings, id } =>  Ok(LayershellCustomActionsWithId::new(None, LayershellCustomActions::NewMenu {settings, info:id })),
+                            Self::NewLayerShell {settings, id } => Ok(LayershellCustomActionsWithId::new(None, LayershellCustomActions::NewLayerShell { settings, id })),
+                            Self::NewPopUp { settings, id } => Ok(LayershellCustomActionsWithId::new(None, LayershellCustomActions::NewPopUp { settings, id })),
+                            Self::NewMenu { settings, id } =>  Ok(LayershellCustomActionsWithId::new(None, LayershellCustomActions::NewMenu {settings, id })),
                             Self::RemoveWindow(id) => Ok(LayershellCustomActionsWithId::new(None, LayershellCustomActions::RemoveWindow(id))),
                             Self::ForgetLastOutput => Ok(LayershellCustomActionsWithId::new(None, LayershellCustomActions::ForgetLastOutput)),
                             _ => Err(self)