diff options
Diffstat (limited to 'src/layout')
| -rw-r--r-- | src/layout/mod.rs | 16 | ||||
| -rw-r--r-- | src/layout/workspace.rs | 31 |
2 files changed, 47 insertions, 0 deletions
diff --git a/src/layout/mod.rs b/src/layout/mod.rs index ab7d7ec6..fadde1fb 100644 --- a/src/layout/mod.rs +++ b/src/layout/mod.rs @@ -947,6 +947,22 @@ impl<W: LayoutElement> Layout<W> { } } + pub fn scroll_amount_to_activate(&self, window: &W::Id) -> f64 { + let MonitorSet::Normal { monitors, .. } = &self.monitor_set else { + return 0.; + }; + + for mon in monitors { + for ws in &mon.workspaces { + if ws.has_window(window) { + return ws.scroll_amount_to_activate(window); + } + } + } + + 0. + } + pub fn activate_window(&mut self, window: &W::Id) { let MonitorSet::Normal { monitors, diff --git a/src/layout/workspace.rs b/src/layout/workspace.rs index c5ddfd21..625f4d5c 100644 --- a/src/layout/workspace.rs +++ b/src/layout/workspace.rs @@ -1391,6 +1391,37 @@ impl<W: LayoutElement> Workspace<W> { } } + pub fn scroll_amount_to_activate(&self, window: &W::Id) -> f64 { + let column_idx = self + .columns + .iter() + .position(|col| col.contains(window)) + .unwrap(); + + if self.active_column_idx == column_idx { + return 0.; + } + + let current_x = self.view_pos(); + let new_view_offset = self.compute_new_view_offset_for_column( + current_x, + column_idx, + Some(self.active_column_idx), + ); + + // Consider the end of an ongoing animation because that's what compute to fit does too. + let final_x = if let Some(ViewOffsetAdjustment::Animation(anim)) = &self.view_offset_adj { + current_x - self.view_offset + anim.to() + } else { + current_x + }; + + let new_col_x = self.column_x(column_idx); + let from_view_offset = final_x - new_col_x; + + (from_view_offset - new_view_offset).abs() / self.working_area.size.w + } + pub fn activate_window(&mut self, window: &W::Id) { let column_idx = self .columns |