diff options
| author | Martin Rudalics | 2013-12-11 11:03:46 +0100 |
|---|---|---|
| committer | Martin Rudalics | 2013-12-11 11:03:46 +0100 |
| commit | d94c40c1b74bcd10795fa6ea9cc1a8908486b093 (patch) | |
| tree | cee19165f279e21936719c48fd2bbf1905d85776 /src/window.c | |
| parent | a8f9bc05c344ec9b9e0dee5499ce0b1427cbfea6 (diff) | |
| download | emacs-d94c40c1b74bcd10795fa6ea9cc1a8908486b093.tar.gz emacs-d94c40c1b74bcd10795fa6ea9cc1a8908486b093.zip | |
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/window.c')
| -rw-r--r-- | src/window.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/window.c b/src/window.c index 426edc6099c..9bf6ad4b8f3 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -4057,7 +4057,7 @@ resize_frame_windows (struct frame *f, int size, bool horflag, bool pixelwise) | |||
| 4057 | r->pixel_top = FRAME_TOP_MARGIN_HEIGHT (f); | 4057 | r->pixel_top = FRAME_TOP_MARGIN_HEIGHT (f); |
| 4058 | 4058 | ||
| 4059 | if (new_pixel_size == old_pixel_size) | 4059 | if (new_pixel_size == old_pixel_size) |
| 4060 | return; | 4060 | ; |
| 4061 | else if (WINDOW_LEAF_P (r)) | 4061 | else if (WINDOW_LEAF_P (r)) |
| 4062 | /* For a leaf root window just set the size. */ | 4062 | /* For a leaf root window just set the size. */ |
| 4063 | if (horflag) | 4063 | if (horflag) |