andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-23 02:05:33 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

layer-shell: don't dismiss popups because of unmapped layer surfaces

Browse Source 
Fixes #1640
This commit is contained in:
alex-huff
2025-05-22 08:18:27 -05:00
committed by Ivan Molodetskikh
parent 357f9157cc
commit d618daf6b9
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/handlers/xdg_shell.rs
+6 -4
View File
@@ -334,9 +334,10 @@ impl XdgShellHandler for State {
// higher input priority. // higher input priority.
if layers.layers_on(Layer::Overlay).any(|l| { if layers.layers_on(Layer::Overlay).any(|l| {
l.cached_state().keyboard_interactivity (l.cached_state().keyboard_interactivity
== wlr_layer::KeyboardInteractivity::Exclusive == wlr_layer::KeyboardInteractivity::Exclusive
|| Some(l) == self.niri.layer_shell_on_demand_focus.as_ref() || Some(l) == self.niri.layer_shell_on_demand_focus.as_ref())
&& self.niri.mapped_layer_surfaces.contains_key(l)
}) { }) {
trace!("ignoring toplevel popup grab because the overlay layer has focus"); trace!("ignoring toplevel popup grab because the overlay layer has focus");
let _ = PopupManager::dismiss_popup(&root, &popup); let _ = PopupManager::dismiss_popup(&root, &popup);
@@ -346,9 +347,10 @@ impl XdgShellHandler for State {
let mon = self.niri.layout.monitor_for_output(output).unwrap(); let mon = self.niri.layout.monitor_for_output(output).unwrap();
if !mon.render_above_top_layer() if !mon.render_above_top_layer()
&& layers.layers_on(Layer::Top).any(|l| { && layers.layers_on(Layer::Top).any(|l| {
l.cached_state().keyboard_interactivity (l.cached_state().keyboard_interactivity
== wlr_layer::KeyboardInteractivity::Exclusive == wlr_layer::KeyboardInteractivity::Exclusive
|| Some(l) == self.niri.layer_shell_on_demand_focus.as_ref() || Some(l) == self.niri.layer_shell_on_demand_focus.as_ref())
&& self.niri.mapped_layer_surfaces.contains_key(l)
}) })
{ {
trace!("ignoring toplevel popup grab because the top layer has focus"); trace!("ignoring toplevel popup grab because the top layer has focus");