Attachment 196384 Details for Bug 346914 – patch variant1

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

[patch] patch variant1

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

on 2011-05-23 18:44:14 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Arnaud MERGEY

Created: 2011-05-23 18:44:14 EDT

Size: 2.23 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.zest.core
>Index: src/org/eclipse/zest/core/widgets/Graph.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.zest.core/src/org/eclipse/zest/core/widgets/Graph.java,v
>retrieving revision 1.2
>diff -u -r1.2 Graph.java
>--- src/org/eclipse/zest/core/widgets/Graph.java	5 Apr 2011 22:18:00 -0000	1.2
>+++ src/org/eclipse/zest/core/widgets/Graph.java	23 May 2011 22:42:35 -0000
>@@ -46,6 +46,7 @@
> import org.eclipse.swt.widgets.Display;
> import org.eclipse.swt.widgets.Event;
> import org.eclipse.swt.widgets.Item;
>+import org.eclipse.swt.widgets.ScrollBar;
> import org.eclipse.zest.core.widgets.internal.ContainerFigure;
> import org.eclipse.zest.core.widgets.internal.RevealListener;
> import org.eclipse.zest.core.widgets.internal.ZestRootLayer;
>@@ -123,6 +124,8 @@
> 		this.style = style;
> 		this.setBackground(ColorConstants.white);
> 
>+		createScrollBars(style);
>+
> 		LIGHT_BLUE = new Color(Display.getDefault(), 216, 228, 248);
> 		LIGHT_BLUE_CYAN = new Color(Display.getDefault(), 213, 243, 255);
> 		GREY_BLUE = new Color(Display.getDefault(), 139, 150, 171);
>@@ -366,6 +369,13 @@
> 	 * Dispose of the nodes and edges when the graph is disposed.
> 	 */
> 	public void dispose() {
>+		if (horizontalBar != null) {
>+			horizontalBar.dispose();
>+		}
>+		if (verticalBar != null) {
>+			verticalBar.dispose();
>+		}
>+
> 		while (nodes.size() > 0) {
> 			GraphNode node = (GraphNode) nodes.get(0);
> 			if (node != null && !node.isDisposed()) {
>@@ -1239,4 +1249,27 @@
> 		return (GraphItem) figure2ItemMap.get(figure);
> 	}
> 
>+	public ScrollBar getHorizontalBar() {
>+		checkWidget();
>+		return horizontalBar;
>+	}
>+
>+	public ScrollBar getVerticalBar() {
>+		checkWidget();
>+		return verticalBar;
>+	}
>+
>+	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