chore: use new singleton mark way

waycrate · Nov 29, 2024 · ff9f1cb · ff9f1cb
1 parent 26c3998
commit ff9f1cb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lala_bar/Cargo.toml b/lala_bar/Cargo.toml
@@ -21,7 +21,7 @@ iced = { version = "0.13.1", features = [
 	"markdown",
 ] }
 iced_runtime = "0.13.2"
-iced_layershell = "0.10.1"
+iced_layershell = "0.11.0-rc2"
 tokio = { version = "1.41", features = ["full"] }
 iced_futures = "0.13.2"
 env_logger = "0.11.5"

diff --git a/lala_bar/src/main.rs b/lala_bar/src/main.rs
@@ -9,8 +9,8 @@ use iced_aw::date_picker::Date;
 use iced_aw::time_picker::Time;
 use iced_layershell::reexport::{Anchor, Layer};
 use iced_layershell::settings::{LayerShellSettings, Settings, StartMode};
-use iced_layershell::to_layer_message;
 use iced_layershell::MultiApplication;
+use iced_layershell::{to_layer_message, LayerSingleton};
 
 mod aximer;
 mod config;
@@ -50,14 +50,19 @@ pub fn main() -> Result<(), iced_layershell::Error> {
     })
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, LayerSingleton)]
 pub enum LaLaInfo {
+    #[singleton]
     Launcher,
     Notify(Box<NotifyUnitWidgetInfo>),
+    #[singleton]
     HiddenInfo,
+    #[singleton]
     RightPanel,
     ErrorHappened(iced::window::Id),
+    #[singleton]
     Calendar,
+    #[singleton]
     TimePicker,
 }
 

diff --git a/lala_bar/src/music_bar.rs b/lala_bar/src/music_bar.rs
@@ -627,7 +627,6 @@ impl MultiApplication for LalaMusicBar {
                                     ..Default::default()
                                 },
                                 info: LaLaInfo::Calendar,
-                                singleton: true,
                             }),
                         ]);
                     }
@@ -643,7 +642,6 @@ impl MultiApplication for LalaMusicBar {
                             ..Default::default()
                         },
                         info: LaLaInfo::Calendar,
-                        singleton: true,
                     });
                 }
             }
@@ -671,7 +669,6 @@ impl MultiApplication for LalaMusicBar {
                                     ..Default::default()
                                 },
                                 info: LaLaInfo::TimePicker,
-                                singleton: true,
                             }),
                         ]);
                     }
@@ -687,7 +684,6 @@ impl MultiApplication for LalaMusicBar {
                             ..Default::default()
                         },
                         info: LaLaInfo::TimePicker,
-                        singleton: true,
                     });
                 }
             }
@@ -803,7 +799,6 @@ impl MultiApplication for LalaMusicBar {
                             ..Default::default()
                         },
                         info: LaLaInfo::Launcher,
-                        singleton: true,
                     }),
                     self.launcher.as_ref().unwrap().focus_input(),
                 ]);
@@ -830,7 +825,6 @@ impl MultiApplication for LalaMusicBar {
                             ..Default::default()
                         },
                         info: LaLaInfo::Launcher,
-                        singleton: true,
                     }),
                     self.launcher.as_ref().unwrap().focus_input(),
                 ]);
@@ -854,7 +848,6 @@ impl MultiApplication for LalaMusicBar {
                         ..Default::default()
                     },
                     info: LaLaInfo::RightPanel,
-                    singleton: true,
                 });
             }
             Message::Notify(NotifyMessage::UnitAdd(notify)) => {
@@ -936,7 +929,6 @@ impl MultiApplication for LalaMusicBar {
                                 inline_reply: String::new(),
                                 unit: *notify.clone(),
                             })),
-                            singleton: false,
                         }));
 
                         // NOTE: remove the new one
@@ -970,7 +962,6 @@ impl MultiApplication for LalaMusicBar {
                             ..Default::default()
                         },
                         info: LaLaInfo::HiddenInfo,
-                        singleton: true,
                     }));
                 }
 
@@ -1009,7 +1000,6 @@ impl MultiApplication for LalaMusicBar {
                                 ..Default::default()
                             },
                             info: LaLaInfo::Notify(Box::new(notify_info.clone())),
-                            singleton: false,
                         }));
                     }
                     if self.notifications.len() > MAX_SHOWN_NOTIFICATIONS_COUNT
@@ -1027,7 +1017,6 @@ impl MultiApplication for LalaMusicBar {
                                 ..Default::default()
                             },
                             info: LaLaInfo::HiddenInfo,
-                            singleton: true,
                         }));
                     }
                 }