Archives
/
meli
mirror of https://git.meli.delivery/meli/meli
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mail/view: fix out-of-bounds draw when terminal is small

Browse Source 
Signed-off-by: Manos Pitsidianakis <manos@pitsidianak.is>
pull/299/head
Manos Pitsidianakis 9 months ago
parent c43aeb0eb1
commit 7e3e938631
No known key found for this signature in database
GPG Key ID: 7729C7707F7E09D0
2 changed files with 61 additions and 23 deletions
Show Stats Download Patch File Download Diff File

7
meli/src/mail/view/envelope.rs
Unescape Escape View File

@ -986,9 +986,10 @@ impl Component for EnvelopeView {
(set_y(upper_left, y), set_y(bottom_right, y)), (set_y(upper_left, y), set_y(bottom_right, y)),
headers_area, headers_area,
); );
context context.dirty_areas.push_back((
.dirty_areas upper_left,
.push_back((upper_left, set_y(bottom_right, y + 3))); set_y(bottom_right, std::cmp::min(y + 3, get_y(bottom_right))),
));
if !self.view_settings.sticky_headers { if !self.view_settings.sticky_headers {
let height_p = self.pager.size().1; let height_p = self.pager.size().1;

77
meli/src/mail/view/thread.rs
Unescape Escape View File

@ -712,14 +712,21 @@ impl ThreadView {
); );
context.dirty_areas.push_back(( context.dirty_areas.push_back((
upper_left!(area), upper_left!(area),
set_x(bottom_right, get_x(upper_left!(area)) + 1), set_x(
bottom_right,
cmp::min(get_x(bottom_right!(area)), get_x(upper_left!(area)) + 1),
),
)); ));
} }
let (upper_left, bottom_right) = dest_area; let (upper_left, bottom_right) = dest_area;
context context.dirty_areas.push_back((
.dirty_areas upper_left,
.push_back((upper_left, (get_x(bottom_right), get_y(upper_left) + 1))); (
get_x(bottom_right),
cmp::min(get_y(bottom_right), get_y(upper_left) + 1),
),
));
} }
} }
} }
@ -762,12 +769,16 @@ impl ThreadView {
.set_fg(theme_default.fg) .set_fg(theme_default.fg)
.set_bg(theme_default.bg); .set_bg(theme_default.bg);
} }
context context.dirty_areas.push_back((
.dirty_areas upper_left,
.push_back((upper_left, set_y(bottom_right, y + 1))); set_y(bottom_right, std::cmp::min(get_y(bottom_right), y + 1)),
context ));
.dirty_areas if y + 1 < get_y(bottom_right) && mid < get_x(bottom_right) {
.push_back(((mid, y + 1), set_x(bottom_right, mid))); context.dirty_areas.push_back((
(mid, y + 1),
set_x(bottom_right, std::cmp::min(get_x(bottom_right), mid)),
));
}
clear_area( clear_area(
grid, grid,
((mid, y + 1), set_x(bottom_right, mid)), ((mid, y + 1), set_x(bottom_right, mid)),
@ -792,7 +803,10 @@ impl ThreadView {
ThreadViewFocus::None => { ThreadViewFocus::None => {
self.draw_list( self.draw_list(
grid, grid,
(set_y(upper_left, y), set_x(bottom_right, mid - 1)), (
set_y(upper_left, std::cmp::min(get_y(bottom_right), y)),
set_x(bottom_right, std::cmp::min(get_x(bottom_right), mid - 1)),
),
context, context,
); );
let upper_left = (mid + 1, get_y(upper_left)); let upper_left = (mid + 1, get_y(upper_left));
@ -872,9 +886,10 @@ impl ThreadView {
.set_fg(theme_default.fg) .set_fg(theme_default.fg)
.set_bg(theme_default.bg); .set_bg(theme_default.bg);
} }
context context.dirty_areas.push_back((
.dirty_areas upper_left,
.push_back((upper_left, set_y(bottom_right, y + 2))); set_y(bottom_right, std::cmp::min(get_y(bottom_right), y + 2)),
));
y + 2 y + 2
}; };
@ -899,7 +914,10 @@ impl ThreadView {
match self.focus { match self.focus {
ThreadViewFocus::None => { ThreadViewFocus::None => {
let area = (set_y(upper_left, y), set_y(bottom_right, mid)); let area = (
set_y(upper_left, y),
set_y(bottom_right, std::cmp::min(get_y(bottom_right), mid)),
);
let upper_left = upper_left!(area); let upper_left = upper_left!(area);
let bottom_right = bottom_right!(area); let bottom_right = bottom_right!(area);
@ -919,7 +937,10 @@ impl ThreadView {
context.dirty_areas.push_back(area); context.dirty_areas.push_back(area);
} }
ThreadViewFocus::Thread => { ThreadViewFocus::Thread => {
let area = (set_y(upper_left, y), bottom_right); let area = (
set_y(upper_left, std::cmp::min(y, get_y(bottom_right))),
bottom_right,
);
let upper_left = upper_left!(area); let upper_left = upper_left!(area);
let rows = (get_y(bottom_right).saturating_sub(get_y(upper_left) + 1)) / 2; let rows = (get_y(bottom_right).saturating_sub(get_y(upper_left) + 1)) / 2;
@ -941,7 +962,10 @@ impl ThreadView {
match self.focus { match self.focus {
ThreadViewFocus::None => { ThreadViewFocus::None => {
let area = (set_y(upper_left, mid), set_y(bottom_right, mid)); let area = (
set_y(upper_left, std::cmp::min(get_y(bottom_right), mid)),
set_y(bottom_right, std::cmp::min(get_y(bottom_right), mid)),
);
context.dirty_areas.push_back(area); context.dirty_areas.push_back(area);
for x in get_x(upper_left)..=get_x(bottom_right) { for x in get_x(upper_left)..=get_x(bottom_right) {
set_and_join_box(grid, (x, mid), BoxBoundary::Horizontal); set_and_join_box(grid, (x, mid), BoxBoundary::Horizontal);
@ -949,17 +973,30 @@ impl ThreadView {
.set_fg(theme_default.fg) .set_fg(theme_default.fg)
.set_bg(theme_default.bg); .set_bg(theme_default.bg);
} }
let area = (set_y(upper_left, y), set_y(bottom_right, mid - 1)); let area = (
set_y(upper_left, std::cmp::min(get_y(bottom_right), y)),
set_y(bottom_right, std::cmp::min(get_y(bottom_right), mid - 1)),
);
self.draw_list(grid, area, context); self.draw_list(grid, area, context);
self.entries[self.new_expanded_pos].mailview.draw( self.entries[self.new_expanded_pos].mailview.draw(
grid, grid,
(set_y(upper_left, mid + 1), bottom_right), (
set_y(upper_left, std::cmp::min(get_y(bottom_right), mid + 1)),
bottom_right,
),
context, context,
); );
} }
ThreadViewFocus::Thread => { ThreadViewFocus::Thread => {
self.dirty = true; self.dirty = true;
self.draw_list(grid, (set_y(upper_left, y), bottom_right), context); self.draw_list(
grid,
(
set_y(upper_left, std::cmp::min(get_y(bottom_right), y)),
bottom_right,
),
context,
);
} }
ThreadViewFocus::MailView => { ThreadViewFocus::MailView => {
self.entries[self.new_expanded_pos] self.entries[self.new_expanded_pos]

Write Preview
Loading…
Cancel
Save