From b4b2c2cafcf7d9d441be9d0930c69709a995420e Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Wed, 8 Apr 2009 10:30:51 +0000 Subject: [PATCH] (redraw_overlapping_rows): Fix detection of overlapping for topmost and bottommost rows. --- src/ChangeLog | 3 +++ src/dispnew.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 3ae638fbb41..aca9e8014cf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2009-04-08 YAMAMOTO Mitsuharu + * dispnew.c (redraw_overlapping_rows): Fix detection of + overlapping for topmost and bottommost rows. + * ftfont.c (ftfont_text_extents): Fix calculation of metrics->descent. diff --git a/src/dispnew.c b/src/dispnew.c index bbe0f9fc961..3fbb113dd9f 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -4129,14 +4129,14 @@ redraw_overlapping_rows (w, yb) bottom_y = MATRIX_ROW_BOTTOM_Y (row); - if (row->overlapping_p && i > 0 && bottom_y < yb) + if (row->overlapping_p) { int overlaps = 0; - if (MATRIX_ROW_OVERLAPS_PRED_P (row) + if (MATRIX_ROW_OVERLAPS_PRED_P (row) && i > 0 && !MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p) overlaps |= OVERLAPS_PRED; - if (MATRIX_ROW_OVERLAPS_SUCC_P (row) + if (MATRIX_ROW_OVERLAPS_SUCC_P (row) && bottom_y < yb && !MATRIX_ROW (w->current_matrix, i + 1)->overlapped_p) overlaps |= OVERLAPS_SUCC; -- 2.39.5