Attachment 54685 Details for Bug 110971 – proposed patch (attempt 1)

[patch] proposed patch (attempt 1)

Patch_110971 (text/plain), 3.28 KB, created by Alex Boyko

on 2006-11-28 22:24:36 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Boyko

Created: 2006-11-28 22:24:36 EST

Size: 3.28 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.gmf.runtime.draw2d.ui
>Index: src/org/eclipse/gmf/runtime/draw2d/ui/figures/ListScrollBar.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/ListScrollBar.java,v
>retrieving revision 1.6
>diff -u -r1.6 ListScrollBar.java
>--- src/org/eclipse/gmf/runtime/draw2d/ui/figures/ListScrollBar.java	3 Oct 2006 15:04:52 -0000	1.6
>+++ src/org/eclipse/gmf/runtime/draw2d/ui/figures/ListScrollBar.java	29 Nov 2006 03:14:24 -0000
>@@ -18,7 +18,12 @@
> import org.eclipse.draw2d.ChangeEvent;
> import org.eclipse.draw2d.ChangeListener;
> import org.eclipse.draw2d.Clickable;
>+import org.eclipse.draw2d.ColorConstants;
>+import org.eclipse.draw2d.Graphics;
>+import org.eclipse.draw2d.IFigure;
> import org.eclipse.draw2d.MarginBorder;
>+import org.eclipse.draw2d.Panel;
>+import org.eclipse.draw2d.SchemeBorder;
> import org.eclipse.draw2d.ScrollBar;
> import org.eclipse.draw2d.geometry.Dimension;
> import org.eclipse.draw2d.geometry.Insets;
>@@ -136,9 +141,28 @@
> 		super.initialize();
> 		setPageUp(null);
> 		setPageDown(null);
>-		setThumb(null);
> 		setOpaque(false);
> 	}
>+	
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.draw2d.ScrollBar#createDefaultThumb()
>+	 */
>+	protected IFigure createDefaultThumb() {
>+		Panel thumb = new Panel() {
>+
>+			public void paint(Graphics graphics) {
>+				graphics.setAlpha(128);
>+				super.paint(graphics);
>+			}
>+			
>+		};
>+		thumb.setMinimumSize(new Dimension(6, 6));
>+		thumb.setBackgroundColor(ColorConstants.button);
>+
>+		thumb.setBorder(new SchemeBorder(SchemeBorder.SCHEMES.RIDGED));
>+		return thumb;
>+	}
>+
> 
> 	private void updateDownLabel() {
> 		Image icon = null;
>Index: src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/OverlayScrollPaneLayout.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/OverlayScrollPaneLayout.java,v
>retrieving revision 1.4
>diff -u -r1.4 OverlayScrollPaneLayout.java
>--- src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/OverlayScrollPaneLayout.java	3 Oct 2006 15:04:52 -0000	1.4
>+++ src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/OverlayScrollPaneLayout.java	29 Nov 2006 03:14:24 -0000
>@@ -79,14 +79,8 @@
> 		Viewport viewport = scrollpane.getViewport();
> 		Dimension available = clientArea.getSize();
> 		Dimension preferred = viewport.getPreferredSize(available.width, available.height).getCopy();
>-		boolean none = available.contains(preferred);
>-		boolean both =
>-			!none
>-				&& vVis != NEVER
>-				&& hVis != NEVER
>-				&& preferred.contains(available);
>-		boolean showV = both || (preferred.height > available.height && (available.height > 0));
>-		boolean showH = both || (preferred.width > available.width && (available.width > 0));
>+		boolean showV = preferred.height > available.height && available.height > 0;
>+		boolean showH = preferred.width > available.width && available.width > 0;
> 		//Adjust for visibility override flags
> 		showV = !(vVis == NEVER) && (showV || vVis == ALWAYS);
> 		showH = !(hVis == NEVER) && (showH || hVis == ALWAYS);

Actions: View | Diff

Attachments on bug 110971: 54685