Mercurial > emacs
changeset 4347:d6b289b1a6dc
* window.c (check_frame_size): Include the menu bar height in the
minimum frame height.
| author | Jim Blandy <jimb@redhat.com> |
|---|---|
| date | Fri, 30 Jul 1993 01:48:19 +0000 |
| parents | 3011390123ed |
| children | 1c2066be8443 |
| files | src/window.c |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/window.c Fri Jul 30 01:39:20 1993 +0000 +++ b/src/window.c Fri Jul 30 01:48:19 1993 +0000 @@ -1409,12 +1409,16 @@ FRAME_PTR frame; int *rows, *cols; { - /* For height, we have to see whether the frame has a minibuffer, and - whether it wants a mode line. */ + /* For height, we have to see: + whether the frame has a minibuffer, + whether it wants a mode line, and + whether it has a menu bar. */ int min_height = (FRAME_MINIBUF_ONLY_P (frame) ? MIN_SAFE_WINDOW_HEIGHT - 1 : (! FRAME_HAS_MINIBUF_P (frame)) ? MIN_SAFE_WINDOW_HEIGHT : 2 * MIN_SAFE_WINDOW_HEIGHT - 1); + if (FRAME_MENU_BAR_LINES (frame) > 0) + min_height += FRAME_MENU_BAR_LINES (frame); if (*rows < min_height) *rows = min_height;