From 924e21f69b4f0a59e83637f2ba04ba1ef2360beb Mon Sep 17 00:00:00 2001
From: Ivan Molodetskikh <yalterz@gmail.com>
Date: Wed, 14 Feb 2024 09:06:13 +0400
Subject: Focus output unconditionally after moving window there

Fixes output not getting focus if there was no window to move.
---
 src/input.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src')

diff --git a/src/input.rs b/src/input.rs
index 6c49ecdd..d59b020f 100644
--- a/src/input.rs
+++ b/src/input.rs
@@ -587,48 +587,56 @@ impl State {
             Action::MoveWindowToMonitorLeft => {
                 if let Some(output) = self.niri.output_left() {
                     self.niri.layout.move_to_output(&output);
+                    self.niri.layout.focus_output(&output);
                     self.move_cursor_to_output(&output);
                 }
             }
             Action::MoveWindowToMonitorRight => {
                 if let Some(output) = self.niri.output_right() {
                     self.niri.layout.move_to_output(&output);
+                    self.niri.layout.focus_output(&output);
                     self.move_cursor_to_output(&output);
                 }
             }
             Action::MoveWindowToMonitorDown => {
                 if let Some(output) = self.niri.output_down() {
                     self.niri.layout.move_to_output(&output);
+                    self.niri.layout.focus_output(&output);
                     self.move_cursor_to_output(&output);
                 }
             }
             Action::MoveWindowToMonitorUp => {
                 if let Some(output) = self.niri.output_up() {
                     self.niri.layout.move_to_output(&output);
+                    self.niri.layout.focus_output(&output);
                     self.move_cursor_to_output(&output);
                 }
             }
             Action::MoveColumnToMonitorLeft => {
                 if let Some(output) = self.niri.output_left() {
                     self.niri.layout.move_column_to_output(&output);
+                    self.niri.layout.focus_output(&output);
                     self.move_cursor_to_output(&output);
                 }
             }
             Action::MoveColumnToMonitorRight => {
                 if let Some(output) = self.niri.output_right() {
                     self.niri.layout.move_column_to_output(&output);
+                    self.niri.layout.focus_output(&output);
                     self.move_cursor_to_output(&output);
                 }
             }
             Action::MoveColumnToMonitorDown => {
                 if let Some(output) = self.niri.output_down() {
                     self.niri.layout.move_column_to_output(&output);
+                    self.niri.layout.focus_output(&output);
                     self.move_cursor_to_output(&output);
                 }
             }
             Action::MoveColumnToMonitorUp => {
                 if let Some(output) = self.niri.output_up() {
                     self.niri.layout.move_column_to_output(&output);
+                    self.niri.layout.focus_output(&output);
                     self.move_cursor_to_output(&output);
                 }
             }
-- 
cgit