Mercurial > emacs
changeset 38587:42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
of row's visible height.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Fri, 27 Jul 2001 15:28:46 +0000 |
| parents | fde4f76bf531 |
| children | 08a4c6c00af0 |
| files | src/dispnew.c |
| diffstat | 1 files changed, 9 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dispnew.c Fri Jul 27 15:28:08 2001 +0000 +++ b/src/dispnew.c Fri Jul 27 15:28:46 2001 +0000 @@ -994,13 +994,12 @@ struct glyph_row *row = &matrix->rows[start]; row->y += dy; + row->visible_height = row->height; if (row->y < min_y) - row->visible_height = row->height - (min_y - row->y); - else if (row->y + row->height > max_y) - row->visible_height = row->height - (row->y + row->height - max_y); - else - row->visible_height = row->height; + row->visible_height -= min_y - row->y; + if (row->y + row->height > max_y) + row->visible_height -= row->y + row->height - max_y; } } @@ -1154,13 +1153,12 @@ row->y = y; row->ascent = row->phys_ascent = 0; row->height = row->phys_height = CANON_Y_UNIT (XFRAME (w->frame)); - + row->visible_height = row->height; + if (row->y < min_y) - row->visible_height = row->height - (min_y - row->y); - else if (row->y + row->height > max_y) - row->visible_height = row->height - (row->y + row->height - max_y); - else - row->visible_height = row->height; + row->visible_height -= min_y - row->y; + if (row->y + row->height > max_y) + row->visible_height -= row->y + row->height - max_y; row->enabled_p = 1; }