X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.utils.ui%2Fsrc%2Forg%2Fsimantics%2Futils%2Fui%2Fcolor%2FColorGradientCanvas.java;h=27daeeb717dd647d018e1f9b07feeeec4c270c4a;hp=356de7ad0358d401f92cbd3240c74f454a081ad1;hb=bf75fd9740858140eac90c18f0bca0aea3893248;hpb=21f879fcd72d7749836fb64375094ef29573fe8c

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..27daeeb71 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
@@ -33,29 +33,35 @@ public class ColorGradientCanvas extends Canvas{
 	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);
+		super(parent,(style|SWT.BORDER)&(~(SWT.VERTICAL|SWT.HORIZONTAL)));
 		this.style = style & (SWT.VERTICAL | SWT.HORIZONTAL) ;
-		addPaintListener(new PaintListener() {
+		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();
-	    		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);
-	    		}
+	    		paintGradient(gc, clip);
 	    	}
-	    });
+	    };
 	}
 	
-	public void setGradient(ColorGradient gradient) {
-		this.gradient = gradient;
-		this.redraw();
-	}		
+	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);
+		}
+	}
 
 }