summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Heuer <kwzh@gnu.org>1995-12-13 02:13:59 +0000
committerKarl Heuer <kwzh@gnu.org>1995-12-13 02:13:59 +0000
commit99493c5e34e32e2ed55c0fe6679815411038daf0 (patch)
treecf51f5db1486b7384a734fd8c50e42357d9021f9
parent99258997b4a3a8b2ecc13fb0e2aa44ac49cf3369 (diff)
downloademacs-99493c5e34e32e2ed55c0fe6679815411038daf0.tar.gz
(XMenuActivate): Display the menu pane title.
(XMenuLocate): Do not ignore pane title length when deciding on menu location.
-rw-r--r--src/msdos.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/msdos.c b/src/msdos.c
index a05149eea33..4d3c4028117 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -1634,11 +1634,7 @@ void
XMenuLocate (Display *foo0, XMenu *menu, int foo1, int foo2, int x, int y,
int *ulx, int *uly, int *width, int *height)
{
- if (menu->count == 1 && menu->submenu[0])
- /* Special case: the menu consists of only one pane. */
- IT_menu_calc_size (menu->submenu[0], width, height);
- else
- IT_menu_calc_size (menu, width, height);
+ IT_menu_calc_size (menu, width, height);
*ulx = x + 1;
*uly = y;
*width += 2;
@@ -1693,6 +1689,8 @@ XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx,
state[0].menu = menu;
mouse_off ();
ScreenRetrieve (state[0].screen_behind = xmalloc (screensize));
+
+ IT_menu_display (menu, y0 - 1, x0 - 1, faces); /* display the menu title */
if ((onepane = menu->count == 1 && menu->submenu[0]))
{
menu->width = menu->submenu[0]->width;