starred/openidea
1
0
Fork 0
mirror of https://github.com/l0ng-ai/openidea.git synced 2026-11-06 08:07:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(windows): constrain final maximized outer placement

Browse Source
This commit is contained in:
l0ng-ai
2026-11-01 19:14:12 +08:00
parent 2f3a012de7
commit e481c900ca
1 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src-tauri/src/window_work_area.rs
+25 -2
View File
@@ -44,8 +44,8 @@ mod native {
RemoveWindowSubclass, SHAppBarMessage, SetWindowSubclass,
},
WindowsAndMessaging::{
GWL_STYLE, GetWindowLongPtrW, IsZoomed, MINMAXINFO, NCCALCSIZE_PARAMS, WM_GETMINMAXINFO, WM_NCCALCSIZE,
WM_NCDESTROY, WS_CAPTION,
GWL_STYLE, GetWindowLongPtrW, IsIconic, IsZoomed, MINMAXINFO, NCCALCSIZE_PARAMS, SWP_NOMOVE,
SWP_NOSIZE, WINDOWPOS, WM_GETMINMAXINFO, WM_NCCALCSIZE, WM_NCDESTROY, WM_WINDOWPOSCHANGING, WS_CAPTION,
},
},
};
@@ -145,6 +145,29 @@ mod native {
unsafe { DefSubclassProc(hwnd, message, wparam, lparam) }
}
}
WM_WINDOWPOSCHANGING if !fullscreen => {
let result = unsafe { DefSubclassProc(hwnd, message, wparam, lparam) };
let pos = unsafe { &mut *(lparam as *mut WINDOWPOS) };
// Windows can add the invisible resize frame after WM_GETMINMAXINFO.
// Constrain the final outer placement too, without changing restore,
// minimize, Snap, or changes that only affect stacking/visibility.
if pos.flags & SWP_NOSIZE == 0 && unsafe { IsZoomed(hwnd) } != 0 && unsafe { IsIconic(hwnd) } == 0 {
let monitor = if pos.flags & SWP_NOMOVE != 0 {
unsafe { MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST) }
} else {
let proposed = RECT { left: pos.x, top: pos.y, right: pos.x + pos.cx, bottom: pos.y + pos.cy };
unsafe { MonitorFromRect(&proposed, MONITOR_DEFAULTTONEAREST) }
};
if let Some((_, area)) = unsafe { monitor_bounds(monitor, false) } {
pos.x = area.left;
pos.y = area.top;
pos.cx = area.right - area.left;
pos.cy = area.bottom - area.top;
pos.flags &= !SWP_NOMOVE;
}
}
result
}
WM_NCDESTROY => {
unsafe { RemoveWindowSubclass(hwnd, Some(window_proc), SUBCLASS) };
unsafe { DefSubclassProc(hwnd, message, wparam, lparam) }