diff options
| author | Ivan Molodetskikh <yalterz@gmail.com> | 2024-12-28 10:13:30 +0300 |
|---|---|---|
| committer | Ivan Molodetskikh <yalterz@gmail.com> | 2024-12-30 20:12:37 +0300 |
| commit | ad50dd21fea1912b9e21fb66a22fce517dac3aee (patch) | |
| tree | 20d7f1a1d6db2a843a33a551d5895bcc86cf0f38 /src/layout/mod.rs | |
| parent | 8b0cb0bb57112bd15bc7ac04e6952d857dadcbca (diff) | |
| download | niri-ad50dd21fea1912b9e21fb66a22fce517dac3aee.tar.gz niri-ad50dd21fea1912b9e21fb66a22fce517dac3aee.tar.bz2 niri-ad50dd21fea1912b9e21fb66a22fce517dac3aee.zip | |
Add move-window-to-floating/tiling actions
Diffstat (limited to 'src/layout/mod.rs')
| -rw-r--r-- | src/layout/mod.rs | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/src/layout/mod.rs b/src/layout/mod.rs index acdf1301..53c9ce6b 100644 --- a/src/layout/mod.rs +++ b/src/layout/mod.rs @@ -2703,6 +2703,32 @@ impl<W: LayoutElement> Layout<W> { workspace.toggle_window_floating(window); } + pub fn set_window_floating(&mut self, window: Option<&W::Id>, floating: bool) { + if let Some(InteractiveMoveState::Moving(move_)) = &mut self.interactive_move { + if window.is_none() || window == Some(move_.tile.window().id()) { + if move_.is_floating != floating { + self.toggle_window_floating(window); + } + return; + } + } + + let workspace = if let Some(window) = window { + Some( + self.workspaces_mut() + .find(|ws| ws.has_window(window)) + .unwrap(), + ) + } else { + self.active_workspace_mut() + }; + + let Some(workspace) = workspace else { + return; + }; + workspace.set_window_floating(window, floating); + } + pub fn switch_focus_floating_tiling(&mut self) { let Some(workspace) = self.active_workspace_mut() else { return; @@ -4362,6 +4388,11 @@ mod tests { #[proptest(strategy = "proptest::option::of(1..=5usize)")] id: Option<usize>, }, + SetWindowFloating { + #[proptest(strategy = "proptest::option::of(1..=5usize)")] + id: Option<usize>, + floating: bool, + }, SwitchFocusFloatingTiling, SetParent { #[proptest(strategy = "1..=5usize")] @@ -4874,6 +4905,10 @@ mod tests { let id = id.filter(|id| layout.has_window(id)); layout.toggle_window_floating(id.as_ref()); } + Op::SetWindowFloating { id, floating } => { + let id = id.filter(|id| layout.has_window(id)); + layout.set_window_floating(id.as_ref(), floating); + } Op::SwitchFocusFloatingTiling => { layout.switch_focus_floating_tiling(); } |
