mirrors/gauntlet
1
0
Fork 0
mirror of https://github.com/project-gauntlet/gauntlet.git synced 2025-12-23 10:35:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix window jumping to another screen if pressing global shortcut with window open when using active monitor position mode

Browse source
This commit is contained in:
Exidex 2025-01-16 21:21:34 +01:00
parent 47bf9f28e0
commit b4e255a92e
No known key found for this signature in database
GPG key ID: 46D8D21671EB48FA
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rust/client/src/ui/mod.rs
View file

@ -67,6 +67,7 @@ pub struct AppModel {
frontend_receiver: Arc<TokioRwLock<RequestReceiver<UiRequestData, UiResponseData>>>,
main_window_id: window::Id,
focused: bool,
opened: bool,
wayland: bool,
#[cfg(any(target_os = "macos", target_os = "windows"))]
tray_icon: tray_icon::TrayIcon,
@ -523,6 +524,7 @@ fn new(
frontend_receiver: Arc::new(TokioRwLock::new(frontend_receiver)),
main_window_id,
focused: false,
opened: !minimized,
wayland,
#[cfg(any(target_os = "macos", target_os = "windows"))]
tray_icon: sys_tray::create_tray(),
@ -2006,6 +2008,7 @@ impl AppModel {
fn hide_window(&mut self) -> Task<AppMsg> {
self.focused = false;
self.opened = false;
let mut commands = vec![];
@ -2049,6 +2052,12 @@ impl AppModel {
}
fn show_window(&mut self) -> Task<AppMsg> {
if self.opened {
return Task::none()
}
self.opened = true;
#[cfg(target_os = "linux")]
let open_task = if self.wayland {
let (_, open_task) = open_main_window_wayland(self.main_window_id);