X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.utils.ui%2Fsrc%2Forg%2Fsimantics%2Futils%2Fui%2Fcolor%2FColorGradientCanvas.java;h=11ba7642b6240b9883a968d02c31d62ad68fac22;hb=refs%2Fchanges%2F15%2F415%2F4;hp=356de7ad0358d401f92cbd3240c74f454a081ad1;hpb=969bd23cab98a79ca9101af33334000879fb60c5;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.utils.ui/src/org/simantics/utils/ui/color/ColorGradientCanvas.java b/bundles/org.simantics.utils.ui/src/org/simantics/utils/ui/color/ColorGradientCanvas.java
index 356de7ad0..11ba7642b 100644
--- a/bundles/org.simantics.utils.ui/src/org/simantics/utils/ui/color/ColorGradientCanvas.java
+++ b/bundles/org.simantics.utils.ui/src/org/simantics/utils/ui/color/ColorGradientCanvas.java
@@ -1,61 +1,67 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management
- * in Industry THTH ry.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     VTT Technical Research Centre of Finland - initial API and implementation
- *******************************************************************************/
-package org.simantics.utils.ui.color;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * 
- * Canvas that shows color gradients
- * 
- * @author Marko Luukkainen
- *
- */
-public class ColorGradientCanvas extends Canvas{
-	ColorGradient gradient;
-	int style;
-	
-	public ColorGradientCanvas(Composite parent, int style) {
-		// FIXME : use xor operation to get SWT.HORIZONTAL and SWT.VERTICAL
-		// out of style when it's passed to parent
-		super(parent,SWT.BORDER);
-		this.style = style & (SWT.VERTICAL | SWT.HORIZONTAL) ;
-		addPaintListener(new PaintListener() {
-	    	public void paintControl(PaintEvent e) {
-	    		GC gc = e.gc;
-	    		Rectangle clip = gc.getClipping();
-	    		if (gradient != null) {
-	    			Image image = gradient.getGradientImage(clip.width,clip.height,ColorGradientCanvas.this.style);
-	    			gc.drawImage(image, 0, 0);
-	    			image.dispose();		
-	    		} else {
-	    			gc.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
-	    			gc.fillRectangle(clip);
-	    		}
-	    	}
-	    });
-	}
-	
-	public void setGradient(ColorGradient gradient) {
-		this.gradient = gradient;
-		this.redraw();
-	}		
-
-}
+/*******************************************************************************
+ * Copyright (c) 2007, 2010 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.utils.ui.color;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.PaintEvent;
+import org.eclipse.swt.events.PaintListener;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Canvas;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * 
+ * Canvas that shows color gradients
+ * 
+ * @author Marko Luukkainen
+ *
+ */
+public class ColorGradientCanvas extends Canvas{
+	ColorGradient gradient;
+	int style;
+	
+	public ColorGradientCanvas(Composite parent, int style) {
+		super(parent,(style|SWT.BORDER)&(~(SWT.VERTICAL|SWT.HORIZONTAL)));
+		this.style = style & (SWT.VERTICAL | SWT.HORIZONTAL) ;
+		addPaintListener(createPaintListener());
+	}
+	
+	public void setGradient(ColorGradient gradient) {
+		this.gradient = gradient;
+		this.redraw();
+	}	
+	
+	protected PaintListener createPaintListener() {
+		return new PaintListener() {
+	    	public void paintControl(PaintEvent e) {
+	    		GC gc = e.gc;
+	    		Rectangle clip = gc.getClipping();
+	    		paintGradient(gc, clip);
+	    	}
+	    };
+	}
+	
+	protected void paintGradient(GC gc, Rectangle clip) {
+		if (gradient != null) {
+			Image image = gradient.getGradientImage(clip.width,clip.height,ColorGradientCanvas.this.style);
+			gc.drawImage(image, 0, 0);
+			image.dispose();		
+		} else {
+			gc.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
+			gc.fillRectangle(clip);
+		}
+	}
+
+}