Mercurial > emacs
comparison src/xterm.c @ 107926:d1704f1bb946
Fix resizing for X and non-Gtk+ build. Bug #5848.
* frame.h (FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Don't use
FRAME_LINE_TO_PIXEL_Y.
* xterm.c (x_set_window_size_1): Don't add border_width/height to
pixelwidth/height.
author | Jan D. <jan.h.d@swipnet.se> |
---|---|
date | Wed, 07 Apr 2010 18:34:31 +0200 |
parents | 07507204ac6f |
children | f6f0d450d542 |
comparison
equal
deleted
inserted
replaced
107925:d95939738dba | 107926:d1704f1bb946 |
---|---|
8931 ? FRAME_CONFIG_SCROLL_BAR_WIDTH (f) | 8931 ? FRAME_CONFIG_SCROLL_BAR_WIDTH (f) |
8932 : (FRAME_CONFIG_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f))); | 8932 : (FRAME_CONFIG_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f))); |
8933 | 8933 |
8934 compute_fringe_widths (f, 0); | 8934 compute_fringe_widths (f, 0); |
8935 | 8935 |
8936 pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols) | 8936 pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols); |
8937 + 2*f->border_width; | |
8938 pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows) | 8937 pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows) |
8939 + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f) | 8938 + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f); |
8940 + 2*f->border_width; | |
8941 | 8939 |
8942 if (change_gravity) f->win_gravity = NorthWestGravity; | 8940 if (change_gravity) f->win_gravity = NorthWestGravity; |
8943 x_wm_set_size_hint (f, (long) 0, 0); | 8941 x_wm_set_size_hint (f, (long) 0, 0); |
8944 XResizeWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), | 8942 XResizeWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), |
8945 pixelwidth, pixelheight); | 8943 pixelwidth, pixelheight); |