Skip to content

Commit

Permalink
Force repaint in NativeGraphicsSource to fix broken animation
Browse files Browse the repository at this point in the history
When the FigureCanvas is created with SWT.DOUBLE_BUFFERED, animations
are not painted correctly. This is because an instance of
NativeGraphicsSource is used internally, which doesn't paint
synchronously.

Because the animation is done inside the UI thread, this paint operation
is only processed after the animation is done.

Resolves #376
  • Loading branch information
ptziegler committed May 29, 2024
1 parent d606e62 commit b7da139
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion org.eclipse.draw2d/src/org/eclipse/draw2d/Animation.java
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ public static void run() {
* @since 3.2
*/
public static void run(int duration) {
if (state == 0) {
if (state == 0 || state == PLAYBACK) {
return;
}
try {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2005, 2010 IBM Corporation and others.
* Copyright (c) 2005, 2024 IBM Corporation and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand Down Expand Up @@ -56,6 +56,9 @@ public Graphics getGraphics(Rectangle r) {

// canvas.update();

// canvas.update() paints too much and only works on Windows. Use
// readAndDispatch() to only paint the redraw() event.
canvas.getDisplay().readAndDispatch();
return null;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ private void doTest(Snippet annotation, Statement statement) throws Throwable {
robot = new GraphicalRobot(graph);
shell = graph.getShell();
// Wait for layout to be applied
waitEventLoop(0);
waitEventLoop(10);
// Run the actual test
statement.evaluate();
} catch (Throwable e) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@
import org.eclipse.draw2d.Label;
import org.eclipse.draw2d.geometry.Point;

import org.junit.Ignore;
import org.junit.Test;

/**
Expand Down Expand Up @@ -110,7 +109,6 @@ protected boolean hasGraph(Lookup lookup, Snippet snippet) throws ReflectiveOper
* @see <a href="https://github.com/eclipse/gef-classic/issues/376">here</a>
*/
@Test
@Ignore
@Snippet(type = AnimationSnippet.class)
public void testAnimationSnippet() {
AtomicInteger repaintCount = new AtomicInteger();
Expand Down

0 comments on commit b7da139

Please sign in to comment.