wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-23 05:12:40 +03:00
Code Issues Projects Releases Wiki Activity

win32: fixup initial window pos after screens changes

Browse Source 
Ensure that we correctly use CW_USEDEFAULT for the case where
`--position` was not used.
This commit is contained in:
Wez Furlong 2022-07-06 13:43:46 -07:00
parent 2b3e5119a4
commit 87b963981e
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
window/src/os/windows/window.rs
View File

@ -377,27 +377,32 @@ impl Window {
let (width, height) =
adjust_client_to_window_dimensions(style, geometry.width, geometry.height);
let (x, y) = if (style & WS_POPUP) == 0 {
(geometry.x, geometry.y)
} else {
// WS_POPUP windows need to specify the initial position.
// We pick the middle of the primary monitor
let (x, y) = match (geometry.x, geometry.y) {
(Some(x), Some(y)) => (x, y),
_ => {
if (style & WS_POPUP) == 0 {
(CW_USEDEFAULT, CW_USEDEFAULT)
} else {
// WS_POPUP windows need to specify the initial position.
// We pick the middle of the primary monitor
unsafe {
let mut mi: MONITORINFO = std::mem::zeroed();
mi.cbSize = std::mem::size_of::<MONITORINFO>() as u32;
GetMonitorInfoW(
MonitorFromWindow(std::ptr::null_mut(), MONITOR_DEFAULTTOPRIMARY),
&mut mi,
);
unsafe {
let mut mi: MONITORINFO = std::mem::zeroed();
mi.cbSize = std::mem::size_of::<MONITORINFO>() as u32;
GetMonitorInfoW(
MonitorFromWindow(std::ptr::null_mut(), MONITOR_DEFAULTTOPRIMARY),
&mut mi,
);
let mon_width = mi.rcMonitor.right - mi.rcMonitor.left;
let mon_height = mi.rcMonitor.bottom - mi.rcMonitor.top;
let mon_width = mi.rcMonitor.right - mi.rcMonitor.left;
let mon_height = mi.rcMonitor.bottom - mi.rcMonitor.top;
(
mi.rcMonitor.left + (mon_width - width) / 2,
mi.rcMonitor.top + (mon_height - height) / 2,
)
(
mi.rcMonitor.left + (mon_width - width) / 2,
mi.rcMonitor.top + (mon_height - height) / 2,
)
}
}
}
};