diff options
| author | Brooks J Rady <b.j.rady@gmail.com> | 2021-04-13 18:14:13 +0100 |
|---|---|---|
| committer | Brooks J Rady <b.j.rady@gmail.com> | 2021-04-13 18:14:13 +0100 |
| commit | 6f4dcfbf65f522b318ebd359df5658a72b618392 (patch) | |
| tree | d4b1591be1139a4b67d3d4f0b340a133a27ba189 /src/client/tab.rs | |
| parent | fix(ci): unbreak things (diff) | |
| download | sl0ppij-6f4dcfbf65f522b318ebd359df5658a72b618392.tar.gz sl0ppij-6f4dcfbf65f522b318ebd359df5658a72b618392.tar.xz sl0ppij-6f4dcfbf65f522b318ebd359df5658a72b618392.zip | |
fix(clippy): get ci passing again
Diffstat (limited to 'src/client/tab.rs')
| -rw-r--r-- | src/client/tab.rs | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/src/client/tab.rs b/src/client/tab.rs index 9cafdcec..07e0f042 100644 --- a/src/client/tab.rs +++ b/src/client/tab.rs @@ -205,6 +205,7 @@ pub trait Pane { impl Tab { // FIXME: Too many arguments here! Maybe bundle all of the senders for the whole program in a struct? + #[allow(clippy::too_many_arguments)] pub fn new( index: usize, position: usize, @@ -1720,24 +1721,22 @@ impl Tab { // this is not ideal but until we get rid of expansion_boundary, it's a necessity self.toggle_active_pane_fullscreen(); } - match PaneResizer::new(&mut self.panes, &mut self.os_api) - .resize(self.full_screen_ws, new_screen_size) + if let Some((column_difference, row_difference)) = + PaneResizer::new(&mut self.panes, &mut self.os_api) + .resize(self.full_screen_ws, new_screen_size) { - Some((column_difference, row_difference)) => { - self.should_clear_display_before_rendering = true; - self.expansion_boundary.as_mut().map(|expansion_boundary| { - // TODO: this is not always accurate - expansion_boundary.columns = - (expansion_boundary.columns as isize + column_difference) as usize; - expansion_boundary.rows = - (expansion_boundary.rows as isize + row_difference) as usize; - }); - self.full_screen_ws.columns = - (self.full_screen_ws.columns as isize + column_difference) as usize; - self.full_screen_ws.rows = - (self.full_screen_ws.rows as isize + row_difference) as usize; - } - None => {} + self.should_clear_display_before_rendering = true; + if let Some(expansion_boundary) = self.expansion_boundary.as_mut() { + // TODO: this is not always accurate + expansion_boundary.columns = + (expansion_boundary.columns as isize + column_difference) as usize; + expansion_boundary.rows = + (expansion_boundary.rows as isize + row_difference) as usize; + }; + self.full_screen_ws.columns = + (self.full_screen_ws.columns as isize + column_difference) as usize; + self.full_screen_ws.rows = + (self.full_screen_ws.rows as isize + row_difference) as usize; }; } pub fn resize_left(&mut self) { |
