Merge pull request #146 from pop-os/override-redirect-monitor

This commit is contained in:
Victoria Brekenfeld 2023-08-04 08:44:43 +02:00 • committed by GitHub
commit 2729be8542
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

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,