tweaks: restore earlier conditions to prevent superfluous redrawings

When doing an <Up> on the top line, or a <Down> on the bottom line of
the edit window, the affected lines have already been redrawn by the
scrolling code, so there is no need to do that again.

(However, that does not prevent the second line (or the last-but-one
line) from being redrawn unnecessarily when using the M-- (or M-+)
command elsewhere on the screen and /that/ line is horizontally
scrolled.  But we'll let that pass for now.)
master
Benno Schulenberg 2016-07-26 20:06:10 +02:00
parent 2f6647687a
commit 03b168d0e3
1 changed files with 18 additions and 12 deletions

View File

@ -439,12 +439,15 @@ void do_up(bool scroll_only)
#endif #endif
editwinrows / 2 + 1); editwinrows / 2 + 1);
/* Redraw the prior line if it was horizontally scrolled. */ /* If the lines weren't already redrawn, see if they need to be. */
if (need_horizontal_scroll(was_column, 0)) if (openfile->current_y > 0) {
update_line(openfile->current->next, 0); /* Redraw the prior line if it was horizontally scrolled. */
/* Redraw the current line if it needs to be horizontally scrolled. */ if (need_horizontal_scroll(was_column, 0))
if (need_horizontal_scroll(0, xplustabs())) update_line(openfile->current->next, 0);
update_line(openfile->current, openfile->current_x); /* Redraw the current line if it needs to be horizontally scrolled. */
if (need_horizontal_scroll(0, xplustabs()))
update_line(openfile->current, openfile->current_x);
}
} }
/* Move up one line. */ /* Move up one line. */
@ -521,12 +524,15 @@ void do_down(bool scroll_only)
} }
} }
/* Redraw the prior line if it was horizontally scrolled. */ /* If the lines weren't already redrawn, see if they need to be. */
if (need_horizontal_scroll(was_column, 0)) if (openfile->current_y < editwinrows - 1) {
update_line(openfile->current->prev, 0); /* Redraw the prior line if it was horizontally scrolled. */
/* Redraw the current line if it needs to be horizontally scrolled. */ if (need_horizontal_scroll(was_column, 0))
if (need_horizontal_scroll(0, xplustabs())) update_line(openfile->current->prev, 0);
update_line(openfile->current, openfile->current_x); /* Redraw the current line if it needs to be horizontally scrolled. */
if (need_horizontal_scroll(0, xplustabs()))
update_line(openfile->current, openfile->current_x);
}
} }
/* Move down one line. */ /* Move down one line. */