aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIvan Molodetskikh <yalterz@gmail.com>2024-12-01 22:27:40 +0300
committerIvan Molodetskikh <yalterz@gmail.com>2024-12-01 22:24:21 -0800
commit91a42fdf58528f20615d83e85739835785da9506 (patch)
tree125dd2ccda32eda5f5058b06a239dd52c4a0a8b6 /src
parent5ed5243be657bf31a5f83290aa6ba4cebce83ffd (diff)
downloadniri-91a42fdf58528f20615d83e85739835785da9506.tar.gz
niri-91a42fdf58528f20615d83e85739835785da9506.tar.bz2
niri-91a42fdf58528f20615d83e85739835785da9506.zip
layout: Fix windows on other workspaces losing activated state
This erroneous check was introduced in interactive move.
Diffstat (limited to 'src')
-rw-r--r--src/layout/mod.rs10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/layout/mod.rs b/src/layout/mod.rs
index bfe7282b..cb4bd6f2 100644
--- a/src/layout/mod.rs
+++ b/src/layout/mod.rs
@@ -3692,14 +3692,10 @@ impl<W: LayoutElement> Layout<W> {
..
} => {
for (idx, mon) in monitors.iter_mut().enumerate() {
- let is_active = self.is_active && idx == *active_monitor_idx;
+ let is_active = self.is_active
+ && idx == *active_monitor_idx
+ && !matches!(self.interactive_move, Some(InteractiveMoveState::Moving(_)));
for (ws_idx, ws) in mon.workspaces.iter_mut().enumerate() {
- let is_active = is_active
- && ws_idx == mon.active_workspace_idx
- && !matches!(
- self.interactive_move,
- Some(InteractiveMoveState::Moving(_))
- );
ws.refresh(is_active);
// Cancel the view offset gesture after workspace switches, moves, etc.