andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-21 02:01:55 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

layout: Ignore more actions during interactive move

Browse Source 
The interactively moved window is the active window, so this makes sense.
This commit is contained in:
Ivan Molodetskikh
2024-12-04 22:08:47 +03:00
parent 396089ef0e
commit a2b27b8790
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/layout/mod.rs
+7 -7
View File
@@ -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;
}
}