fixed opacity treatment

7 files changed, 32 insertions, 19 deletions

diff --git a/experimental/swt/org.eclipse.fx.runtime.swt/src-styledtext-fx/org/eclipse/swt/custom/StyledText.java b/experimental/swt/org.eclipse.fx.runtime.swt/src-styledtext-fx/org/eclipse/swt/custom/StyledText.java
index f5ef58b5d..1fdb7b247 100644
--- a/experimental/swt/org.eclipse.fx.runtime.swt/src-styledtext-fx/org/eclipse/swt/custom/StyledText.java
+++ b/experimental/swt/org.eclipse.fx.runtime.swt/src-styledtext-fx/org/eclipse/swt/custom/StyledText.java
@@ -35,10 +35,16 @@ public class StyledText extends Canvas {
 	@Override

 	protected Region createWidget() {

 		nativeObject = new StyledTextArea();

+		setContent(new DefaultContent());

 		return nativeObject;

 	}

 	

 	@Override

+	protected void initListeners() {

+		super.initListeners();

+	}

+	

+	@Override

 	public Region internal_getNativeObject() {

 		return nativeObject;

 	}

@@ -59,7 +65,7 @@ public class StyledText extends Canvas {
 		fxTextStyle.borderStyle = swtRange.borderStyle;

 		fxTextStyle.data = swtRange.data;

 		fxTextStyle.font = swtRange.font != null ? swtRange.font.internal_getNativeObject() : null;

-		fxTextStyle.foreground = swtRange.foreground != null ? swtRange.foreground.internal_getNativeObject() : null;

+		fxTextStyle.foreground = swtRange.foreground != null ? swtRange.foreground.internal_getNativeObject() : javafx.scene.paint.Color.BLACK;

 		fxTextStyle.rise = swtRange.rise;

 		fxTextStyle.strikeout = swtRange.strikeout;

 		fxTextStyle.strikeoutColor = swtRange.strikeoutColor != null ? swtRange.strikeoutColor.internal_getNativeObject() : null;

@@ -818,6 +824,7 @@ public class StyledText extends Canvas {
 							l.textChanged(e);

 						}

 					}

+					System.err.println("NEW TEXT: " + getTextRange(0, getCharCount()));

 				}

 			};

 		}

diff --git a/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/graphics/Color.java b/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/graphics/Color.java
index 71445343e..ace87c33f 100644
--- a/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/graphics/Color.java
+++ b/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/graphics/Color.java
@@ -12,6 +12,20 @@ public class Color extends Resource {
 		color = javafx.scene.paint.Color.rgb(red, green, blue);

 	}

 	

+	/**

+	 * Internal API

+	 * @param device

+	 * @param red

+	 * @param green

+	 * @param blue

+	 * @param opacity

+	 * @noreference 

+	 */

+	public Color(Device device, int red, int green, int blue, double opacity ) {

+		super(device);

+		color = javafx.scene.paint.Color.rgb(red, green, blue, opacity);

+	}

+	

 	public int getRed() {

 		return (int)(color.getRed() * 255);

 	}

diff --git a/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/graphics/Pattern.java b/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/graphics/Pattern.java
index 60a15c59b..29e3e14b7 100644
--- a/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/graphics/Pattern.java
+++ b/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/graphics/Pattern.java
@@ -1,6 +1,5 @@
 package org.eclipse.swt.graphics;

 

-import org.eclipse.swt.internal.Util;

 

 public class Pattern extends Resource {

 	javafx.scene.paint.Color color1;

@@ -24,8 +23,8 @@ public class Pattern extends Resource {
 	public Pattern(Device device, float x1, float y1, float x2, float y2, Color color1, int alpha1, Color color2, int alpha2) {

 		super(device);

 		this.color1 = color1.internal_getNativeObject();

-		this.color1 = javafx.scene.paint.Color.rgb(color1.getRed(), color1.getGreen(), color1.getBlue(), Util.alphaToOpacity(alpha1));

-		this.color2 = javafx.scene.paint.Color.rgb(color2.getRed(), color2.getGreen(), color2.getBlue(), Util.alphaToOpacity(alpha2));

+		this.color1 = javafx.scene.paint.Color.rgb(color1.getRed(), color1.getGreen(), color1.getBlue(), alpha1 / 255.0);

+		this.color2 = javafx.scene.paint.Color.rgb(color2.getRed(), color2.getGreen(), color2.getBlue(), alpha2 / 255.0);

 		this.x1 = x1;

 		this.x2 = x2;

 		this.y1 = y1;

diff --git a/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/internal/CanvasGC.java b/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/internal/CanvasGC.java
index 4fcea9720..9c6ca737d 100644
--- a/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/internal/CanvasGC.java
+++ b/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/internal/CanvasGC.java
@@ -115,7 +115,7 @@ public class CanvasGC implements DrawableGC {
 	

 	@Override

 	public void setAlpha(int alpha) {

-		canvas.getGraphicsContext2D().setGlobalAlpha(Util.alphaToOpacity(alpha));

+		canvas.getGraphicsContext2D().setGlobalAlpha(alpha / 255.0);

 	}

 	

 	@Override

diff --git a/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/internal/Util.java b/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/internal/Util.java
index 10e68e1a8..96976bd89 100644
--- a/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/internal/Util.java
+++ b/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/internal/Util.java
@@ -57,14 +57,6 @@ public class Util {
 		return string;

 	}

 	

-	public static double alphaToOpacity(int alpha) {

-		return (255 - alpha) / 255.0;

-	}

-	

-	public static int opacityToAlpha(double o) {

-		return (int)((o * 255.0 - 255 ) * -1);

-	}

-	

 	public static String notNull(String text) {

 		return text == null ? "" : text;

 	}

diff --git a/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/internal/swt.css b/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/internal/swt.css
index 0c59de2bb..e95f3d49d 100644
--- a/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/internal/swt.css
+++ b/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/internal/swt.css
@@ -1,3 +1,9 @@
+ /*.root {

+    -fx-base: rgb(50, 50, 50);

+    -fx-background: rgb(50, 50, 50);

+    -fx-control-inner-background:  rgb(50, 50, 50);

+}*/

+

 .swt-composite > .corner {

 	-fx-background-color: derive(-fx-base,-1%);

 }

diff --git a/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/widgets/TabItem.java b/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/widgets/TabItem.java
index 21d62ff8d..55f615b7a 100644
--- a/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/widgets/TabItem.java
+++ b/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/widgets/TabItem.java
@@ -40,15 +40,10 @@ public class TabItem extends Item {
 	}

 	

 	@Override

-	public String getText() {

-		checkWidget();

-		return notNullString(tab.getText());

-	}

-

-	@Override

 	public void setText(String string) {

 		checkWidget();

 		if (string == null) error (SWT.ERROR_NULL_ARGUMENT);

+		super.setText(string);

 		tab.setText(string);

 	}