diff options
| author | Kim F. Storm <storm@cua.dk> | 2004-07-21 21:08:23 +0000 |
|---|---|---|
| committer | Kim F. Storm <storm@cua.dk> | 2004-07-21 21:08:23 +0000 |
| commit | cc834cf99b2d93c4552e92a105de151f3ff2b6e0 (patch) | |
| tree | 40eb1f8f9ccaba1731f81b4728a7bdac493052b2 | |
| parent | 36f826d430fea98671ffc2cc7ea6a40efa8d3c03 (diff) | |
| download | emacs-cc834cf99b2d93c4552e92a105de151f3ff2b6e0.tar.gz | |
(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.
| -rw-r--r-- | src/dispnew.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/dispnew.c b/src/dispnew.c index 5ceebdecf34..8a713857273 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -579,7 +579,7 @@ margin_glyphs_to_reserve (w, total_glyphs, margin) 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 @@ allocate_matrices_for_frame_redisplay (window, x, y, dim_only_p, || 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 @@ required_matrix_height (w) 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 @@ required_matrix_width (w) /* 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 |