Attachment 145530 Details for Bug 285988 – Proposed patch

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

[patch] Proposed patch

Bug-285988.patch (text/plain), 2.64 KB, created by Jordan Yakovchev

on 2009-08-25 07:48:58 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jordan Yakovchev

Created: 2009-08-25 07:48:58 EDT

Size: 2.64 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt.q07
>Index: js/org/eclipse/swt/widgets/Combo.js
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/js/org/eclipse/swt/widgets/Combo.js,v
>retrieving revision 1.27
>diff -u -r1.27 Combo.js
>--- js/org/eclipse/swt/widgets/Combo.js	11 Aug 2009 10:31:13 -0000	1.27
>+++ js/org/eclipse/swt/widgets/Combo.js	25 Aug 2009 05:23:51 -0000
>@@ -346,9 +346,7 @@
>       } else {
>         this._resetListSelection();
>       }
>-      if( !this._dropped ) {
>-        this._sendWidgetSelected();
>-      }
>+      this._sendWidgetSelected();
>     },
>     
>     _formatText : function( value ) {
>@@ -428,17 +426,17 @@
>         evt.stopPropagation();
>         var toSelect;
>         var isSelected = this._selected;
>-        if( evt.getWheelDelta() < 0 ) {
>-          toSelect =   isSelected
>-                     ? this._manager.getNext( isSelected )
>-                     : this._manager.getFirst();
>-        } else {
>-          toSelect =   isSelected
>-                     ? this._manager.getPrevious( isSelected )
>-                     : this._manager.getLast();
>-        }
>-        if( toSelect ) {
>-          this._setSelected( toSelect );
>+        if( isSelected ) {
>+          if( evt.getWheelDelta() < 0 ) {
>+            toSelect = this._manager.getNext( isSelected );
>+          } else {
>+            toSelect = this._manager.getPrevious( isSelected );
>+          }
>+          if( toSelect ) {
>+            this._setSelected( toSelect );
>+          }
>+        } else if( this._list.getChildrenLength() ) {
>+          this._setSelected( this._list.getChildren()[0] );
>         }
>       }
>     },
>@@ -484,7 +482,6 @@
>         case "Escape":
>           if( this._dropped ) {
>             this._toggleListVisibility();
>-            this._setSelected( this._manager.getSelectedItem() );
>           } 
>           this.setFocused( true );
>           evt.stopPropagation();
>@@ -538,9 +535,13 @@
>         case "Down":
>         case "PageUp":
>         case "PageDown":
>-          this._list._onkeypress( evt );
>-          var selected = this._manager.getSelectedItem();
>-          this._setSelected( selected );
>+          if( this._selected ) {
>+            this._list._onkeypress( evt );
>+            var selected = this._manager.getSelectedItem();
>+            this._setSelected( selected );
>+          } else if( this._list.getChildrenLength() ) {
>+            this._setSelected( this._list.getChildren()[0] );
>+          }
>           break;
>         default:
>           charCode = evt.getCharCode();

Actions: View | Diff

Attachments on bug 285988: 143766 | 143767 | 145530