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

shell: Fix floating and layer-shell popup positioning

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-02-15 20:48:39 +01:00
parent 5ba068ec82
commit dead320252
1 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/wayland/handlers/xdg_shell/popup.rs
View file

@ -30,7 +30,7 @@ impl Shell {
if let Some(parent) = get_popup_toplevel(&surface) { if let Some(parent) = get_popup_toplevel(&surface) {
if let Some(elem) = self.element_for_wl_surface(&parent) { if let Some(elem) = self.element_for_wl_surface(&parent) {
let workspace = self.space_for(elem).unwrap(); let workspace = self.space_for(elem).unwrap();
let element_geo = workspace.element_geometry(elem).unwrap(); let mut element_geo = workspace.element_geometry(elem).unwrap();
let (window, offset) = elem let (window, offset) = elem
.windows() .windows()
.find(|(w, _)| w.wl_surface().as_ref() == Some(&parent)) .find(|(w, _)| w.wl_surface().as_ref() == Some(&parent))
@ -39,6 +39,7 @@ impl Shell {
let window_loc = element_geo.loc + offset + window_geo_offset; let window_loc = element_geo.loc + offset + window_geo_offset;
let anchor_point = get_anchor_point(&positioner) + window_loc; let anchor_point = get_anchor_point(&positioner) + window_loc;
if workspace.is_tiled(elem) { if workspace.is_tiled(elem) {
element_geo.loc = (0, 0).into(); //-= window_loc;
if !unconstrain_xdg_popup_tile(surface, element_geo) { if !unconstrain_xdg_popup_tile(surface, element_geo) {
if let Some(output) = workspace.output_under(anchor_point) { if let Some(output) = workspace.output_under(anchor_point) {
unconstrain_xdg_popup(surface, window_loc, output.geometry()); unconstrain_xdg_popup(surface, window_loc, output.geometry());
@ -281,30 +282,21 @@ fn check_constrained(
geometry: Rectangle<i32, Logical>, geometry: Rectangle<i32, Logical>,
toplevel_box: Rectangle<i32, Logical>, toplevel_box: Rectangle<i32, Logical>,
) -> Point<i32, Logical> { ) -> Point<i32, Logical> {
let relative_coords =
Rectangle::from_loc_and_size(geometry.loc + toplevel_box.loc, geometry.size);
let mut offset = (0, 0).into(); let mut offset = (0, 0).into();
if toplevel_box.contains_rect(relative_coords) { if toplevel_box.contains_rect(geometry) {
return offset; return offset;
} }
if relative_coords.loc.x < toplevel_box.loc.x { if geometry.loc.x < toplevel_box.loc.x {
offset.x = toplevel_box.loc.x - relative_coords.loc.x; offset.x = toplevel_box.loc.x - geometry.loc.x;
} else if relative_coords.loc.x + relative_coords.size.w } else if geometry.loc.x + geometry.size.w > toplevel_box.loc.x + toplevel_box.size.w {
> toplevel_box.loc.x + toplevel_box.size.w offset.x = toplevel_box.loc.x + toplevel_box.size.w - (geometry.loc.x + geometry.size.w);
{
offset.x = toplevel_box.loc.x + toplevel_box.size.w
- (relative_coords.loc.x + relative_coords.size.w);
} }
if relative_coords.loc.y < toplevel_box.loc.y { if geometry.loc.y < toplevel_box.loc.y {
offset.y = toplevel_box.loc.y - relative_coords.loc.y; offset.y = toplevel_box.loc.y - geometry.loc.y;
} else if relative_coords.loc.y + relative_coords.size.h } else if geometry.loc.y + geometry.size.h > toplevel_box.loc.y + toplevel_box.size.h {
> toplevel_box.loc.y + toplevel_box.size.h offset.y = toplevel_box.loc.y + toplevel_box.size.h - (geometry.loc.y + geometry.size.h);
{
offset.y = toplevel_box.loc.y + toplevel_box.size.h
- (relative_coords.loc.y + relative_coords.size.h);
} }
offset offset