wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-09-19 18:57:59 +03:00
Code Issues Projects Releases Wiki Activity

window: speculative code to enable initial position on windows

Browse Source 
need to move this to my windows machine to try it

refs: #1794
This commit is contained in:
Wez Furlong 2022-04-02 09:40:41 -07:00
parent 8ac793a619
commit 52edc8bb11
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -328,6 +328,8 @@ impl Window {
config: ConfigHandle,
class_name: &str,
name: &str,
x: i16,
y: i16,
width: usize,
height: usize,
lparam: *const RefCell<WindowInner>,
@ -364,7 +366,7 @@ impl Window {
let (width, height) = adjust_client_to_window_dimensions(style, width, height);
let (x, y) = if (style & WS_POPUP) == 0 {
(CW_USEDEFAULT, CW_USEDEFAULT)
(x, y)
} else {
// WS_POPUP windows need to specify the initial position.
// We pick the middle of the primary monitor
@ -469,8 +471,16 @@ impl Window {
};
let width = geometry.width.evaluate_as_pixels(width_context) as usize;
let height = geometry.height.evaluate_as_pixels(height_context) as usize;
let x = geometry
.x
.map(|x| x.evaluate_as_pixels(width_context) as i16)
.unwrap_or(CW_USEDEFAULT);
let y = geometry
.y
.map(|y| y.evaluate_as_pixels(height_context) as i16)
.unwrap_or(CW_USEDEFAULT);
let hwnd = match Self::create_window(config, class_name, name, width, height, raw) {
let hwnd = match Self::create_window(config, class_name, name, x, y, width, height, raw) {
Ok(hwnd) => HWindow(hwnd),
Err(err) => {
// Ensure that we drop the extra ref to raw before we return