Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2015-03-27 08:54:25 +0000
committerTom Schindl2015-03-27 08:54:25 +0000
commitc7d94451a989cc79e842e89848f9fd9ec7b497c7 (patch)
treeaf65307afcceb53ab22c79e8af01a891101f8d6e /experimental
parentcb342179601c206661e1de587d735d6a6aa812ee (diff)
downloadorg.eclipse.efxclipse-c7d94451a989cc79e842e89848f9fd9ec7b497c7.tar.gz
org.eclipse.efxclipse-c7d94451a989cc79e842e89848f9fd9ec7b497c7.tar.xz
org.eclipse.efxclipse-c7d94451a989cc79e842e89848f9fd9ec7b497c7.zip
removed debug
Diffstat (limited to 'experimental')
-rw-r--r--experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/graphics/GC.java1
-rw-r--r--experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/internal/swt.css16
-rw-r--r--experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/widgets/Composite.java47
3 files changed, 38 insertions, 26 deletions
diff --git a/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/graphics/GC.java b/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/graphics/GC.java
index a76bd49a4..4917aa178 100644
--- a/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/graphics/GC.java
+++ b/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/graphics/GC.java
@@ -439,7 +439,6 @@ public class GC extends Resource {
}
public Point stringExtent(String string) {
- System.err.println(string);
return gc.stringExtent(string);
}
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 e102a58e8..3d6f07c59 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,13 +1,15 @@
- /*.root {
- -fx-base: rgb(50, 50, 50);
- -fx-background: rgb(50, 50, 50);
- -fx-control-inner-background: rgb(50, 50, 50);
+/* .root {
+ -fx-base: #4d5052;
+ -fx-background: #4d5052;
+ -fx-control-inner-background: #4d5052;
+ -fx-text-base-color: #c7c7c7;
}*/
.swt-composite > .corner {
-fx-background-color: derive(-fx-base,-1%);
}
+
.swt-message-box {
-fx-padding: 10;
-fx-spacing: 10;
@@ -15,7 +17,7 @@
.swt-message-box > .swt-message-error {
-fx-graphic: url("icons/dialog-error.png");
- -fx-graphic-text-gap: 20;
+ -fx-graphic-text-gap: 20;
}
.swt-message-box > .swt-message-question {
@@ -47,7 +49,7 @@
}
.swt-tooltip > .message-element {
-
+
}
.swt-tooltip > .swt-text-error {
@@ -76,7 +78,7 @@
}
.styled-text-line:odd {
- -fx-background-color: transparent;
+ -fx-background-color: transparent;
}
.styled-text-line:filled:hover {
diff --git a/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/widgets/Composite.java b/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/widgets/Composite.java
index da8502ac7..007c24f58 100644
--- a/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/widgets/Composite.java
+++ b/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/widgets/Composite.java
@@ -582,28 +582,39 @@ public class Composite extends Scrollable {
return canvas;
}
+ private boolean inRedraw;
+
void redraw(double x, double y, double width, double height, boolean all) {
if( canvas != null ) {
- if( all ) {
- canvas.getGraphicsContext2D().clearRect(0,0,canvas.getWidth(),canvas.getHeight());
- x = 0;
- y = 0;
- width = canvas.getWidth();
- height = canvas.getHeight();
- } else {
- canvas.getGraphicsContext2D().clearRect(x,y,width,height);
+ if( inRedraw ) {
+ return;
+ }
+ try {
+ inRedraw = true;
+ if( all ) {
+ canvas.getGraphicsContext2D().clearRect(0,0,canvas.getWidth(),canvas.getHeight());
+ x = 0;
+ y = 0;
+ width = canvas.getWidth();
+ height = canvas.getHeight();
+ } else {
+ canvas.getGraphicsContext2D().clearRect(x,y,width,height);
+ }
+
+ Event event = new Event ();
+ GC gc = new GC(this);
+ event.gc = gc;
+ event.x = (int)x;
+ event.y = (int)y;
+ event.width = (int)width;
+ event.height = (int)height;
+ internal_sendEvent (SWT.Paint, event,true);
+ event.gc = null;
+ gc.dispose ();
+ } finally {
+ inRedraw = false;
}
- Event event = new Event ();
- GC gc = new GC(this);
- event.gc = gc;
- event.x = (int)x;
- event.y = (int)y;
- event.width = (int)width;
- event.height = (int)height;
- internal_sendEvent (SWT.Paint, event,true);
- event.gc = null;
- gc.dispose ();
}
}

Back to the top