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

layout: Synchronize unfullscreen view movement anim to resize

Browse Source 
Before this commit, maximize/fullscreen was synchronized, but
unmaximize/unfullscreen wasn't.
This commit is contained in:
Ivan Molodetskikh
2025-12-20 09:08:10 +03:00
parent 7d60231e35
commit 9b52465e42
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/layout/scrolling.rs
+5 -5
View File
@@ -1386,11 +1386,6 @@ impl<W: LayoutElement> ScrollingSpace<W> {
// We might need to move the view to ensure the resized window is still visible. But // We might need to move the view to ensure the resized window is still visible. But
// only do it when the view isn't frozen by an interactive resize or a view gesture. // only do it when the view isn't frozen by an interactive resize or a view gesture.
if self.interactive_resize.is_none() && !self.view_offset.is_gesture() { if self.interactive_resize.is_none() && !self.view_offset.is_gesture() {
// Restore the view offset upon unfullscreening if needed.
if let Some(prev_offset) = unfullscreen_offset {
self.animate_view_offset(col_idx, prev_offset);
}
// Synchronize the horizontal view movement with the resize so that it looks nice. // Synchronize the horizontal view movement with the resize so that it looks nice.
// This is especially important for always-centered view. // This is especially important for always-centered view.
let config = if ongoing_resize_anim { let config = if ongoing_resize_anim {
@@ -1399,6 +1394,11 @@ impl<W: LayoutElement> ScrollingSpace<W> {
self.options.animations.horizontal_view_movement.0 self.options.animations.horizontal_view_movement.0
}; };
// Restore the view offset upon unfullscreening if needed.
if let Some(prev_offset) = unfullscreen_offset {
self.animate_view_offset_with_config(col_idx, prev_offset, config);
}
// FIXME: we will want to skip the animation in some cases here to make continuously // FIXME: we will want to skip the animation in some cases here to make continuously
// resizing windows not look janky. // resizing windows not look janky.
self.animate_view_offset_to_column_with_config(None, col_idx, None, config); self.animate_view_offset_to_column_with_config(None, col_idx, None, config);