wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-11-22 22:42:48 +03:00
Code Issues Projects Releases Wiki Activity

wayland: avoid panic w/ resize of hidden frame, part 2

Browse Source 
refs: https://github.com/wez/wezterm/issues/4948
This commit is contained in:
Wez Furlong 2024-02-03 23:10:26 -07:00
parent 2ce302c89c
commit 32f5d1ca08
No known key found for this signature in database
GPG Key ID: 7A7F66A31EC9B387
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
window/src/os/wayland/window.rs
View File

@ -235,13 +235,9 @@ impl WaylandWindow {
FallbackFrame::new(&window, shm, subcompositor, qh.clone())
.expect("failed to create csd frame")
};
let hidden = if let Some(decor) = decor_mode {
match decor {
DecorationMode::Client => false,
_ => true,
}
} else {
true
let hidden = match decor_mode {
Some(DecorationMode::Client) => false,
_ => true,
};
window_frame.set_hidden(hidden);
if !hidden {
@ -802,7 +798,9 @@ impl WaylandWindowInner {
// Clamp the size to at least one pixel.
let width = width.unwrap_or(NonZeroU32::new(1).unwrap());
let height = height.unwrap_or(NonZeroU32::new(1).unwrap());
self.window_frame.resize(width, height);
if !self.window_frame.is_hidden() {
self.window_frame.resize(width, height);
}
let (x, y) = self.window_frame.location();
let outer_size = self.window_frame.add_borders(width.get(), height.get());
self.window
@ -810,7 +808,6 @@ impl WaylandWindowInner {
.unwrap()
.xdg_surface()
.set_window_geometry(x, y, outer_size.0 as i32, outer_size.1 as i32);
// }
// Compute the new pixel dimensions
let new_dimensions = Dimensions {
pixel_width: pixel_width.try_into().unwrap(),