Attachment 195854 Details for Bug 343820 – fix

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

[patch] fix

ScrollBarRepeatBug.patch (text/plain), 2.82 KB, created by Tim Buschtoens

on 2011-05-17 09:33:20 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Buschtoens

Created: 2011-05-17 09:33:20 EDT

Size: 2.82 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt.q07
>Index: js/org/eclipse/swt/widgets/AbstractSlider.js
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/js/org/eclipse/swt/widgets/AbstractSlider.js,v
>retrieving revision 1.5
>diff -u -r1.5 AbstractSlider.js
>--- js/org/eclipse/swt/widgets/AbstractSlider.js	28 Mar 2011 09:25:12 -0000	1.5
>+++ js/org/eclipse/swt/widgets/AbstractSlider.js	17 May 2011 13:29:10 -0000
>@@ -171,7 +171,9 @@
>     },
> 
>     _onMouseOut : function( event ) {
>-      if( this._autoRepeat.slice( 0, 4 ) === "line" ) {
>+      var target = event.getRelatedTarget();
>+      var outOfSlider = target !== this && !this.contains( target );
>+      if( outOfSlider && this._autoRepeat.slice( 0, 4 ) === "line" ) {
>         this.setCapture( true );
>         this._delayTimer.stop();
>         this._repeatTimer.stop();
>@@ -223,10 +225,12 @@
>     },
> 
>     _onThumbMouseUp : function( event ) {
>-      event.stopPropagation();
>-      this._repeatTimer.stop();
>-      this._thumb.setCapture( false );
>-      this._thumb.removeState( "pressed" );
>+      if( this._thumb.hasState( "pressed" ) ) {
>+        event.stopPropagation();
>+        this._repeatTimer.stop();
>+        this._thumb.setCapture( false );
>+        this._thumb.removeState( "pressed" );
>+      }
>     },
> 
>     ////////////
>#P org.eclipse.rap.rwt.q07.jstest
>Index: js/org/eclipse/rwt/test/tests/SliderTest.js
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/SliderTest.js,v
>retrieving revision 1.9
>diff -u -r1.9 SliderTest.js
>--- js/org/eclipse/rwt/test/tests/SliderTest.js	29 Mar 2011 20:34:24 -0000	1.9
>+++ js/org/eclipse/rwt/test/tests/SliderTest.js	17 May 2011 13:29:12 -0000
>@@ -443,6 +443,24 @@
>       slider.destroy();
>     },
> 
>+    testHoldOnLineMouseUpOnThumb : function() {
>+      var testUtil = org.eclipse.rwt.test.fixture.TestUtil;
>+      var slider = this._createSlider( false );
>+      var node = slider.getElement();
>+      var left = qx.event.type.MouseEvent.buttons.left;
>+      var thumb = slider._thumb.getElement();
>+      testUtil.fakeMouseEventDOM( node, "mousedown", left, 11, 50 );
>+      assertEquals( 10, slider._selection );
>+      testUtil.fakeMouseEventDOM( thumb, "mouseup", left, 11, 50 );
>+      try {
>+        testUtil.forceInterval( slider._delayTimer ); // start scrolling
>+      } catch( ex ) {
>+        // expected
>+      }
>+      assertFalse( slider._repeatTimer.isEnabled() );
>+      slider.destroy();
>+    },
>+
>     testHoldOnLineMouseOut : function() {
>       var testUtil = org.eclipse.rwt.test.fixture.TestUtil;
>       var slider = this._createSlider( false );

Flags:

ivan: review+

Actions: View | Diff

Attachments on bug 343820: 195854