Menus [1/6]: Fix keyboard navigation in multi-column menus

Michael Kaufmann hallo at michael-kaufmann.ch
Wed Apr 19 14:32:10 CDT 2006


Please apply the following patches in order.

Changelog:
 - Menus: Fix keyboard navigation in multi-column menus with 
MF_MENUBREAK style
-------------- next part --------------
--- menu.c	2006-04-19 21:04:08.000000000 +0200
+++ menu-new.c	2006-04-19 21:04:12.000000000 +0200
@@ -522,7 +522,7 @@
 	return i;
 
     for( ; i < menu->nItems; ++i ) {
-	if (menu->items[i].fType & MF_MENUBARBREAK)
+	if (menu->items[i].fType & (MF_MENUBREAK | MF_MENUBARBREAK))
 	    return i;
     }
 
@@ -552,14 +552,14 @@
     /* Find the start of the column */
 
     for(i = menu->FocusedItem; i != 0 &&
-	 !(menu->items[i].fType & MF_MENUBARBREAK);
+	 !(menu->items[i].fType & (MF_MENUBREAK | MF_MENUBARBREAK));
 	--i); /* empty */
 
     if(i == 0)
 	return NO_SELECTED_ITEM;
 
     for(--i; i != 0; --i) {
-	if (menu->items[i].fType & MF_MENUBARBREAK)
+	if (menu->items[i].fType & (MF_MENUBREAK | MF_MENUBARBREAK))
 	    break;
     }
 


More information about the wine-patches mailing list