Mercurial > emacs
changeset 6610:35e857d14d40
(x_window) [USE_X_TOOLKIT]: When doing geometry management, don't compute the
size of the menubar if there is no menubar.
| author | Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr> |
|---|---|
| date | Thu, 31 Mar 1994 16:49:00 +0000 |
| parents | 3b1eb7f1eba1 |
| children | a5f180172ff3 |
| files | src/xfns.c |
| diffstat | 1 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xfns.c Thu Mar 31 16:46:57 1994 +0000 +++ b/src/xfns.c Thu Mar 31 16:49:00 1994 +0000 @@ -1776,17 +1776,20 @@ char *tem, shell_position[32]; Arg al[2]; int ac = 0; + int menubar_size = + (f->display.x->menubar_widget + ? (f->display.x->menubar_widget->core.height + + f->display.x->menubar_widget->core.border_width) + : 0); if (window_prompting & USPosition) sprintf (shell_position, "=%dx%d%c%d%c%d", PIXEL_WIDTH (f), - PIXEL_HEIGHT (f) + f->display.x->menubar_widget->core.height - + f->display.x->menubar_widget->core.border_width, + PIXEL_HEIGHT (f) + menubar_size, '+', f->display.x->left_pos, '+', f->display.x->top_pos); else sprintf (shell_position, "=%dx%d", PIXEL_WIDTH (f), - PIXEL_HEIGHT (f) + f->display.x->menubar_widget->core.height - + f->display.x->menubar_widget->core.border_width); + PIXEL_HEIGHT (f) + menubar_size); len = strlen (shell_position) + 1; tem = (char *) xmalloc (len); strncpy (tem, shell_position, len);