tauri-apps/archived-tao
1
0
Fork 0
mirror of https://github.com/tauri-apps/tao.git synced 2026-01-31 00:35:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(windows): fix set_fullscreen early return for Fullscreen::Borderless(None) (#854)

Browse Source
This commit is contained in:
Amr Bashir
2023-12-14 05:06:56 +02:00
committed by GitHub
parent 5eb2124e70
commit 68803e6748
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/windows-set-fullscreen-early-return.md Normal file
View File

@@ -0,0 +1,5 @@
---
"tao": "patch"
---
On Windows, fix consecutive calls to `window.set_fullscreen(Some(Fullscreen::Borderless(None)))` resulting in losing previous window state when eventually exiting fullscreen using `window.set_fullscreen(None)`.

14
src/platform_impl/windows/window.rs
View File

@@ -621,9 +621,19 @@ impl Window {
let mut window_state_lock = window_state.lock();
let old_fullscreen = window_state_lock.fullscreen.clone();
if window_state_lock.fullscreen == fullscreen {
return;
match (&old_fullscreen, &fullscreen) {
// Return if we already in the same fullscreen mode
_ if old_fullscreen == fullscreen => return,
// Return if saved Borderless(monitor) is the same as current monitor when requested fullscreen is Borderless(None)
(Some(Fullscreen::Borderless(Some(monitor))), Some(Fullscreen::Borderless(None)))
if monitor.inner == monitor::current_monitor(window.0) =>
{
return
}
_ => {}
}
window_state_lock.fullscreen = fullscreen.clone();
drop(window_state_lock);