1
1
mirror of https://github.com/wez/wezterm.git synced 2024-11-26 16:34:23 +03:00

windows: and another try!

This commit is contained in:
Wez Furlong 2024-01-20 15:54:25 -07:00
parent ea88dca296
commit 47590bbedc
No known key found for this signature in database
GPG Key ID: 7A7F66A31EC9B387

View File

@ -198,7 +198,7 @@ fn callback_behavior() -> glium::debug::DebugCallbackBehavior {
impl HasDisplayHandle for WindowInner { impl HasDisplayHandle for WindowInner {
fn display_handle(&self) -> Result<DisplayHandle, HandleError> { fn display_handle(&self) -> Result<DisplayHandle, HandleError> {
unsafe { unsafe {
Ok(DisplayHandle::from_raw(RawDisplayHandle::Windows( Ok(DisplayHandle::borrow_raw(RawDisplayHandle::Windows(
WindowsDisplayHandle::new(), WindowsDisplayHandle::new(),
))) )))
} }
@ -210,7 +210,7 @@ impl HasWindowHandle for WindowInner {
let mut handle = let mut handle =
Win32WindowHandle::new(NonZeroIsize::new(self.hwnd.0 as _).expect("non-zero")); Win32WindowHandle::new(NonZeroIsize::new(self.hwnd.0 as _).expect("non-zero"));
handle.hinstance = NonZeroIsize::new(unsafe { GetModuleHandleW(null()) } as _); handle.hinstance = NonZeroIsize::new(unsafe { GetModuleHandleW(null()) } as _);
unsafe { Ok(WindowHandle::from_raw(RawWindowHandle::Win32(handle))) } unsafe { Ok(WindowHandle::borrow_raw(RawWindowHandle::Win32(handle))) }
} }
} }
@ -734,7 +734,7 @@ impl HasWindowHandle for Window {
let handle = conn.get_window(self.0).expect("window handle invalid!?"); let handle = conn.get_window(self.0).expect("window handle invalid!?");
let inner = handle.borrow(); let inner = handle.borrow();
inner.raw_window_handle() inner.window_handle()
} }
} }