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

Fix output filtering of override-redirect windows

Browse source 
`or.geometry()` was actually calling a different method in `filter` than
in `.flat_map`. Apparently since `or` in `filter` is an `&&X11Surface`
instead of `&X11Surface`, that invoked the trait method on `SpaceElement`...

Smithay should be changed in some way so that can't happen, but this
improves some of the behavior in cosmic-comp for now, at least. There
may be other issues related to this.

The `SpaceElement::geometry` was also returning a `loc` of `(0, 0)`,
which presumably isn't correct either.
This commit is contained in:
Ian Douglas Scott 2023-08-03 16:17:03 -07:00
parent 5125337b42
commit baad2c01b4
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/shell/workspace.rs
View file

@ -35,7 +35,7 @@ use smithay::{
glow::{GlowFrame, GlowRenderer}, glow::{GlowFrame, GlowRenderer},
ImportAll, ImportMem, Renderer, ImportAll, ImportMem, Renderer,
}, },
desktop::{layer_map_for_output, space::SpaceElement}, desktop::layer_map_for_output,
input::{pointer::GrabStartData as PointerGrabStartData, Seat}, input::{pointer::GrabStartData as PointerGrabStartData, Seat},
output::Output, output::Output,
reexports::wayland_server::{protocol::wl_surface::WlSurface, Client}, reexports::wayland_server::{protocol::wl_surface::WlSurface, Client},
@ -521,7 +521,7 @@ impl Workspace {
popup_elements.extend( popup_elements.extend(
override_redirect_windows override_redirect_windows
.iter() .iter()
.filter(|or| or.geometry().intersection(output.geometry()).is_some()) .filter(|or| (*or).geometry().intersection(output.geometry()).is_some())
.flat_map(|or| { .flat_map(|or| {
AsRenderElements::<R>::render_elements::<WorkspaceRenderElement<R>>( AsRenderElements::<R>::render_elements::<WorkspaceRenderElement<R>>(
or, or,
@ -569,7 +569,7 @@ impl Workspace {
popup_elements.extend( popup_elements.extend(
override_redirect_windows override_redirect_windows
.iter() .iter()
.filter(|or| or.geometry().intersection(output.geometry()).is_some()) .filter(|or| (*or).geometry().intersection(output.geometry()).is_some())
.flat_map(|or| { .flat_map(|or| {
AsRenderElements::<R>::render_elements::<WorkspaceRenderElement<R>>( AsRenderElements::<R>::render_elements::<WorkspaceRenderElement<R>>(
or, or,