Attachment 186113 Details for Bug 208626 – toplevel removal v01

[patch] toplevel removal v01

bug208626-v01.txt (text/plain), 1.30 KB, created by Paul Webster

on 2011-01-05 14:15:52 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Webster

Created: 2011-01-05 14:15:52 EST

Size: 1.30 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jface
>Index: src/org/eclipse/jface/action/MenuManager.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface/src/org/eclipse/jface/action/MenuManager.java,v
>retrieving revision 1.61
>diff -u -r1.61 MenuManager.java
>--- src/org/eclipse/jface/action/MenuManager.java	25 May 2009 20:52:37 -0000	1.61
>+++ src/org/eclipse/jface/action/MenuManager.java	5 Jan 2011 19:12:32 -0000
>@@ -895,7 +895,7 @@
>                             char character = Character.toUpperCase(text
>                                     .charAt(index + 1));
> 
>-                            if (callback.isAcceleratorInUse(SWT.ALT | character)) {
>+                            if (callback.isAcceleratorInUse(SWT.ALT | character) && isTopLevelMenu()) {
>                                 if (index == 0) {
>     								text = text.substring(1);
>     							} else {
>@@ -918,6 +918,16 @@
>         }
>     }
> 
>+	private boolean isTopLevelMenu() {
>+		if (menu != null && !menu.isDisposed() && menuItem != null
>+				&& !menuItem.isDisposed()) {
>+			Menu parentMenu = menuItem.getParent();
>+			return parentMenu != null
>+					&& ((parentMenu.getStyle() & SWT.BAR) == SWT.BAR);
>+		}
>+		return false;
>+	}
>+
> 	/**
> 	 * Dispose any images allocated for this menu
> 	 */

Actions: View | Diff

Attachments on bug 208626: 186113