focused window still renders when active output changes

pop-os · Sep 3, 2024 · 8ffecba · 8ffecba
1 parent 33c6a7c
commit 8ffecba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/backend/render/mod.rs b/src/backend/render/mod.rs
@@ -660,7 +660,7 @@ where
         .lock()
         .unwrap()
         .is_some();
-    let active_output = last_active_seat.active_output();
+    let focused_output = last_active_seat.focused_or_active_output();
     let output_size = output.geometry().size;
     let output_scale = output.current_scale().fractional_scale();
 
@@ -670,7 +670,7 @@ where
         .iter()
         .find(|w| w.handle == current.0)
         .ok_or(OutputNoMode)?;
-    let is_active_space = workspace.outputs().any(|o| o == &active_output);
+    let is_active_space = workspace.outputs().any(|o| o == &focused_output);
 
     let has_fullscreen = workspace
         .fullscreen
@@ -775,7 +775,7 @@ where
                 .space_for_handle(&previous)
                 .ok_or(OutputNoMode)?;
             let has_fullscreen = workspace.fullscreen.is_some();
-            let is_active_space = workspace.outputs().any(|o| o == &active_output);
+            let is_active_space = workspace.outputs().any(|o| o == &focused_output);
 
             let percentage = match start {
                 WorkspaceDelta::Shortcut(st) => ease(

diff --git a/src/input/mod.rs b/src/input/mod.rs
@@ -616,7 +616,9 @@ impl State {
                         let (new_keyboard_target, _) =
                             shell.keyboard_target_from_position(position, &seat);
 
-                        if old_keyboard_target != new_keyboard_target {
+                        if old_keyboard_target != new_keyboard_target
+                            && new_keyboard_target.is_some()
+                        {
                             let create_source = if self.common.pointer_focus_state.is_none() {
                                 true
                             } else {