Mercurial > emacs
comparison src/xterm.c @ 107798:04b6d1cf4d69
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 13:39:26 +0200 |
parents | 912a8c0c9a8a |
children | 74557d25410e |
comparison
equal
deleted
inserted
replaced
107797:702528fcbb6a | 107798:04b6d1cf4d69 |
---|---|
8929 ? FRAME_CONFIG_SCROLL_BAR_WIDTH (f) | 8929 ? FRAME_CONFIG_SCROLL_BAR_WIDTH (f) |
8930 : (FRAME_CONFIG_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f))); | 8930 : (FRAME_CONFIG_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f))); |
8931 | 8931 |
8932 compute_fringe_widths (f, 0); | 8932 compute_fringe_widths (f, 0); |
8933 | 8933 |
8934 pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols) | 8934 pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols); |
8935 + 2*f->border_width; | |
8936 pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows) | 8935 pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows) |
8937 + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f) | 8936 + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f); |
8938 + 2*f->border_width; | |
8939 | 8937 |
8940 if (change_gravity) f->win_gravity = NorthWestGravity; | 8938 if (change_gravity) f->win_gravity = NorthWestGravity; |
8941 x_wm_set_size_hint (f, (long) 0, 0); | 8939 x_wm_set_size_hint (f, (long) 0, 0); |
8942 XResizeWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), | 8940 XResizeWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), |
8943 pixelwidth, pixelheight); | 8941 pixelwidth, pixelheight); |