diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/layout/floating.rs | 14 | ||||
| -rw-r--r-- | src/layout/tile.rs | 5 | ||||
| -rw-r--r-- | src/layout/workspace.rs | 19 | ||||
| -rw-r--r-- | src/window/mod.rs | 12 |
4 files changed, 39 insertions, 11 deletions
diff --git a/src/layout/floating.rs b/src/layout/floating.rs index af208615..d40d1b17 100644 --- a/src/layout/floating.rs +++ b/src/layout/floating.rs @@ -415,12 +415,14 @@ impl<W: LayoutElement> FloatingSpace<W> { } } - let pos = tile - .floating_pos - .map(|pos| self.scale_by_working_area(pos)) - .unwrap_or_else(|| { - center_preferring_top_left_in_area(self.working_area, tile.tile_size()) - }); + let pos = tile.floating_pos.map(|pos| self.scale_by_working_area(pos)); + let pos = pos.or_else(|| { + tile.default_floating_logical_pos() + .map(|pos| pos + self.working_area.loc) + }); + let pos = pos.unwrap_or_else(|| { + center_preferring_top_left_in_area(self.working_area, tile.tile_size()) + }); let data = Data::new(self.working_area, &tile, pos); self.data.insert(idx, data); diff --git a/src/layout/tile.rs b/src/layout/tile.rs index 96936d26..d0750d33 100644 --- a/src/layout/tile.rs +++ b/src/layout/tile.rs @@ -999,6 +999,11 @@ impl<W: LayoutElement> Tile<W> { &self.options } + pub fn default_floating_logical_pos(&self) -> Option<Point<f64, Logical>> { + let pos = self.window().rules().default_floating_position?; + Some(Point::from((pos.x.0, pos.y.0))) + } + #[cfg(test)] pub fn view_size(&self) -> Size<f64, Logical> { self.view_size diff --git a/src/layout/workspace.rs b/src/layout/workspace.rs index e67b4e76..aef7203b 100644 --- a/src/layout/workspace.rs +++ b/src/layout/workspace.rs @@ -1123,7 +1123,9 @@ impl<W: LayoutElement> Workspace<W> { removed.tile.stop_move_animations(); // Come up with a default floating position close to the tile position. - if removed.tile.floating_pos.is_none() { + if removed.tile.floating_pos.is_none() + && removed.tile.default_floating_logical_pos().is_none() + { let offset = if self.options.center_focused_column == CenterFocusedColumn::Always { Point::from((0., 0.)) } else { @@ -1214,17 +1216,26 @@ impl<W: LayoutElement> Workspace<W> { }; let working_area_loc = self.floating.working_area().loc; + let pos = tile + .floating_pos + .map(|pos| self.floating.scale_by_working_area(pos)); + let pos = pos.or_else(|| { + tile.default_floating_logical_pos() + .map(|pos| pos + working_area_loc) + }); + // If there's no stored floating position, we can only set both components at once, not // adjust. - let Some(pos) = tile.floating_pos.or_else(|| { + let pos = pos.or_else(|| { (matches!(x, PositionChange::SetFixed(_)) && matches!(y, PositionChange::SetFixed(_))) .then_some(Point::default()) - }) else { + }); + + let Some(mut pos) = pos else { return; }; - let mut pos = self.floating.scale_by_working_area(pos); match x { PositionChange::SetFixed(x) => pos.x = x + working_area_loc.x, PositionChange::AdjustFixed(x) => pos.x += x, diff --git a/src/window/mod.rs b/src/window/mod.rs index 1cf576df..868620f0 100644 --- a/src/window/mod.rs +++ b/src/window/mod.rs @@ -1,6 +1,8 @@ use std::cmp::{max, min}; -use niri_config::{BlockOutFrom, BorderRule, CornerRadius, Match, PresetSize, WindowRule}; +use niri_config::{ + BlockOutFrom, BorderRule, CornerRadius, FoIPosition, Match, PresetSize, WindowRule, +}; use smithay::reexports::wayland_protocols::xdg::shell::server::xdg_toplevel; use smithay::utils::{Logical, Size}; use smithay::wayland::compositor::with_states; @@ -41,6 +43,9 @@ pub struct ResolvedWindowRules { /// - `Some(Some(width))`: set to a particular height. pub default_height: Option<Option<PresetSize>>, + /// Default floating position for this window. + pub default_floating_position: Option<FoIPosition>, + /// Output to open this window on. pub open_on_output: Option<String>, @@ -137,6 +142,7 @@ impl ResolvedWindowRules { Self { default_width: None, default_height: None, + default_floating_position: None, open_on_output: None, open_on_workspace: None, open_maximized: None, @@ -219,6 +225,10 @@ impl ResolvedWindowRules { resolved.default_height = Some(x.0); } + if let Some(x) = rule.default_floating_position { + resolved.default_floating_position = Some(x); + } + if let Some(x) = rule.open_on_output.as_deref() { open_on_output = Some(x); } |