diff options
Diffstat (limited to 'src/fringe.c')
| -rw-r--r-- | src/fringe.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/fringe.c b/src/fringe.c index 2735ae70f94..22f3bdc2ba8 100644 --- a/src/fringe.c +++ b/src/fringe.c | |||
| @@ -634,7 +634,8 @@ draw_fringe_bitmap_1 (struct window *w, struct glyph_row *row, int left_p, int o | |||
| 634 | /* Clear left fringe if no bitmap to draw or if bitmap doesn't fill | 634 | /* Clear left fringe if no bitmap to draw or if bitmap doesn't fill |
| 635 | the fringe. */ | 635 | the fringe. */ |
| 636 | p.bx = -1; | 636 | p.bx = -1; |
| 637 | header_line_height = WINDOW_TAB_LINE_HEIGHT (w) + WINDOW_HEADER_LINE_HEIGHT (w); | 637 | header_line_height = WINDOW_TAB_LINE_HEIGHT (w) |
| 638 | + WINDOW_HEADER_LINE_HEIGHT (w); | ||
| 638 | p.by = WINDOW_TO_FRAME_PIXEL_Y (w, max (header_line_height, row->y)); | 639 | p.by = WINDOW_TO_FRAME_PIXEL_Y (w, max (header_line_height, row->y)); |
| 639 | p.ny = row->visible_height; | 640 | p.ny = row->visible_height; |
| 640 | if (left_p) | 641 | if (left_p) |
| @@ -1091,7 +1092,8 @@ update_window_fringes (struct window *w, bool keep_current_p) | |||
| 1091 | struct glyph_row *row1; | 1092 | struct glyph_row *row1; |
| 1092 | int top_ind_max_y; | 1093 | int top_ind_max_y; |
| 1093 | 1094 | ||
| 1094 | top_ind_min_y = WINDOW_TAB_LINE_HEIGHT (w) + WINDOW_HEADER_LINE_HEIGHT (w); | 1095 | top_ind_min_y = WINDOW_TAB_LINE_HEIGHT (w) |
| 1096 | + WINDOW_HEADER_LINE_HEIGHT (w); | ||
| 1095 | top_ind_max_y = top_ind_min_y + fb->height; | 1097 | top_ind_max_y = top_ind_min_y + fb->height; |
| 1096 | if (top_ind_max_y > yb) | 1098 | if (top_ind_max_y > yb) |
| 1097 | top_ind_max_y = yb; | 1099 | top_ind_max_y = yb; |
| @@ -1148,8 +1150,10 @@ update_window_fringes (struct window *w, bool keep_current_p) | |||
| 1148 | 1150 | ||
| 1149 | bot_ind_max_y = row->y + row->visible_height; | 1151 | bot_ind_max_y = row->y + row->visible_height; |
| 1150 | bot_ind_min_y = bot_ind_max_y - fb->height; | 1152 | bot_ind_min_y = bot_ind_max_y - fb->height; |
| 1151 | if (bot_ind_min_y < WINDOW_TAB_LINE_HEIGHT (w) + WINDOW_HEADER_LINE_HEIGHT (w)) | 1153 | if (bot_ind_min_y < WINDOW_TAB_LINE_HEIGHT (w) |
| 1152 | bot_ind_min_y = WINDOW_TAB_LINE_HEIGHT (w) + WINDOW_HEADER_LINE_HEIGHT (w); | 1154 | + WINDOW_HEADER_LINE_HEIGHT (w)) |
| 1155 | bot_ind_min_y = WINDOW_TAB_LINE_HEIGHT (w) | ||
| 1156 | + WINDOW_HEADER_LINE_HEIGHT (w); | ||
| 1153 | 1157 | ||
| 1154 | for (y = row->y, rn = bot_ind_rn - 1; | 1158 | for (y = row->y, rn = bot_ind_rn - 1; |
| 1155 | y >= bot_ind_min_y && rn >= 0; | 1159 | y >= bot_ind_min_y && rn >= 0; |