enh(code): idk maybe fix of ghost windows

Author: eythaann

src/background/hook.rs

@@ -242,7 +242,7 @@ pub fn init_zombie_window_killer() -> Result<()> {
             for addr in guard.iter() {
                 let window = Window::from(*addr);
                 if !window.is_window() {
-                    // log::trace!("Reaping window: {:0x}", window.address());
+                    log::trace!("Reaping window: {:0x}", window.address());
                     log_error!(HookManager::event_tx().send((WinEvent::ObjectDestroy, window)));
                 }
             }

src/background/modules/apps/application/windows.rs

@@ -18,7 +18,7 @@ impl UserAppsManager {
     pub(super) fn init_listing_app_windows() -> Vec<UserAppWindow> {
         let mut initial = Vec::new();
         let _ = WindowEnumerator::new().for_each(|window| {
-            if is_interactable_and_not_hidden(&window) {
+            if is_interactable_window(&window) {
                 initial.push(window.to_serializable());
             }
         });
@@ -29,7 +29,7 @@ impl UserAppsManager {
             std::thread::sleep(std::time::Duration::from_millis(1000));
             Self::instance()
                 .interactable_windows
-                .retain(|w| is_interactable_and_not_hidden(&Window::from(w.hwnd)));
+                .retain(|w| is_interactable_window(&Window::from(w.hwnd)));
         });
 
         initial
@@ -40,14 +40,14 @@ impl UserAppsManager {
 
         match event {
             WinEvent::ObjectCreate | WinEvent::ObjectShow => {
-                if !is_interactable && is_interactable_and_not_hidden(&window) {
+                if !is_interactable && is_interactable_window(&window) {
                     USER_APPS_MANAGER.add_win(&window);
                     Self::send(UserAppsEvent::WinAdded(window.address()));
                 }
             }
             WinEvent::ObjectNameChange | WinEvent::ObjectParentChange => {
                 let was_interactable = is_interactable;
-                is_interactable = is_interactable_and_not_hidden(&window);
+                is_interactable = is_interactable_window(&window);
                 match (was_interactable, is_interactable) {
                     (false, true) => {
                         USER_APPS_MANAGER.add_win(&window);
@@ -117,9 +117,9 @@ impl UserAppsManager {
 /// for the users.
 ///
 /// As windows properties can change, this should be reevaluated on every change.
-pub fn is_interactable_and_not_hidden(window: &Window) -> bool {
+pub fn is_interactable_window(window: &Window) -> bool {
     // It must be a visible Window and not cloaked
-    if !window.is_visible() || window.is_cloaked() {
+    if !window.is_window() || !window.is_visible() || window.is_cloaked() {
         return false;
     }
 

src/background/modules/system_tray/application/tray_icon.rs

@@ -143,8 +143,6 @@ impl SystemTrayManager {
                         .upsert(to_update.stable_id.clone(), to_update.clone());
                     Some(SystrayEvent::IconUpdate(to_update.clone()))
                 } else {
-                    log::info!("Tray icon added: {:?}", icon_data);
-
                     // Icon doesn't exist yet, so add new icon. Skip icons that
                     // cannot be identified.
                     let stable_id = icon_data.guid.map(SysTrayIconId::Guid).or({
@@ -156,6 +154,8 @@ impl SystemTrayManager {
                         }
                     })?;
 
+                    log::trace!("Tray icon added: {}", stable_id);
+
                     let mut icon_image_hash = None;
                     let mut icon_path = None;
 
@@ -189,11 +189,9 @@ impl SystemTrayManager {
                 }
             }
             Win32TrayEvent::IconRemove { data: icon_data } => {
-                log::info!("Tray icon removed: {:?}", icon_data);
-
                 let icon_id = self.find_icon(icon_data).map(|icon| icon.stable_id.clone());
-
                 if let Some(icon_id) = icon_id {
+                    log::trace!("Tray icon removed: {}", icon_id);
                     self.icons.remove(&icon_id);
                     Some(SystrayEvent::IconRemove(icon_id))
                 } else {
@@ -209,7 +207,7 @@ impl SystemTrayManager {
         icon_id: &SysTrayIconId,
         action: &SystrayIconAction,
     ) -> crate::Result<()> {
-        log::info!("Sending icon action: {:?} to: {:?}", action, icon_id);
+        log::trace!("Sending icon action: {:?} to: {:?}", action, icon_id);
         let icon = self
             .icons
             .get(icon_id, |v| v.clone())

src/background/windows_api/window/mod.rs

@@ -23,9 +23,7 @@ use windows::{
 use crate::{
     cli::ServicePipe,
     error::Result,
-    modules::{
-        apps::application::is_interactable_and_not_hidden, start::application::START_MENU_MANAGER,
-    },
+    modules::{apps::application::is_interactable_window, start::application::START_MENU_MANAGER},
     widgets::{
         launcher::SeelenRofi, toolbar::FancyToolbar, wallpaper_manager::SeelenWall,
         weg::instance::SeelenWeg, window_manager::instance::WindowManagerV2,
@@ -315,7 +313,7 @@ impl Window {
 
     /// read inner called doc for more info
     pub fn is_interactable_and_not_hidden(&self) -> bool {
-        is_interactable_and_not_hidden(self)
+        is_interactable_window(self)
     }
 
     pub fn show_window(&self, command: SHOW_WINDOW_CMD) -> Result<()> {