Mercurial > emacs
changeset 56496:069e4841ceb2
(margin_glyphs_to_reserve): Apply ncols_scale_factor.
(allocate_matrices_for_frame_redisplay): Fix left/right margin mix-up.
(required_matrix_height): Apply nrows_scale_factor.
(required_matrix_width): Apply ncols_scale_factor.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Wed, 21 Jul 2004 21:08:23 +0000 |
| parents | 83d7fd93f208 |
| children | 8f77d7fac4d6 |
| files | src/dispnew.c |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dispnew.c Wed Jul 21 21:07:59 2004 +0000 +++ b/src/dispnew.c Wed Jul 21 21:08:23 2004 +0000 @@ -579,7 +579,7 @@ int width = XFASTINT (w->total_cols); double d = max (0, XFLOATINT (margin)); d = min (width / 2 - 1, d); - n = (int) ((double) total_glyphs / width * d); + n = (int) ((double) total_glyphs / width * d) * w->ncols_scale_factor; } else n = 0; @@ -1911,10 +1911,10 @@ || dim.width != w->desired_matrix->matrix_w || dim.height != w->desired_matrix->matrix_h || (margin_glyphs_to_reserve (w, dim.width, - w->right_margin_cols) + w->left_margin_cols) != w->desired_matrix->left_margin_glyphs) || (margin_glyphs_to_reserve (w, dim.width, - w->left_margin_cols) + w->right_margin_cols) != w->desired_matrix->right_margin_glyphs)) *window_change_flags |= CHANGED_LEAF_MATRIX; @@ -1982,7 +1982,7 @@ int ch_height = FRAME_SMALLEST_FONT_HEIGHT (f); int window_pixel_height = window_box_height (w) + abs (w->vscroll); return (((window_pixel_height + ch_height - 1) - / ch_height) + / ch_height) * w->nrows_scale_factor /* One partially visible line at the top and bottom of the window. */ + 2 @@ -2010,7 +2010,7 @@ /* Compute number of glyphs needed in a glyph row. */ return (((window_pixel_width + ch_width - 1) - / ch_width) + / ch_width) * w->ncols_scale_factor /* 2 partially visible columns in the text area. */ + 2 /* One partially visible column at the right