Attachment 166286 Details for Bug 310767 – Proposed patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Proposed patch

Bug-310767.patch (text/plain), 2.91 KB, created by Ivan Furnadjiev

on 2010-04-28 03:24:37 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Furnadjiev

Created: 2010-04-28 03:24:37 EDT

Size: 2.91 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt.q07
>Index: js/org/eclipse/swt/widgets/Shell.js
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/js/org/eclipse/swt/widgets/Shell.js,v
>retrieving revision 1.26
>diff -u -r1.26 Shell.js
>--- js/org/eclipse/swt/widgets/Shell.js	27 Apr 2010 08:46:13 -0000	1.26
>+++ js/org/eclipse/swt/widgets/Shell.js	28 Apr 2010 07:23:48 -0000
>@@ -20,11 +20,13 @@
>     //      is a 'protected' field on class Window
>     this._captionTitle.setMode( "html" );
>     this._activeControl = null;
>+    this._focusControl = null;
>     this._activateListenerWidgets = new Array();
>     this._parentShell = null;
>     this._renderZIndex = true;
>     // TODO [rh] check whether these listeners must be removed upon disposal
>     this.addEventListener( "changeActiveChild", this._onChangeActiveChild );
>+    this.addEventListener( "changeFocusedChild", this._onChangeFocusedChild );
>     this.addEventListener( "changeActive", this._onChangeActive );
>     this.addEventListener( "changeMode", this._onChangeMode );
>     this.addEventListener( "changeLeft", this._onChangeLocation );
>@@ -150,6 +152,7 @@
>   destruct : function() {
>     this.setParentShell( null );
>     this.removeEventListener( "changeActiveChild", this._onChangeActiveChild );
>+    this.removeEventListener( "changeFocusedChild", this._onChangeFocusedChild );
>     this.removeEventListener( "changeActive", this._onChangeActive );
>     this.removeEventListener( "changeMode", this._onChangeMode );
>     this.removeEventListener( "changeLeft", this._onChangeLocation );
>@@ -365,6 +368,12 @@
>         }
>       }
>     },
>+    
>+    _onChangeFocusedChild : function( evt ) {
>+      if( org_eclipse_rap_rwt_EventUtil_suspend ) {
>+        this._focusControl = this.getFocusedChild();
>+      }
>+    },
> 
>     _onChangeActive : function( evt ) {
>       // TODO [rst] This hack is a workaround for bug 345 in qooxdoo, remove this
>@@ -450,13 +459,14 @@
> 
>     _onSend : function( evt ) {
>       if( this.getActive() ) {
>-        var widgetManager = org.eclipse.swt.WidgetManager.getInstance();
>-        var focusedChildId = null;
>-        if( this.getFocusedChild() != null ) {
>-          focusedChildId = widgetManager.findIdByWidget( this.getFocusedChild() );
>+        var focusedChild = this.getFocusedChild();
>+        if( focusedChild != null && focusedChild != this._focusControl ) {
>+          this._focusControl = focusedChild;
>+          var widgetManager = org.eclipse.swt.WidgetManager.getInstance();
>+          var focusedChildId = widgetManager.findIdByWidget( focusedChild );
>+          var req = org.eclipse.swt.Request.getInstance();
>+          req.addParameter( req.getUIRootId() + ".focusControl", focusedChildId );    
>         }
>-        var req = org.eclipse.swt.Request.getInstance();
>-        req.addParameter( req.getUIRootId() + ".focusControl", focusedChildId );
>       }
>     },
>

Actions: View | Diff

Attachments on bug 310767: 166286