fix(weg/tb): stealing focus when fullscreened apps

eythaann · Oct 3, 2024 · 49cacf2 · 49cacf2
1 parent 9b09dd6
commit 49cacf2
Show file tree

Hide file tree

Showing 4 changed files with 437 additions and 435 deletions.
diff --git a/src/background/seelen_bar/hook.rs b/src/background/seelen_bar/hook.rs
@@ -24,13 +24,13 @@ impl FancyToolbar {
  WinEvent::SyntheticFullscreenStart(event_data) => {
  let monitor = WindowsApi::monitor_from_window(self.window.hwnd()?);
  if monitor == event_data.monitor {
- self.hide()?;
+ self.send_to_bottom()?;
  }
  }
  WinEvent::SyntheticFullscreenEnd(event_data) => {
  let monitor = WindowsApi::monitor_from_window(self.window.hwnd()?);
  if monitor == event_data.monitor {
- self.show()?;
+ self.bring_to_top_most()?;
  }
  }
  _ => {}

diff --git a/src/background/seelen_bar/mod.rs b/src/background/seelen_bar/mod.rs
@@ -20,7 +20,7 @@ use tauri::{Emitter, Listener, Manager, WebviewWindow};
 use windows::Win32::{
  Foundation::{HWND, RECT},
  Graphics::Gdi::HMONITOR,
- UI::WindowsAndMessaging::{SWP_NOACTIVATE, SW_HIDE, SW_SHOWNOACTIVATE},
+ UI::WindowsAndMessaging::{HWND_BOTTOM, SWP_NOACTIVATE},
 };
 
 pub struct FancyToolbar {
@@ -82,13 +82,14 @@ impl FancyToolbar {
  self.set_overlaped_status(is_overlaped)
  }
 
- pub fn hide(&mut self) -> Result<()> {
- WindowsApi::show_window_async(self.window.hwnd()?, SW_HIDE)?;
+ pub fn send_to_bottom(&mut self) -> Result<()> {
+ self.window.set_always_on_top(false)?;
+ WindowsApi::bring_to(self.window.hwnd()?, HWND_BOTTOM)?;
  Ok(())
  }
 
- pub fn show(&mut self) -> Result<()> {
- WindowsApi::show_window_async(self.window.hwnd()?, SW_SHOWNOACTIVATE)?;
+ pub fn bring_to_top_most(&mut self) -> Result<()> {
+ self.window.set_always_on_top(true)?;
  Ok(())
  }
 

diff --git a/src/background/seelen_weg/hook.rs b/src/background/seelen_weg/hook.rs
@@ -64,13 +64,13 @@ impl SeelenWeg {
  WinEvent::SyntheticFullscreenStart(event_data) => {
  let monitor = WindowsApi::monitor_from_window(self.window.hwnd()?);
  if monitor == event_data.monitor {
- self.hide()?;
+ self.send_to_bottom()?;
  }
  }
  WinEvent::SyntheticFullscreenEnd(event_data) => {
  let monitor = WindowsApi::monitor_from_window(self.window.hwnd()?);
  if monitor == event_data.monitor {
- self.show()?;
+ self.bring_to_top_most()?;
  }
  }
  _ => {}