Skip to content
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

Fix for NullPointerException thrown in PApplet.dequeueWindowEvents() #930

Merged
merged 1 commit into from
Jan 21, 2025
Merged

Fix for NullPointerException thrown in PApplet.dequeueWindowEvents() #930

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 19 additions & 14 deletions core/src/processing/core/PApplet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9663,7 +9663,7 @@ public void frameResized(int w, int h) {

// WINDOW METHODS

Map<String, Integer> windowEventQueue = new ConcurrentHashMap<>();
Map<String, WindowEventValuePairs> windowEventQueue = new ConcurrentHashMap<>();


public void windowTitle(String title) {
Expand All @@ -9683,8 +9683,7 @@ public void windowResize(int newWidth, int newHeight) {
* only the notification that the resize has happened.
*/
public void postWindowResized(int newWidth, int newHeight) {
windowEventQueue.put("w", newWidth);
windowEventQueue.put("h", newHeight);
windowEventQueue.put("wh", new WindowEventValuePairs(newWidth, newHeight));
}


Expand Down Expand Up @@ -9724,8 +9723,7 @@ public void postWindowMoved(int newX, int newY) {
frameMoved(newX, newY);
}

windowEventQueue.put("x", newX);
windowEventQueue.put("y", newY);
windowEventQueue.put("xy", new WindowEventValuePairs(newX, newY));
}


Expand All @@ -9734,21 +9732,28 @@ public void windowMoved() { }


private void dequeueWindowEvents() {
if (windowEventQueue.containsKey("x")) {
windowX = windowEventQueue.remove("x");
windowY = windowEventQueue.remove("y");
if (windowEventQueue.containsKey("xy")) {
WindowEventValuePairs xy = windowEventQueue.remove("xy");
windowX = xy.num1;
windowY = xy.num2;
windowMoved();
}
if (windowEventQueue.containsKey("w")) {
// these should already match width/height
//windowResized(windowEventQueue.remove("w"),
// windowEventQueue.remove("h"));
windowEventQueue.remove("w");
windowEventQueue.remove("h");
if (windowEventQueue.containsKey("wh")) {
WindowEventValuePairs wh = windowEventQueue.remove("wh");
windowResized();
}
}

protected class WindowEventValuePairs {

public int num1;
public int num2;

public WindowEventValuePairs(int num1, int num2) {
this.num1 = num1;
this.num2 = num2;
}
}

/**
* Scale the sketch as if it fits this specific width and height.
Expand Down
Loading