From fee19a4fe5d96e66bb8bb81654fde46ea0437ecc Mon Sep 17 00:00:00 2001
From: ShootingStarDragons <ShootingStarDragons@protonmail.com>
Date: Sat, 10 Aug 2024 19:09:09 +0859
Subject: [PATCH] chore: typo fix

---
 Cargo.lock                   |  6 +++---
 lala_bar/Cargo.toml          |  2 +-
 lala_bar/src/main.rs         | 20 ++++++++++----------
 notification_iced/src/lib.rs |  8 ++++----
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 682798d..9c0d702 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1672,7 +1672,7 @@ dependencies = [
 [[package]]
 name = "iced_layershell"
 version = "0.4.0-rc1"
-source = "git+https://github.com/waycrate/exwlshelleventloop#793515632472aee540ab7861146f0740d8dd773a"
+source = "git+https://github.com/waycrate/exwlshelleventloop?branch=evdirectlyremoveshell#1cb6bbca6b8815fab34ea1cc921e5a5edc386cb5"
 dependencies = [
  "futures",
  "iced",
@@ -1984,7 +1984,7 @@ dependencies = [
 [[package]]
 name = "layershellev"
 version = "0.4.0-rc1"
-source = "git+https://github.com/waycrate/exwlshelleventloop#793515632472aee540ab7861146f0740d8dd773a"
+source = "git+https://github.com/waycrate/exwlshelleventloop?branch=evdirectlyremoveshell#1cb6bbca6b8815fab34ea1cc921e5a5edc386cb5"
 dependencies = [
  "bitflags 2.6.0",
  "log",
@@ -3966,7 +3966,7 @@ dependencies = [
 [[package]]
 name = "waycrate_xkbkeycode"
 version = "0.4.0-rc1"
-source = "git+https://github.com/waycrate/exwlshelleventloop#793515632472aee540ab7861146f0740d8dd773a"
+source = "git+https://github.com/waycrate/exwlshelleventloop?branch=evdirectlyremoveshell#1cb6bbca6b8815fab34ea1cc921e5a5edc386cb5"
 dependencies = [
  "bitflags 2.6.0",
  "log",
diff --git a/lala_bar/Cargo.toml b/lala_bar/Cargo.toml
index d0574f4..8f642f4 100644
--- a/lala_bar/Cargo.toml
+++ b/lala_bar/Cargo.toml
@@ -15,7 +15,7 @@ iced = { version = "0.12", features = [
 ] }
 #iced_native = "0.12"
 iced_runtime = "0.12"
-iced_layershell = { git = "https://github.com/waycrate/exwlshelleventloop", package = "iced_layershell" }
+iced_layershell = { git = "https://github.com/waycrate/exwlshelleventloop", package = "iced_layershell", branch = "evdirectlyremoveshell" }
 tokio = { version = "1.39", features = ["full"] }
 iced_futures = "0.12.0"
 env_logger = "0.11.5"
diff --git a/lala_bar/src/main.rs b/lala_bar/src/main.rs
index ae72399..d3ac3fb 100644
--- a/lala_bar/src/main.rs
+++ b/lala_bar/src/main.rs
@@ -50,7 +50,7 @@ enum LaLaInfo {
 
 #[derive(Debug, Clone)]
 struct NotifyUnitWidgetInfo {
-    uper: i32,
+    upper: i32,
     counter: usize,
     unit: NotifyUnit,
 }
@@ -338,7 +338,7 @@ impl LalaMusicBar {
                 for (_, unit) in self.notifications.iter_mut() {
                     if unit.counter > counter {
                         unit.counter -= 1;
-                        unit.uper -= 75;
+                        unit.upper -= 75;
                     }
                 }
             }
@@ -393,7 +393,7 @@ impl MultiApplication for LalaMusicBar {
                     .entry(id)
                     .or_insert(NotifyUnitWidgetInfo {
                         counter: 0,
-                        uper: 10,
+                        upper: 10,
                         unit: nofify,
                     });
             }
@@ -527,11 +527,11 @@ impl MultiApplication for LalaMusicBar {
             Message::Notify(NotifyMessage::UnitAdd(notify)) => {
                 let mut commands = vec![];
                 for (id, unit) in self.notifications.iter_mut() {
-                    unit.uper += 75;
+                    unit.upper += 75;
                     commands.push(Command::single(
                         LaLaShellIdAction::new(
                             *id,
-                            LalaShellAction::MarginChange((unit.uper, 10, 10, 10)),
+                            LalaShellAction::MarginChange((unit.upper, 10, 10, 10)),
                         )
                         .into(),
                     ));
@@ -582,7 +582,7 @@ impl MultiApplication for LalaMusicBar {
                     commands.push(Command::single(
                         LaLaShellIdAction::new(
                             *id,
-                            LalaShellAction::MarginChange((unit.uper, 10, 10, 10)),
+                            LalaShellAction::MarginChange((unit.upper, 10, 10, 10)),
                         )
                         .into(),
                     ));
@@ -597,18 +597,18 @@ impl MultiApplication for LalaMusicBar {
                     .notifications
                     .iter()
                     .find(|(oid, _)| **oid == id)
-                    .map(|(_, info)| info.uper)
+                    .map(|(_, info)| info.upper)
                     .unwrap_or(0);
 
                 let mut commands = vec![];
                 for (id, unit) in self.notifications.iter_mut() {
-                    if unit.uper > removed_pos {
-                        unit.uper -= 75;
+                    if unit.upper > removed_pos {
+                        unit.upper -= 75;
                     }
                     commands.push(Command::single(
                         LaLaShellIdAction::new(
                             *id,
-                            LalaShellAction::MarginChange((unit.uper, 10, 10, 10)),
+                            LalaShellAction::MarginChange((unit.upper, 10, 10, 10)),
                         )
                         .into(),
                     ));
diff --git a/notification_iced/src/lib.rs b/notification_iced/src/lib.rs
index 14ec457..81c0e43 100644
--- a/notification_iced/src/lib.rs
+++ b/notification_iced/src/lib.rs
@@ -62,7 +62,7 @@ pub struct VersionInfo {
 
 #[derive(Debug)]
 pub struct LaLaMako<T: From<NotifyMessage> + Send> {
-    capablities: Vec<String>,
+    capabilities: Vec<String>,
     sender: Sender<T>,
     version: VersionInfo,
 }
@@ -86,7 +86,7 @@ impl<T: From<NotifyMessage> + Send + 'static> LaLaMako<T> {
 
     /// GetCapabilities method
     fn get_capabilities(&self) -> Vec<String> {
-        self.capablities.clone()
+        self.capabilities.clone()
     }
 
     /// GetServerInformation method
@@ -155,7 +155,7 @@ impl<T: From<NotifyMessage> + Send + 'static> LaLaMako<T> {
 
 pub async fn start_server<T: From<NotifyMessage> + Send + 'static>(
     sender: Sender<T>,
-    capablities: Vec<String>,
+    capabilities: Vec<String>,
     version: VersionInfo,
 ) -> Never {
     let _conn = async {
@@ -165,7 +165,7 @@ pub async fn start_server<T: From<NotifyMessage> + Send + 'static>(
                 "/org/freedesktop/Notifications",
                 LaLaMako {
                     sender,
-                    capablities,
+                    capabilities,
                     version,
                 },
             )?