refactor: remove some function

waycrate · Aug 10, 2024 · 7c5e175 · 7c5e175
1 parent 1cb6bbc
commit 7c5e175
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 23 deletions.
diff --git a/iced_layershell/src/multi_window.rs b/iced_layershell/src/multi_window.rs
@@ -369,7 +369,7 @@ where
                                                 .expect("Cannot send");
                                         }
                                         LayershellCustomActionsWithInfo::ForgetLastOutput => {
-                                            return ReturnData::ForgetLastOutput
+                                            ev.foget_last_output();
                                         }
                                     }
                                 }

diff --git a/layershellev/src/events.rs b/layershellev/src/events.rs
@@ -105,8 +105,6 @@ pub enum ReturnData<INFO> {
     RequestSetCursorShape((String, WlPointer, u32)),
     NewLayerShell((NewLayerShellSettings, Option<INFO>)),
     NewPopUp((NewPopUpSettings, Option<INFO>)),
-    RemoveShell(id::Id),
-    ForgetLastOutput,
     None,
 }
 

diff --git a/layershellev/src/lib.rs b/layershellev/src/lib.rs
@@ -570,6 +570,10 @@ impl<T> WindowState<T> {
         }
         self.units.remove(index);
     }
+
+    pub fn foget_last_output(&mut self) {
+        self.last_wloutput.take();
+    }
 }
 
 /// Simple WindowState, without any data binding or info
@@ -1897,9 +1901,6 @@ impl<T: 'static> WindowState<T> {
                                 cursor_surface.commit();
                             }
                         }
-                        ReturnData::ForgetLastOutput => {
-                            self.last_wloutput.take();
-                        }
                         ReturnData::NewLayerShell((
                             NewLayerShellSettings {
                                 size,
@@ -2038,23 +2039,6 @@ impl<T: 'static> WindowState<T> {
                                 binding: info,
                             });
                         }
-                        ReturnData::RemoveShell(id) => {
-                            let Some(index) = self
-                                .units
-                                .iter()
-                                .position(|unit| unit.id == id && unit.becreated)
-                            else {
-                                continue;
-                            };
-
-                            self.units[index].shell.destroy();
-                            self.units[index].wl_surface.destroy();
-
-                            if let Some(buffer) = self.units[index].buffer.as_ref() {
-                                buffer.destroy()
-                            }
-                            self.units.remove(index);
-                        }
                         _ => {}
                     }
                 }