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/dispnew.c | |
| parent | d506bc1d20baf7ed991b01cede719791778a53c7 (diff) | |
| download | emacs-c44de18d7db9c038473c71d0708990c3b081402f.tar.gz | |
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/dispnew.c')
| -rw-r--r-- | src/dispnew.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dispnew.c b/src/dispnew.c index 967fffe469b..cbf1963feca 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -5488,6 +5488,8 @@ change_frame_size_1 (struct frame *f, int new_width, int new_height, { new_text_width = (new_width == 0) ? FRAME_TEXT_WIDTH (f) : new_width; new_text_height = (new_height == 0) ? FRAME_TEXT_HEIGHT (f) : new_height; + /* Consider rounding here: Currently, the root window can be + larger than the frame in terms of columns/lines. */ new_cols = new_text_width / FRAME_COLUMN_WIDTH (f); new_lines = new_text_height / FRAME_LINE_HEIGHT (f); } @@ -5507,7 +5509,6 @@ change_frame_size_1 (struct frame *f, int new_width, int new_height, fringe columns. Do this after rounding - see discussion of bug#9723. */ new_root_width = (new_text_width - /* PXM: Use the configured scrollbar width !?? */ + FRAME_SCROLL_BAR_AREA_WIDTH (f) + FRAME_TOTAL_FRINGE_WIDTH (f)); /* If we're not changing the frame size, quit now. */ |