Skip to content

Coalesce queued Display size-change events to protect EDT #4593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shai-almog merged 2 commits into from
Mar 5, 2026
+80 −42
Merged

Coalesce queued Display size-change events to protect EDT #4593

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f679645
Coalesce queued size change events on EDT
shai-almog Mar 5, 2026
8996947
Debounce JavaSE resize notifications without changing Display queue
shai-almog Mar 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 80 additions & 42 deletions Ports/JavaSE/src/com/codename1/impl/javase/JavaSEPort.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2075,6 +2075,83 @@ private boolean isPinchZoom(MouseEvent e) {
private Cursor defaultCursor = Cursor.getDefaultCursor();
private int currentCursor = 0;
private java.util.Timer reSize;
private final Object pendingSizeChangeLock = new Object();
private int pendingSizeChangeWidth = -1;
private int pendingSizeChangeHeight = -1;
private boolean pendingSizeChangeQueued;
private boolean pendingRevalidateAfterSizeChange;
private boolean pendingForceRevalidateAfterSizeChange;
private boolean pendingResetGraphicsAfterSizeChange;
private boolean pendingDelayedWindowRepaint;

private void queueSizeChangeEvent(int w, int h, boolean revalidate, boolean forceRevalidate, boolean resetGraphics, boolean delayedWindowRepaint) {
synchronized (pendingSizeChangeLock) {
pendingSizeChangeWidth = w;
pendingSizeChangeHeight = h;
pendingRevalidateAfterSizeChange |= revalidate;
pendingForceRevalidateAfterSizeChange |= forceRevalidate;
pendingResetGraphicsAfterSizeChange |= resetGraphics;
pendingDelayedWindowRepaint |= delayedWindowRepaint;
if (pendingSizeChangeQueued) {
return;
}
pendingSizeChangeQueued = true;
}
Display.getInstance().callSerially(new Runnable() {
public void run() {
int queuedW;
int queuedH;
boolean doRevalidate;
boolean doForceRevalidate;
boolean doResetGraphics;
boolean doDelayedWindowRepaint;
synchronized (pendingSizeChangeLock) {
queuedW = pendingSizeChangeWidth;
queuedH = pendingSizeChangeHeight;
doRevalidate = pendingRevalidateAfterSizeChange;
doForceRevalidate = pendingForceRevalidateAfterSizeChange;
doResetGraphics = pendingResetGraphicsAfterSizeChange;
doDelayedWindowRepaint = pendingDelayedWindowRepaint;
pendingRevalidateAfterSizeChange = false;
pendingForceRevalidateAfterSizeChange = false;
pendingResetGraphicsAfterSizeChange = false;
pendingDelayedWindowRepaint = false;
pendingSizeChangeQueued = false;
}

JavaSEPort.this.sizeChanged(queuedW, queuedH);

if (doResetGraphics) {
g2dInstance = null;
}

Form f = Display.getInstance().getCurrent();
if (f != null) {
if (doForceRevalidate) {
f.forceRevalidate();
} else if (doRevalidate) {
f.revalidate();
}
}

if (doDelayedWindowRepaint) {
new Thread(new Runnable() {
@Override
public void run() {
try {
Thread.sleep(1500);
} catch (Exception e) {
}
if (window != null) {
window.repaint();
}
}
}).start();
reSize = null;
}
}
});
}

public void mouseMoved(MouseEvent e) {
e.consume();
Expand Down Expand Up @@ -2138,11 +2215,7 @@ public void setBounds(int x, int y, int w, int h) {
Preferences pref = Preferences.userNodeForPackage(JavaSEPort.class);
boolean desktopSkin = pref.getBoolean("desktopSkin", false);
if (getSkin() == null && !desktopSkin) {
Display.getInstance().callSerially(new Runnable() {
public void run() {
JavaSEPort.this.sizeChanged((int)(getWidth() * retinaScale), (int)(getHeight() * retinaScale));
}
});
queueSizeChangeEvent((int)(getWidth() * retinaScale), (int)(getHeight() * retinaScale), false, false, false, false);
}

}
Expand Down Expand Up @@ -2186,17 +2259,7 @@ public void run() {
setSize((int)topSize.getWidth(), (int)topSize.getHeight());
canvas.setForcedSize(new Dimension(getWidth(), getHeight()));

Display.getInstance().callSerially(new Runnable() {
public void run() {

JavaSEPort.this.sizeChanged((int)(getWidth() * retinaScale), (int)(getHeight() * retinaScale));

Form f = Display.getInstance().getCurrent();
if (f != null) {
f.revalidate();
}
}
});
queueSizeChangeEvent((int)(getWidth() * retinaScale), (int)(getHeight() * retinaScale), true, false, false, false);
return;
}

Expand All @@ -2214,32 +2277,7 @@ public void run() {
// System.out.println("Resize with media container");
// JavaSEPort.this.sizeChanged((int)(mediaContainer.getWidth() * retinaScale), (int)(mediaContainer.getHeight() * retinaScale));
//}else{
Display.getInstance().callSerially(new Runnable() {
public void run() {
JavaSEPort.this.sizeChanged((int)(getWidth() * retinaScale), (int)(getHeight() * retinaScale));
g2dInstance = null;
Form f = Display.getInstance().getCurrent();
if (f != null) {
f.forceRevalidate();
}

// probably not necessary
new Thread(new Runnable() {
@Override
public void run() {
try {
Thread.sleep(1500);
} catch (Exception e) {
}
if (window != null) {
window.repaint();
}
}
}).start();

reSize = null;
}
});
queueSizeChangeEvent((int)(getWidth() * retinaScale), (int)(getHeight() * retinaScale), false, true, true, true);

//}

Expand Down