fix(windows): leave space for auto-hidden taskbar for undecorated win…

…dows (#726)
tauri-apps · Apr 19, 2023 · c5d606d · c5d606d
1 parent ee5dc41
commit c5d606d
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 3 deletions.
diff --git a/.changes/auto-hide-taskbar-windows.md b/.changes/auto-hide-taskbar-windows.md
@@ -0,0 +1,5 @@
+---
+"tao": "patch"
+---
+
+On Windows, fix auto-hide taskbar can't be shown when maximizing undecorated window.
diff --git a/src/platform_impl/windows/event_loop.rs b/src/platform_impl/windows/event_loop.rs
@@ -36,7 +36,10 @@ use windows::{
     UI::{
       Controls::{self as win32c, HOVER_DEFAULT},
       Input::{KeyboardAndMouse::*, Pointer::*, Touch::*, *},
-      Shell::{DefSubclassProc, RemoveWindowSubclass, SetWindowSubclass},
+      Shell::{
+        DefSubclassProc, RemoveWindowSubclass, SHAppBarMessage, SetWindowSubclass, ABE_BOTTOM,
+        ABE_LEFT, ABE_RIGHT, ABE_TOP, ABM_GETAUTOHIDEBAR, APPBARDATA,
+      },
       WindowsAndMessaging::{self as win32wm, *},
     },
   },
@@ -1962,7 +1965,7 @@ unsafe fn public_window_callback_inner<T: 'static>(
             let get_monitor_rect = |monitor| {
               let mut monitor_info = MONITORINFO {
                 cbSize: mem::size_of::<MONITORINFO>() as _,
-                ..MONITORINFO::default()
+                ..Default::default()
               };
               GetMonitorInfoW(monitor, &mut monitor_info);
               monitor_info.rcMonitor
@@ -2055,7 +2058,35 @@ unsafe fn public_window_callback_inner<T: 'static>(
           if let Ok(monitor_info) =
             monitor::get_monitor_info(MonitorFromRect(&params.rgrc[0], MONITOR_DEFAULTTONULL))
           {
-            params.rgrc[0] = monitor_info.monitorInfo.rcWork;
+            let mut rect = monitor_info.monitorInfo.rcWork;
+
+            let mut edges = 0;
+            for edge in [ABE_BOTTOM, ABE_LEFT, ABE_TOP, ABE_RIGHT] {
+              let mut app_data = APPBARDATA {
+                cbSize: std::mem::size_of::<APPBARDATA>() as _,
+                uEdge: edge,
+                ..Default::default()
+              };
+              if SHAppBarMessage(ABM_GETAUTOHIDEBAR, &mut app_data) != 0 {
+                edges |= edge;
+              }
+            }
+
+            // keep a 1px for taskbar auto-hide to work
+            if edges & ABE_BOTTOM != 0 {
+              rect.bottom -= 1;
+            }
+            if edges & ABE_LEFT != 0 {
+              rect.left += 1;
+            }
+            if edges & ABE_TOP != 0 {
+              rect.top += 1;
+            }
+            if edges & ABE_RIGHT != 0 {
+              rect.right -= 1;
+            }
+
+            params.rgrc[0] = rect;
           }
         } else if window_flags.contains(WindowFlags::MARKER_UNDECORATED_SHADOW) {
           let params = &mut *(lparam.0 as *mut NCCALCSIZE_PARAMS);