Attachment 196385 Details for Bug 346914 – patch variant2

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

[patch] patch variant2

clipboard.txt (text/plain), 2.10 KB, created by Arnaud MERGEY

on 2011-05-23 18:55:35 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Arnaud MERGEY

Created: 2011-05-23 18:55:35 EDT

Size: 2.10 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt
>Index: src/org/eclipse/swt/widgets/Scrollable.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Scrollable.java,v
>retrieving revision 1.13
>diff -u -r1.13 Scrollable.java
>--- src/org/eclipse/swt/widgets/Scrollable.java	16 Dec 2010 21:09:56 -0000	1.13
>+++ src/org/eclipse/swt/widgets/Scrollable.java	23 May 2011 22:53:37 -0000
>@@ -11,6 +11,8 @@
>  ******************************************************************************/
> package org.eclipse.swt.widgets;
> 
>+import org.eclipse.swt.SWT;
>+import org.eclipse.swt.SWTException;
> import org.eclipse.swt.graphics.Rectangle;
> 
> /**
>@@ -66,6 +68,7 @@
>    */
>   public Scrollable( final Composite parent, final int style ) {
>     super( parent, style );
>+    createScrollBars( style );
>   }
> 
>   /**
>@@ -158,9 +161,7 @@
>    */
>   public ScrollBar getHorizontalBar() {
>     checkWidget();
>-    /* [austin] - Subclasses should override.  Default implementation returns null, 
>-        but this should eventually provide the scrollbars for subtypes as in SWT. */
>-    return null;
>+    return horizontalBar;
>   }
> 
>   /**
>@@ -178,9 +179,7 @@
>    */
>   public ScrollBar getVerticalBar() {
>     checkWidget();
>-    /* [austin] - Subclasses should override.  Default implementation returns null, 
>-        but this should eventually provide the scrollbars for subtypes as in SWT. */
>-    return null;
>+    return verticalBar;
>   }
> 
>   int getVScrollBarWidth() {
>@@ -192,4 +191,19 @@
>     //subclasses may override
>     return 0;
>   }
>+
>+
>+private ScrollBar horizontalBar;
>+private ScrollBar verticalBar;
>+
>+  private void createScrollBars( final int style ) {
>+    if( ( style & SWT.H_SCROLL ) != 0 ) {
>+      horizontalBar = new ScrollBar( this, SWT.H_SCROLL );
>+      horizontalBar.setVisible( false );
>+    }
>+    if( ( style & SWT.V_SCROLL ) != 0 ) {
>+      verticalBar = new ScrollBar( this, SWT.V_SCROLL );
>+      verticalBar.setVisible( false );
>+    }
>+  }
> }

Actions: View | Diff

Attachments on bug 346914: 196381 | 196384 | 196385 | 196387