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

Preserve view offset for activate_prev_column_on_removal

Browse Source
This commit is contained in:
Ivan Molodetskikh
2024-03-10 08:51:58 +04:00
parent 40cec34aa4
commit 8c46611c29
1 changed files with 65 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/layout/workspace.rs
+65 -19
View File
@@ -70,7 +70,9 @@ pub struct Workspace<W: LayoutElement> {
/// Since we only create-and-activate columns immediately to the right of the active column (in /// Since we only create-and-activate columns immediately to the right of the active column (in
/// contrast to tabs in Firefox, for example), we can track this as a bool, rather than an /// contrast to tabs in Firefox, for example), we can track this as a bool, rather than an
/// index of the previous column to activate. /// index of the previous column to activate.
activate_prev_column_on_removal: bool, ///
/// The value is the view offset that the previous column had before, to restore it.
activate_prev_column_on_removal: Option<i32>,
/// Configurable properties of the layout. /// Configurable properties of the layout.
pub options: Rc<Options>, pub options: Rc<Options>,
@@ -96,6 +98,8 @@ struct ViewGesture {
current_view_offset: f64, current_view_offset: f64,
tracker: SwipeTracker, tracker: SwipeTracker,
delta_from_tracker: f64, delta_from_tracker: f64,
// The view offset we'll use if needed for activate_prev_column_on_removal.
static_view_offset: i32,
} }
/// Width of a column. /// Width of a column.
@@ -210,7 +214,7 @@ impl<W: LayoutElement> Workspace<W> {
active_column_idx: 0, active_column_idx: 0,
view_offset: 0, view_offset: 0,
view_offset_adj: None, view_offset_adj: None,
activate_prev_column_on_removal: false, activate_prev_column_on_removal: None,
options, options,
} }
} }
@@ -225,7 +229,7 @@ impl<W: LayoutElement> Workspace<W> {
active_column_idx: 0, active_column_idx: 0,
view_offset: 0, view_offset: 0,
view_offset_adj: None, view_offset_adj: None,
activate_prev_column_on_removal: false, activate_prev_column_on_removal: None,
options, options,
} }
} }
@@ -536,7 +540,7 @@ impl<W: LayoutElement> Workspace<W> {
self.active_column_idx = idx; self.active_column_idx = idx;
// A different column was activated; reset the flag. // A different column was activated; reset the flag.
self.activate_prev_column_on_removal = false; self.activate_prev_column_on_removal = None;
} }
pub fn has_windows(&self) -> bool { pub fn has_windows(&self) -> bool {
@@ -615,8 +619,10 @@ impl<W: LayoutElement> Workspace<W> {
self.view_offset_adj = None; self.view_offset_adj = None;
} }
let prev_offset = (!was_empty).then(|| self.static_view_offset());
self.activate_column(idx); self.activate_column(idx);
self.activate_prev_column_on_removal = true; self.activate_prev_column_on_removal = prev_offset;
} }
} }
@@ -648,8 +654,9 @@ impl<W: LayoutElement> Workspace<W> {
// Activate the new window if right_of was active. // Activate the new window if right_of was active.
if self.active_column_idx == right_of_idx { if self.active_column_idx == right_of_idx {
let prev_offset = self.static_view_offset();
self.activate_column(idx); self.activate_column(idx);
self.activate_prev_column_on_removal = true; self.activate_prev_column_on_removal = Some(prev_offset);
} else if idx <= self.active_column_idx { } else if idx <= self.active_column_idx {
self.active_column_idx += 1; self.active_column_idx += 1;
} }
@@ -687,8 +694,10 @@ impl<W: LayoutElement> Workspace<W> {
self.view_offset_adj = None; self.view_offset_adj = None;
} }
let prev_offset = (!was_empty).then(|| self.static_view_offset());
self.activate_column(idx); self.activate_column(idx);
self.activate_prev_column_on_removal = true; self.activate_prev_column_on_removal = prev_offset;
} }
} }
@@ -705,7 +714,7 @@ impl<W: LayoutElement> Workspace<W> {
if column_idx + 1 == self.active_column_idx { if column_idx + 1 == self.active_column_idx {
// The previous column, that we were going to activate upon removal of the active // The previous column, that we were going to activate upon removal of the active
// column, has just been itself removed. // column, has just been itself removed.
self.activate_prev_column_on_removal = false; self.activate_prev_column_on_removal = None;
} }
// FIXME: activate_column below computes current view position to compute the new view // FIXME: activate_column below computes current view position to compute the new view
@@ -716,13 +725,25 @@ impl<W: LayoutElement> Workspace<W> {
return window; return window;
} }
if self.active_column_idx > column_idx if column_idx < self.active_column_idx {
|| (self.active_column_idx == column_idx && self.activate_prev_column_on_removal)
{
// A column to the left was removed; preserve the current position. // A column to the left was removed; preserve the current position.
// FIXME: preserve activate_prev_column_on_removal. // FIXME: preserve activate_prev_column_on_removal.
// Or, the active column was removed, and we needed to activate the previous column. self.activate_column(self.active_column_idx - 1);
self.activate_column(self.active_column_idx.saturating_sub(1)); } else if column_idx == self.active_column_idx
&& self.activate_prev_column_on_removal.is_some()
{
// The active column was removed, and we needed to activate the previous column.
if 0 < column_idx {
let prev_offset = self.activate_prev_column_on_removal.unwrap();
self.activate_column(self.active_column_idx - 1);
// Restore the view offset but make sure to scroll the view in case the
// previous window had resized.
let current_x = self.view_pos();
self.animate_view_offset(current_x, self.active_column_idx, prev_offset);
self.animate_view_offset_to_column(current_x, self.active_column_idx, None);
}
} else { } else {
self.activate_column(min(self.active_column_idx, self.columns.len() - 1)); self.activate_column(min(self.active_column_idx, self.columns.len() - 1));
} }
@@ -748,7 +769,7 @@ impl<W: LayoutElement> Workspace<W> {
if column_idx + 1 == self.active_column_idx { if column_idx + 1 == self.active_column_idx {
// The previous column, that we were going to activate upon removal of the active // The previous column, that we were going to activate upon removal of the active
// column, has just been itself removed. // column, has just been itself removed.
self.activate_prev_column_on_removal = false; self.activate_prev_column_on_removal = None;
} }
// FIXME: activate_column below computes current view position to compute the new view // FIXME: activate_column below computes current view position to compute the new view
@@ -758,13 +779,25 @@ impl<W: LayoutElement> Workspace<W> {
return column; return column;
} }
if self.active_column_idx > column_idx if column_idx < self.active_column_idx {
|| (self.active_column_idx == column_idx && self.activate_prev_column_on_removal)
{
// A column to the left was removed; preserve the current position. // A column to the left was removed; preserve the current position.
// FIXME: preserve activate_prev_column_on_removal. // FIXME: preserve activate_prev_column_on_removal.
// Or, the active column was removed, and we needed to activate the previous column. self.activate_column(self.active_column_idx - 1);
self.activate_column(self.active_column_idx.saturating_sub(1)); } else if column_idx == self.active_column_idx
&& self.activate_prev_column_on_removal.is_some()
{
// The active column was removed, and we needed to activate the previous column.
if 0 < column_idx {
let prev_offset = self.activate_prev_column_on_removal.unwrap();
self.activate_column(self.active_column_idx - 1);
// Restore the view offset but make sure to scroll the view in case the
// previous window had resized.
let current_x = self.view_pos();
self.animate_view_offset(current_x, self.active_column_idx, prev_offset);
self.animate_view_offset_to_column(current_x, self.active_column_idx, None);
}
} else { } else {
self.activate_column(min(self.active_column_idx, self.columns.len() - 1)); self.activate_column(min(self.active_column_idx, self.columns.len() - 1));
} }
@@ -1040,6 +1073,18 @@ impl<W: LayoutElement> Workspace<W> {
self.column_x(self.active_column_idx) + self.view_offset self.column_x(self.active_column_idx) + self.view_offset
} }
/// Returns a view offset value suitable for saving and later restoration.
///
/// This means that it shouldn't return an in-progress animation or gesture value.
fn static_view_offset(&self) -> i32 {
match &self.view_offset_adj {
// For animations we can return the final value.
Some(ViewOffsetAdjustment::Animation(anim)) => anim.to().round() as i32,
Some(ViewOffsetAdjustment::Gesture(gesture)) => gesture.static_view_offset,
_ => self.view_offset,
}
}
fn tiles_in_render_order(&self) -> impl Iterator<Item = (&'_ Tile<W>, Point<i32, Logical>)> { fn tiles_in_render_order(&self) -> impl Iterator<Item = (&'_ Tile<W>, Point<i32, Logical>)> {
let view_pos = self.visual_column_x(self.active_column_idx) + self.view_offset; let view_pos = self.visual_column_x(self.active_column_idx) + self.view_offset;
@@ -1240,6 +1285,7 @@ impl<W: LayoutElement> Workspace<W> {
current_view_offset: self.view_offset as f64, current_view_offset: self.view_offset as f64,
tracker: SwipeTracker::new(), tracker: SwipeTracker::new(),
delta_from_tracker: self.view_offset as f64, delta_from_tracker: self.view_offset as f64,
static_view_offset: self.static_view_offset(),
}; };
self.view_offset_adj = Some(ViewOffsetAdjustment::Gesture(gesture)); self.view_offset_adj = Some(ViewOffsetAdjustment::Gesture(gesture));
} }