diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2013-12-20 11:48:36 +0100 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2013-12-20 11:48:36 +0100 |
| commit | c44de18d7db9c038473c71d0708990c3b081402f (patch) | |
| tree | 14837bdee5bcc328b1b0d61b2f0a5d8e369a33a8 /src/frame.c | |
| parent | d506bc1d20baf7ed991b01cede719791778a53c7 (diff) | |
Some more fixes for pixelwise resizing.
Remove scroll_bar_actual_width from frames.
* frame.h (struct frame): Remove scroll_bar_actual_width slot.
* frame.c (Fscroll_bar_width): Return scroll bar area width.
(x_figure_window_size):
* nsterm.m (x_set_window_size):
* widget.c (set_frame_size):
* w32term.c (x_set_window_size):
* xterm.c (x_set_window_size, x_set_window_size_1): Don't set
scroll_bar_actual_width.
Convert scroll_bar members to integers on Windows.
* w32term.h (struct scroll_bar): Convert top, left, width,
height, start, end and dragging to integers.
* w32fns.c (w32_createscrollbar): Remove XINT conversions for
scroll_bar members.
* w32term.c (w32_set_scroll_bar_thumb)
(w32_scroll_bar_handle_click): Remove XINT conversions for
scroll_bar members. Treat bar->dragging as integer.
(x_scroll_bar_create): Call ALLOCATE_PSEUDOVECTOR with "top" as
first element. Remove XINT conversions for scroll_bar members.
(w32_set_vertical_scroll_bar, x_scroll_bar_report_motion):
Remove XINT conversions for scroll_bar members.
Fix assignment for new window total sizes.
* window.c (Fwindow_resize_apply_total): Assign values for
minibuffer window.
* window.el (window--pixel-to-size): Remove function.
(window--pixel-to-total-1, window--pixel-to-total): Fix
calculation of new total sizes.
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/frame.c b/src/frame.c index 7699f24fbb..25e0f2727c 100644 --- a/src/frame.c +++ b/src/frame.c @@ -2515,7 +2515,7 @@ DEFUN ("frame-scroll-bar-width", Fscroll_bar_width, Sscroll_bar_width, 0, 1, 0, doc: /* Return scroll bar width of FRAME in pixels. */) (Lisp_Object frame) { - return make_number (decode_any_frame (frame)->scroll_bar_actual_width); + return make_number (FRAME_SCROLL_BAR_AREA_WIDTH (decode_any_frame (frame))); } DEFUN ("frame-fringe-width", Ffringe_width, Sfringe_width, 0, 1, 0, @@ -4237,8 +4237,6 @@ x_figure_window_size (struct frame *f, Lisp_Object parms, bool toolbar_p) window_prompting |= PSize; } - f->scroll_bar_actual_width - = FRAME_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f); /* This used to be done _before_ calling x_figure_window_size, but since the height is reset here, this was really a no-op. I |