Epsilon_02/niri
1
0
Fork 0
mirror of https://github.com/YaLTeR/niri.git synced 2025-10-06 00:23:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

layout: Rename update_interactive_resize() to on_commit()

Browse Source
This commit is contained in:
Ivan Molodetskikh
2024-12-18 10:38:02 +03:00
parent 421cd89a0f
commit 38350935e6
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
niri-visual-tests/src/test_window.rs
View File

@@ -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

2
src/layout/floating.rs
View File

@@ -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;

5
src/layout/mod.rs
View File

@@ -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

2
src/layout/scrolling.rs
View File

@@ -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;

10
src/window/mapped.rs
View File

@@ -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())
}
}