zellij-org/zellij
1
1
Fork 0
mirror of https://github.com/zellij-org/zellij.git synced 2024-12-24 17:53:36 +03:00
Code Issues Projects Releases Wiki Activity

refactor(boundaries): dynamic => static dispatch

Browse Source
This commit is contained in:
Aram Drevekenin 2020-10-13 18:44:01 +02:00
parent c652a09ae7
commit 82e7f3db44
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/boundaries.rs
View File

@ -160,7 +160,7 @@ impl Boundaries {
boundary_characters: HashMap::new(),
}
}
pub fn add_rect(&mut self, rect: &dyn Rect) {
pub fn add_rect<R: Rect>(&mut self, rect: &R) {
if self.rect_right_boundary_is_before_screen_edge(rect) {
// let boundary_x_coords = self.rect_right_boundary_x_coords(rect);
let boundary_x_coords = rect.right_boundary_x_coords();
@ -208,25 +208,25 @@ impl Boundaries {
}
vte_output
}
fn rect_right_boundary_is_before_screen_edge (&self, rect: &dyn Rect) -> bool {
fn rect_right_boundary_is_before_screen_edge <R: Rect>(&self, rect: &R) -> bool {
rect.x() + rect.columns() < self.columns
}
fn rect_bottom_boundary_is_before_screen_edge(&self, rect: &dyn Rect) -> bool {
fn rect_bottom_boundary_is_before_screen_edge<R: Rect>(&self, rect: &R) -> bool {
rect.y() + rect.rows() < self.rows
}
fn rect_right_boundary_row_start(&self, rect: &dyn Rect) -> usize {
fn rect_right_boundary_row_start<R: Rect>(&self, rect: &R) -> usize {
if rect.y() == 0 { 0 } else { rect.y() - 1 }
}
fn rect_right_boundary_row_end(&self, rect: &dyn Rect) -> usize {
fn rect_right_boundary_row_end<R: Rect>(&self, rect: &R) -> usize {
let rect_bottom_row = rect.y() + rect.rows();
// we do this because unless we're on the screen edge, we'd like to go one extra row to
// connect to whatever boundary is beneath us
if rect_bottom_row == self.rows { rect_bottom_row } else { rect_bottom_row + 1 }
}
fn rect_bottom_boundary_col_start(&self, rect: &dyn Rect) -> usize {
fn rect_bottom_boundary_col_start<R: Rect>(&self, rect: &R) -> usize {
if rect.x() == 0 { 0 } else { rect.x() - 1 }
}
fn rect_bottom_boundary_col_end(&self, rect: &dyn Rect) -> usize {
fn rect_bottom_boundary_col_end<R: Rect>(&self, rect: &R) -> usize {
let rect_right_col = rect.x() + rect.columns();
// we do this because unless we're on the screen edge, we'd like to go one extra column to
// connect to whatever boundary is right of us