aboutsummaryrefslogtreecommitdiff
path: root/src/handlers
diff options
context:
space:
mode:
Diffstat (limited to 'src/handlers')
-rw-r--r--src/handlers/compositor.rs2
-rw-r--r--src/handlers/mod.rs1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/handlers/compositor.rs b/src/handlers/compositor.rs
index dec86929..4b080cd8 100644
--- a/src/handlers/compositor.rs
+++ b/src/handlers/compositor.rs
@@ -201,7 +201,9 @@ impl CompositorHandler for State {
let new_focus = self.niri.layout.focus().map(|m| &m.window);
if new_focus == Some(&window) {
+ // We activated the newly opened window.
self.maybe_warp_cursor_to_focus();
+ self.niri.layer_shell_on_demand_focus = None;
}
self.niri.queue_redraw(&output);
diff --git a/src/handlers/mod.rs b/src/handlers/mod.rs
index 5b59ec45..f8cf1832 100644
--- a/src/handlers/mod.rs
+++ b/src/handlers/mod.rs
@@ -317,6 +317,7 @@ impl ClientDndGrabHandler for State {
if let Some((mapped, _)) = self.niri.layout.find_window_and_output(root) {
let window = mapped.window.clone();
self.niri.layout.activate_window(&window);
+ self.niri.layer_shell_on_demand_focus = None;
activate_output = false;
}
}