Make ToolItem non focusable by mouse On Windows (at least), the ToolItem/ToolBar is not focusable by mouse regardless SWT.NO_FOCUS style flag. This flag only affects tab traversal. Bug 519499: Toolbar Get / Lost Focus events handles different from SWT https://bugs.eclipse.org/bugs/show_bug.cgi?id=519499 Change-Id: I2e081a18aa21bab8cc013d0ace9d79a569fe4d1b
diff --git a/bundles/org.eclipse.rap.rwt/js/rwt/event/EventHandlerUtil.js b/bundles/org.eclipse.rap.rwt/js/rwt/event/EventHandlerUtil.js index c9c55d3..d703547 100644 --- a/bundles/org.eclipse.rap.rwt/js/rwt/event/EventHandlerUtil.js +++ b/bundles/org.eclipse.rap.rwt/js/rwt/event/EventHandlerUtil.js
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2018 1&1 Internet AG, Germany, http://www.1und1.de, + * Copyright (c) 2004, 2020 1&1 Internet AG, Germany, http://www.1und1.de, * EclipseSource, and others. * * All rights reserved. This program and the accompanying materials @@ -203,7 +203,9 @@ if( root ) { var focusTarget = target; while( !focusTarget.isFocusable() && focusTarget != root ) { - if( focusTarget instanceof rwt.widgets.MenuBar ) { + if( focusTarget instanceof rwt.widgets.MenuBar + || focusTarget instanceof rwt.widgets.ToolItem ) + { return; } focusTarget = focusTarget.getParent();