diff options
| author | Martin Rudalics | 2013-12-31 10:48:54 +0100 |
|---|---|---|
| committer | Martin Rudalics | 2013-12-31 10:48:54 +0100 |
| commit | 9b3c0a162e7876bab09c299ff4d803b632bf3ac8 (patch) | |
| tree | 99d5899a5f57df9c1c1ba33cdb66cddafa4ae499 /src/window.c | |
| parent | b29daf07584497968831af6687bf0fde2d216418 (diff) | |
| download | emacs-9b3c0a162e7876bab09c299ff4d803b632bf3ac8.tar.gz emacs-9b3c0a162e7876bab09c299ff4d803b632bf3ac8.zip | |
Some more fixes following pixelwise resize changes including one for Bug#16306.
* gtkutil.c (x_wm_set_size_hint): Have size hints respect value
of frame_resize_pixelwise.
* widget.c (pixel_to_text_size): New function.
(update_wm_hints): Have size hints respect value of
frame_resize_pixelwise.
(EmacsFrameResize): Alway process resize requests pixelwise.
* window.c (grow_mini_window): Make sure mini window is at least
one line tall.
* xdisp.c (display_menu_bar): Make sure menubar extends till
right end of frame.
* xfns.c (x_set_menu_bar_lines): Resize frame windows pixelwise.
(x_set_tool_bar_lines): Calculate pixelwise.
* xterm.c (x_wm_set_size_hint): Have size hints respect value of
frame_resize_pixelwise.
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/window.c b/src/window.c index 9bc95224f7c..1e3d70fd88d 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -4582,14 +4582,16 @@ grow_mini_window (struct window *w, int delta, bool pixelwise) | |||
| 4582 | 4582 | ||
| 4583 | if (pixelwise) | 4583 | if (pixelwise) |
| 4584 | { | 4584 | { |
| 4585 | pixel_height = min (-XINT (height), INT_MAX - w->pixel_height); | 4585 | pixel_height = max (min (-XINT (height), INT_MAX - w->pixel_height), |
| 4586 | FRAME_LINE_HEIGHT (f)); | ||
| 4586 | line_height = pixel_height / FRAME_LINE_HEIGHT (f); | 4587 | line_height = pixel_height / FRAME_LINE_HEIGHT (f); |
| 4587 | } | 4588 | } |
| 4588 | else | 4589 | else |
| 4589 | { | 4590 | { |
| 4590 | line_height = min (-XINT (height), | 4591 | line_height = max (min (-XINT (height), |
| 4591 | ((INT_MAX - w->pixel_height) | 4592 | ((INT_MAX - w->pixel_height) |
| 4592 | / FRAME_LINE_HEIGHT (f))); | 4593 | / FRAME_LINE_HEIGHT (f))), |
| 4594 | 1); | ||
| 4593 | pixel_height = line_height * FRAME_LINE_HEIGHT (f); | 4595 | pixel_height = line_height * FRAME_LINE_HEIGHT (f); |
| 4594 | } | 4596 | } |
| 4595 | 4597 | ||