alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2025-01-11 13:31:29 +11:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential bug (#2009)

Browse source 
* polish and failed to find visual warning

* improvement
This commit is contained in:
sandmor 2021-08-24 05:35:11 -05:00 committed by GitHub
parent b54d47796d
commit 3bfb580d7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/platform_impl/linux/x11/window.rs
View file

@ -181,8 +181,8 @@ impl UnownedWindow {
}; };
// creating // creating
let (visual, depth) = match pl_attribs.visual_infos { let (visual, depth, require_colormap) = match pl_attribs.visual_infos {
Some(vi) => (vi.visual, vi.depth), Some(vi) => (vi.visual, vi.depth, false),
None if window_attrs.transparent == true => { None if window_attrs.transparent == true => {
// Find a suitable visual // Find a suitable visual
let mut vinfo = MaybeUninit::uninit(); let mut vinfo = MaybeUninit::uninit();
@ -197,13 +197,21 @@ impl UnownedWindow {
}; };
if vinfo_initialized { if vinfo_initialized {
let vinfo = unsafe { vinfo.assume_init() }; let vinfo = unsafe { vinfo.assume_init() };
(vinfo.visual, vinfo.depth) (vinfo.visual, vinfo.depth, true)
} else { } else {
debug!("Could not set transparency, because XMatchVisualInfo returned zero for the required parameters"); debug!("Could not set transparency, because XMatchVisualInfo returned zero for the required parameters");
(ffi::CopyFromParent as *mut ffi::Visual, ffi::CopyFromParent) (
ffi::CopyFromParent as *mut ffi::Visual,
ffi::CopyFromParent,
false,
)
} }
} }
_ => (ffi::CopyFromParent as *mut ffi::Visual, ffi::CopyFromParent), _ => (
ffi::CopyFromParent as *mut ffi::Visual,
ffi::CopyFromParent,
false,
),
}; };
let mut set_win_attr = { let mut set_win_attr = {
@ -213,7 +221,7 @@ impl UnownedWindow {
let visual = vi.visual; let visual = vi.visual;
(xconn.xlib.XCreateColormap)(xconn.display, root, visual, ffi::AllocNone) (xconn.xlib.XCreateColormap)(xconn.display, root, visual, ffi::AllocNone)
} }
} else if window_attrs.transparent { } else if require_colormap {
unsafe { (xconn.xlib.XCreateColormap)(xconn.display, root, visual, ffi::AllocNone) } unsafe { (xconn.xlib.XCreateColormap)(xconn.display, root, visual, ffi::AllocNone) }
} else { } else {
0 0