Mercurial > emacs
comparison src/msdos.c @ 13714:45e71ea63d71
(XMenuActivate): Display the menu pane title.
(XMenuLocate): Do not ignore pane title length when deciding on
menu location.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Wed, 13 Dec 1995 02:13:59 +0000 |
parents | 0dd21f630fb0 |
children | d7bb4093a950 |
comparison
equal
deleted
inserted
replaced
13713:f85b6bd0f925 | 13714:45e71ea63d71 |
---|---|
1632 | 1632 |
1633 void | 1633 void |
1634 XMenuLocate (Display *foo0, XMenu *menu, int foo1, int foo2, int x, int y, | 1634 XMenuLocate (Display *foo0, XMenu *menu, int foo1, int foo2, int x, int y, |
1635 int *ulx, int *uly, int *width, int *height) | 1635 int *ulx, int *uly, int *width, int *height) |
1636 { | 1636 { |
1637 if (menu->count == 1 && menu->submenu[0]) | 1637 IT_menu_calc_size (menu, width, height); |
1638 /* Special case: the menu consists of only one pane. */ | |
1639 IT_menu_calc_size (menu->submenu[0], width, height); | |
1640 else | |
1641 IT_menu_calc_size (menu, width, height); | |
1642 *ulx = x + 1; | 1638 *ulx = x + 1; |
1643 *uly = y; | 1639 *uly = y; |
1644 *width += 2; | 1640 *width += 2; |
1645 } | 1641 } |
1646 | 1642 |
1691 | 1687 |
1692 statecount = 1; | 1688 statecount = 1; |
1693 state[0].menu = menu; | 1689 state[0].menu = menu; |
1694 mouse_off (); | 1690 mouse_off (); |
1695 ScreenRetrieve (state[0].screen_behind = xmalloc (screensize)); | 1691 ScreenRetrieve (state[0].screen_behind = xmalloc (screensize)); |
1692 | |
1693 IT_menu_display (menu, y0 - 1, x0 - 1, faces); /* display the menu title */ | |
1696 if ((onepane = menu->count == 1 && menu->submenu[0])) | 1694 if ((onepane = menu->count == 1 && menu->submenu[0])) |
1697 { | 1695 { |
1698 menu->width = menu->submenu[0]->width; | 1696 menu->width = menu->submenu[0]->width; |
1699 state[0].menu = menu->submenu[0]; | 1697 state[0].menu = menu->submenu[0]; |
1700 } | 1698 } |