leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to windows-sys 0.59 (#4098)

Browse source
This commit is contained in:
valadaptive 2025-02-23 22:40:11 -05:00 • committed by GitHub
parent 3a39a6ddb0
commit 23011c6b0a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 166 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/platform_impl/windows/window_state.rs
View file

@ -1,5 +1,5 @@
use std::io;
use std::sync::MutexGuard;
use std::{io, ptr};
use bitflags::bitflags;
use windows_sys::Win32::Foundation::{HWND, RECT};
@ -356,7 +356,7 @@ impl WindowFlags {
0,
SWP_ASYNCWINDOWPOS | SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE,
);
InvalidateRgn(window, 0, false.into());
InvalidateRgn(window, ptr::null_mut(), false.into());
}
}
@ -420,7 +420,7 @@ impl WindowFlags {
}
// Refresh the window frame
SetWindowPos(window, 0, 0, 0, 0, 0, flags);
SetWindowPos(window, ptr::null_mut(), 0, 0, 0, 0, flags);
SendMessageW(window, event_loop::SET_RETAIN_STATE_ON_SIZE_MSG_ID.get(), 0, 0);
}
}
@ -438,7 +438,7 @@ impl WindowFlags {
}
util::win_to_err({
let b_menu = GetMenu(hwnd) != 0;
let b_menu = !GetMenu(hwnd).is_null();
if let (Some(get_dpi_for_window), Some(adjust_window_rect_ex_for_dpi)) =
(*util::GET_DPI_FOR_WINDOW, *util::ADJUST_WINDOW_RECT_EX_FOR_DPI)
{
@ -468,14 +468,14 @@ impl WindowFlags {
let (width, height): (u32, u32) = self.adjust_size(hwnd, size).into();
SetWindowPos(
hwnd,
0,
ptr::null_mut(),
0,
0,
width as _,
height as _,
SWP_ASYNCWINDOWPOS | SWP_NOZORDER | SWP_NOREPOSITION | SWP_NOMOVE | SWP_NOACTIVATE,
);
InvalidateRgn(hwnd, 0, false.into());
InvalidateRgn(hwnd, ptr::null_mut(), false.into());
}
}
}