Fix frame size when scroll bar width not an integral of column width.

xterm.c (x_set_window_size_1): scroll_bar_actual_width is always
SCROLL_BAR_COLS * COLUMN_WIDTH for the purpose of frame sizing.
This commit is contained in:
Jan D 2010-07-14 17:10:59 +02:00
parent cf28cebc2e
commit 6b2c4bd94e
2 changed files with 3 additions and 3 deletions

View file

@ -8,6 +8,8 @@
Remove #ifdef USE_GTK around finish = X_EVENT_DROP.
Remove #ifdef USE_MOTIF code that did SET_SAVED_BUTTON_EVENT for
ButtonRelease.
(x_set_window_size_1): scroll_bar_actual_width is always
SCROLL_BAR_COLS * COLUMN_WIDTH for the purpose of frame sizing.
* xdisp.c (pending_menu_activation): Remove extern declaration.
(prepare_menu_bars): Remove setting of pending_menu_activation.

View file

@ -8606,9 +8606,7 @@ x_set_window_size_1 (struct frame *f, int change_gravity, int cols, int rows)
f->scroll_bar_actual_width
= (!FRAME_HAS_VERTICAL_SCROLL_BARS (f)
? 0
: FRAME_CONFIG_SCROLL_BAR_WIDTH (f) > 0
? FRAME_CONFIG_SCROLL_BAR_WIDTH (f)
: (FRAME_CONFIG_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f)));
: FRAME_CONFIG_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f));
compute_fringe_widths (f, 0);