diff options
| -rw-r--r-- | niri-visual-tests/src/test_window.rs | 2 | ||||
| -rw-r--r-- | src/layout/floating.rs | 2 | ||||
| -rw-r--r-- | src/layout/mod.rs | 5 | ||||
| -rw-r--r-- | src/layout/scrolling.rs | 2 | ||||
| -rw-r--r-- | src/window/mapped.rs | 10 |
5 files changed, 11 insertions, 10 deletions
diff --git a/niri-visual-tests/src/test_window.rs b/niri-visual-tests/src/test_window.rs index 8de4f24a..896ac5ea 100644 --- a/niri-visual-tests/src/test_window.rs +++ b/niri-visual-tests/src/test_window.rs @@ -263,7 +263,7 @@ impl LayoutElement for TestWindow { fn cancel_interactive_resize(&mut self) {} - fn update_interactive_resize(&mut self, _serial: Serial) {} + fn on_commit(&mut self, _serial: Serial) {} fn interactive_resize_data(&self) -> Option<InteractiveResizeData> { None diff --git a/src/layout/floating.rs b/src/layout/floating.rs index 2d7d0457..ee9c7013 100644 --- a/src/layout/floating.rs +++ b/src/layout/floating.rs @@ -752,7 +752,7 @@ impl<W: LayoutElement> FloatingSpace<W> { // Do this before calling update_window() so it can get up-to-date info. if let Some(serial) = serial { - tile.window_mut().update_interactive_resize(serial); + tile.window_mut().on_commit(serial); } let prev_size = data.size; diff --git a/src/layout/mod.rs b/src/layout/mod.rs index 9f43b963..7378aa60 100644 --- a/src/layout/mod.rs +++ b/src/layout/mod.rs @@ -198,8 +198,9 @@ pub trait LayoutElement { fn set_interactive_resize(&mut self, data: Option<InteractiveResizeData>); fn cancel_interactive_resize(&mut self); - fn update_interactive_resize(&mut self, serial: Serial); fn interactive_resize_data(&self) -> Option<InteractiveResizeData>; + + fn on_commit(&mut self, serial: Serial); } #[derive(Debug)] @@ -4076,7 +4077,7 @@ mod tests { fn cancel_interactive_resize(&mut self) {} - fn update_interactive_resize(&mut self, _serial: Serial) {} + fn on_commit(&mut self, _serial: Serial) {} fn interactive_resize_data(&self) -> Option<InteractiveResizeData> { None diff --git a/src/layout/scrolling.rs b/src/layout/scrolling.rs index ee4378a3..1fe8cc34 100644 --- a/src/layout/scrolling.rs +++ b/src/layout/scrolling.rs @@ -1071,7 +1071,7 @@ impl<W: LayoutElement> ScrollingSpace<W> { // Do this before calling update_window() so it can get up-to-date info. if let Some(serial) = serial { - tile.window_mut().update_interactive_resize(serial); + tile.window_mut().on_commit(serial); } let prev_width = self.data[col_idx].width; diff --git a/src/window/mapped.rs b/src/window/mapped.rs index d895356a..a86d7f00 100644 --- a/src/window/mapped.rs +++ b/src/window/mapped.rs @@ -766,7 +766,11 @@ impl LayoutElement for Mapped { self.interactive_resize = None; } - fn update_interactive_resize(&mut self, commit_serial: Serial) { + fn interactive_resize_data(&self) -> Option<InteractiveResizeData> { + Some(self.interactive_resize.as_ref()?.data()) + } + + fn on_commit(&mut self, commit_serial: Serial) { if let Some(InteractiveResize::WaitingForLastCommit { serial, .. }) = &self.interactive_resize { @@ -775,8 +779,4 @@ impl LayoutElement for Mapped { } } } - - fn interactive_resize_data(&self) -> Option<InteractiveResizeData> { - Some(self.interactive_resize.as_ref()?.data()) - } } |