aboutsummaryrefslogtreecommitdiff
path: root/src/layout
diff options
context:
space:
mode:
authorIvan Molodetskikh <yalterz@gmail.com>2025-02-15 13:23:01 +0300
committerIvan Molodetskikh <yalterz@gmail.com>2025-02-15 13:28:57 +0300
commitd94fbe98952af12b639489f8bba70a4532a18a7b (patch)
tree2a1e1b546accaca805e308d501f1616d8c3db357 /src/layout
parent7816f20e6a3ddc4057aa1ab35742dc7f67453bc2 (diff)
downloadniri-d94fbe98952af12b639489f8bba70a4532a18a7b.tar.gz
niri-d94fbe98952af12b639489f8bba70a4532a18a7b.tar.bz2
niri-d94fbe98952af12b639489f8bba70a4532a18a7b.zip
layout: Check move output in are_animations_ongoing()
Diffstat (limited to 'src/layout')
-rw-r--r--src/layout/mod.rs7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/layout/mod.rs b/src/layout/mod.rs
index bdddf462..baa22285 100644
--- a/src/layout/mod.rs
+++ b/src/layout/mod.rs
@@ -2535,8 +2535,11 @@ impl<W: LayoutElement> Layout<W> {
pub fn are_animations_ongoing(&self, output: Option<&Output>) -> bool {
if let Some(InteractiveMoveState::Moving(move_)) = &self.interactive_move {
- if move_.tile.are_animations_ongoing() {
- return true;
+ #[allow(clippy::collapsible_if)]
+ if output.map_or(true, |output| *output == move_.output) {
+ if move_.tile.are_animations_ongoing() {
+ return true;
+ }
}
}