diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2014-01-02 16:58:48 +0100 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2014-01-02 16:58:48 +0100 |
| commit | 44c5e192bebd669e687423145cb4949567f64314 (patch) | |
| tree | 87e71c3367932103e9921e385c24d22853d0e623 /src/window.c | |
| parent | c4377e925acc4d9beabc516501e2eef0400197de (diff) | |
| download | emacs-44c5e192bebd669e687423145cb4949567f64314.tar.gz | |
Further adjust frame/window scrollbar width calculations.
* window.c (apply_window_adjustment): Set
windows_or_buffers_changed.
(Fwindow_scroll_bars): Return actual scrollbar width.
* xfns.c (x_set_scroll_bar_default_width): Rename wid to unit.
For non-toolkit builds again use 14 as minimum width and set
FRAME_CONFIG_SCROLL_BAR_WIDTH accordingly.
* xterm.c (XTset_vertical_scroll_bar): Take width from
WINDOW_SCROLL_BAR_AREA_WIDTH.
(x_new_font): Rename wid to unit. Base calculation of new
scrollbar width on toolkit used and make it analogous to that of
x_set_scroll_bar_default_width.
* w32fns.c (x_set_scroll_bar_default_width): Rename wid to unit.
(Fx_create_frame): Call x_set_scroll_bar_default_width instead
of GetSystemMetrics.
* w32term.c (w32_set_vertical_scroll_bar): Take width from
WINDOW_SCROLL_BAR_AREA_WIDTH.
(x_new_font): Make it correspond to changes in xterm.c.
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/window.c b/src/window.c index aa6a3c500f6..f85627ac49f 100644 --- a/src/window.c +++ b/src/window.c @@ -6631,6 +6631,7 @@ apply_window_adjustment (struct window *w) adjust_window_margins (w); clear_glyph_matrix (w->current_matrix); w->window_end_valid = 0; + windows_or_buffers_changed = 30; wset_redisplay (w); adjust_frame_glyphs (XFRAME (WINDOW_FRAME (w))); } @@ -6834,9 +6835,7 @@ value. */) { struct window *w = decode_live_window (window); - return list4 (make_number ((WINDOW_CONFIG_SCROLL_BAR_WIDTH (w) - ? WINDOW_CONFIG_SCROLL_BAR_WIDTH (w) - : WINDOW_SCROLL_BAR_AREA_WIDTH (w))), + return list4 (make_number (WINDOW_SCROLL_BAR_AREA_WIDTH (w)), make_number (WINDOW_SCROLL_BAR_COLS (w)), w->vertical_scroll_bar_type, Qnil); } |