wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2025-01-03 11:11:43 +03:00
Code Issues Projects Releases Wiki Activity

fix(wayland): match inner window and window frame sizes

Browse Source
This commit is contained in:
Aliaksandr Truš 2024-08-15 23:44:39 +02:00 committed by Wez Furlong
parent 1c4fdd3f71
commit 16a8bcdd89
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -251,14 +251,10 @@ impl WaylandWindow {
}
window.set_min_size(Some((32, 32)));
let (w, h) = window_frame.add_borders(
dimensions.pixel_width as u32,
dimensions.pixel_height as u32,
);
let (x, y) = window_frame.location();
window
.xdg_surface()
.set_window_geometry(x, y, w as i32, h as i32);
.set_window_geometry(x, y, dimensions.pixel_width as i32, dimensions.pixel_height as i32);
window.commit();
let copy_and_paste = CopyAndPaste::create();
@ -826,23 +822,20 @@ impl WaylandWindowInner {
}
log::trace!("Resizing frame");
let (width, height) = self.window_frame.subtract_borders(
NonZeroU32::new(pixel_width as u32).unwrap(),
NonZeroU32::new(pixel_height as u32).unwrap(),
);
// 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());
if !self.window_frame.is_hidden() {
// Clamp the size to at least one pixel.
let width =
NonZeroU32::new(pixel_width as u32).unwrap_or(NonZeroU32::new(1).unwrap());
let height =
NonZeroU32::new(pixel_height as u32).unwrap_or(NonZeroU32::new(1).unwrap());
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
.as_mut()
.unwrap()
.xdg_surface()
.set_window_geometry(x, y, outer_size.0 as i32, outer_size.1 as i32);
.set_window_geometry(x, y, pixel_width, pixel_height);
// Compute the new pixel dimensions
let new_dimensions = Dimensions {
pixel_width: pixel_width.try_into().unwrap(),