diff options
| author | Ivan Molodetskikh <yalterz@gmail.com> | 2024-12-04 22:08:47 +0300 |
|---|---|---|
| committer | Ivan Molodetskikh <yalterz@gmail.com> | 2024-12-07 19:38:48 +0300 |
| commit | a2b27b8790e5e09edeb9933a785f4272efcb1734 (patch) | |
| tree | ee7a30f9570bb60ef97d4aa6b6281ece396bfbd2 /src/layout | |
| parent | 396089ef0e9c8722876d5ed870021ddbce4ae31f (diff) | |
| download | niri-a2b27b8790e5e09edeb9933a785f4272efcb1734.tar.gz niri-a2b27b8790e5e09edeb9933a785f4272efcb1734.tar.bz2 niri-a2b27b8790e5e09edeb9933a785f4272efcb1734.zip | |
layout: Ignore more actions during interactive move
The interactively moved window is the active window, so this makes sense.
Diffstat (limited to 'src/layout')
| -rw-r--r-- | src/layout/mod.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/layout/mod.rs b/src/layout/mod.rs index 53248d75..7c573273 100644 --- a/src/layout/mod.rs +++ b/src/layout/mod.rs @@ -1664,7 +1664,7 @@ impl<W: LayoutElement> Layout<W> { pub fn consume_or_expel_window_left(&mut self, window: Option<&W::Id>) { if let Some(InteractiveMoveState::Moving(move_)) = &mut self.interactive_move { - if window == Some(move_.tile.window().id()) { + if window.is_none() || window == Some(move_.tile.window().id()) { return; } } @@ -1687,7 +1687,7 @@ impl<W: LayoutElement> Layout<W> { pub fn consume_or_expel_window_right(&mut self, window: Option<&W::Id>) { if let Some(InteractiveMoveState::Moving(move_)) = &mut self.interactive_move { - if window == Some(move_.tile.window().id()) { + if window.is_none() || window == Some(move_.tile.window().id()) { return; } } @@ -1866,7 +1866,7 @@ impl<W: LayoutElement> Layout<W> { pub fn move_to_workspace(&mut self, window: Option<&W::Id>, idx: usize) { if let Some(InteractiveMoveState::Moving(move_)) = &mut self.interactive_move { - if window == Some(move_.tile.window().id()) { + if window.is_none() || window == Some(move_.tile.window().id()) { return; } } @@ -2516,7 +2516,7 @@ impl<W: LayoutElement> Layout<W> { pub fn toggle_window_height(&mut self, window: Option<&W::Id>) { if let Some(InteractiveMoveState::Moving(move_)) = &mut self.interactive_move { - if window == Some(move_.tile.window().id()) { + if window.is_none() || window == Some(move_.tile.window().id()) { return; } } @@ -2553,7 +2553,7 @@ impl<W: LayoutElement> Layout<W> { pub fn set_window_height(&mut self, window: Option<&W::Id>, change: SizeChange) { if let Some(InteractiveMoveState::Moving(move_)) = &mut self.interactive_move { - if window == Some(move_.tile.window().id()) { + if window.is_none() || window == Some(move_.tile.window().id()) { return; } } @@ -2576,7 +2576,7 @@ impl<W: LayoutElement> Layout<W> { pub fn reset_window_height(&mut self, window: Option<&W::Id>) { if let Some(InteractiveMoveState::Moving(move_)) = &mut self.interactive_move { - if window == Some(move_.tile.window().id()) { + if window.is_none() || window == Some(move_.tile.window().id()) { return; } } @@ -2620,7 +2620,7 @@ impl<W: LayoutElement> Layout<W> { target_ws_idx: Option<usize>, ) { if let Some(InteractiveMoveState::Moving(move_)) = &mut self.interactive_move { - if window == Some(move_.tile.window().id()) { + if window.is_none() || window == Some(move_.tile.window().id()) { return; } } |