From d6c747a4fde7445617a55811b7c584d64b57ff03 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Fri, 27 Jul 2001 15:28:46 +0000 Subject: [PATCH] (shift_glyph_matrix, blank_row): Fix computation of row's visible height. --- src/dispnew.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/dispnew.c b/src/dispnew.c index afef7909a80..5e16897b93f 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -994,13 +994,12 @@ shift_glyph_matrix (w, matrix, start, end, dy) 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 @@ blank_row (w, row, y) 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; } -- 2.39.2