mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 10:04:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2756_menu'

Browse Source 
* 2756_menu:
  Ticket #2756: fixed menu alignment.
This commit is contained in:
Andrew Borodin 2012-03-25 10:36:15 +04:00
commit 789ec67348
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/widget/menu.c
View File

@ -46,8 +46,6 @@
/*** file scope macro definitions ****************************************************************/ /*** file scope macro definitions ****************************************************************/
#define RESIZABLE_MENUBAR 0
/*** file scope type declarations ****************************************************************/ /*** file scope type declarations ****************************************************************/
/*** file scope variables ************************************************************************/ /*** file scope variables ************************************************************************/
@ -871,24 +869,12 @@ menubar_arrange (WMenuBar * menubar)
if (menubar->menu == NULL) if (menubar->menu == NULL)
return; return;
#ifndef RESIZABLE_MENUBAR
gap = 3;
for (i = menubar->menu; i != NULL; i = g_list_next (i))
{
Menu *menu = i->data;
int len = hotkey_width (menu->text) + 2;
menu->start_x = start_x;
start_x += len + gap;
}
#else /* RESIZABLE_MENUBAR */
gap = menubar->widget.cols - 2; gap = menubar->widget.cols - 2;
/* First, calculate gap between items... */ /* First, calculate gap between items... */
for (i = menubar->menu; i != NULL; i = g_list_next (i)) for (i = menubar->menu; i != NULL; i = g_list_next (i))
{ {
Menu *menu = i->data; Menu *menu = (Menu *) i->data;
/* preserve length here, to be used below */ /* preserve length here, to be used below */
menu->start_x = hotkey_width (menu->text) + 2; menu->start_x = hotkey_width (menu->text) + 2;
gap -= menu->start_x; gap -= menu->start_x;
@ -904,17 +890,18 @@ menubar_arrange (WMenuBar * menubar)
/* We are out of luck - window is too narrow... */ /* We are out of luck - window is too narrow... */
gap = 1; gap = 1;
} }
else if (gap >= 3)
gap = 3;
/* ...and now fix start positions of menubar items */ /* ...and now fix start positions of menubar items */
for (i = menubar->menu; i != NULL; i = g_list_next (i)) for (i = menubar->menu; i != NULL; i = g_list_next (i))
{ {
Menu *menu = i->data; Menu *menu = (Menu *) i->data;
int len = menu->start_x; int len = menu->start_x;
menu->start_x = start_x; menu->start_x = start_x;
start_x += len + gap; start_x += len + gap;
} }
#endif /* RESIZABLE_MENUBAR */
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */