diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2013-12-11 11:03:46 +0100 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2013-12-11 11:03:46 +0100 |
| commit | d94c40c1b74bcd10795fa6ea9cc1a8908486b093 (patch) | |
| tree | cee19165f279e21936719c48fd2bbf1905d85776 /src/xfns.c | |
| parent | a8f9bc05c344ec9b9e0dee5499ce0b1427cbfea6 (diff) | |
Various fixes around Bug#16013.
* window.c (resize_frame_windows): Don't return immediately when
the root window's size doesn't change - the minibuffer window
may still have to be repositioned/resized.
* xfns.c (Fx_create_frame): Always change the frame size after
initializing the frame's faces.
* xterm.c (handle_one_xevent): Don't set pixel sizes here,
change_frame_size should already have done it.
(x_new_font): Assign new tool- and menu-bar heights.
(x_set_window_size_1): Account for tool- and menu-bar heights
(Bug#16013). Don't set pixel sizes since change_frame_size
should already have done it.
Diffstat (limited to 'src/xfns.c')
| -rw-r--r-- | src/xfns.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/xfns.c b/src/xfns.c index 3c8df12f8c..7200c5fb2e 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -3069,7 +3069,6 @@ This function is an internal primitive--use `make-frame' instead. */) happen. */ init_frame_faces (f); -#ifdef USE_GTK /* PXW: This is a duplicate from below. We have to do it here since otherwise x_set_tool_bar_lines will work with the character sizes installed by init_frame_faces while the frame's pixel size is still @@ -3078,12 +3077,8 @@ This function is an internal primitive--use `make-frame' instead. */) non-pixelwise code apparently worked around this because it had one frame line vs one toolbar line which left us with a zero root window height which was obviously wrong as well ... */ - width = FRAME_TEXT_WIDTH (f); - height = FRAME_TEXT_HEIGHT (f); - FRAME_TEXT_HEIGHT (f) = 0; - SET_FRAME_WIDTH (f, 0); - change_frame_size (f, width, height, 1, 0, 0, 1); -#endif /* USE_GTK */ + change_frame_size (f, FRAME_COLS (f) * FRAME_COLUMN_WIDTH (f), + FRAME_LINES (f) * FRAME_LINE_HEIGHT (f), 1, 0, 0, 1); /* Set the menu-bar-lines and tool-bar-lines parameters. We don't look up the X resources controlling the menu-bar and tool-bar |