leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Account for SSD_HEIGHT in XwaylandHandler::configure_request

Browse source 
`CosmicWindow::set_geometry` is going to subtract the `SSD_HEIGHT`
before setting the size for the X11 window, so we need to include it
here.
This commit is contained in:
Ian Douglas Scott 2024-05-28 14:57:53 -07:00 • committed by Jeremy Soller
parent a3df48fe17
commit 1ed9649891
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/xwayland.rs
View file

@ -2,7 +2,10 @@ use std::{ffi::OsString, os::unix::io::OwnedFd, process::Stdio};
use crate::{ use crate::{
backend::render::cursor::{load_cursor_theme, Cursor, CursorShape}, backend::render::cursor::{load_cursor_theme, Cursor, CursorShape},
shell::{focus::target::KeyboardFocusTarget, grabs::ReleaseMode, CosmicSurface, Shell}, shell::{
element::surface::SSD_HEIGHT, focus::target::KeyboardFocusTarget, grabs::ReleaseMode,
CosmicSurface, Shell,
},
state::State, state::State,
utils::prelude::*, utils::prelude::*,
wayland::handlers::{ wayland::handlers::{
@ -379,12 +382,13 @@ impl XwmHandler for State {
.is_some(); .is_some();
if is_floating { if is_floating {
let ssd_height = if window.is_decorated() { 0 } else { SSD_HEIGHT };
mapped.set_geometry( mapped.set_geometry(
Rectangle::from_loc_and_size( Rectangle::from_loc_and_size(
current_geo.loc, current_geo.loc,
( (
w.map(|w| w as i32).unwrap_or(current_geo.size.w), w.map(|w| w as i32).unwrap_or(current_geo.size.w),
h.map(|h| h as i32).unwrap_or(current_geo.size.h), h.map(|h| h as i32).unwrap_or(current_geo.size.h) + ssd_height,
), ),
) )
.as_global(), .as_global(),