Skip to content

Rebuild sketchbook window when needed #4842

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
benfry merged 3 commits into from
Jan 29, 2017
Merged

Rebuild sketchbook window when needed #4842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8395134
Hide sketchbook window before creating a new one
JakubValtar Jan 20, 2017
3d21292
Make sure old windows are disposed properly
JakubValtar Jan 20, 2017
7b8f307
Rebuild menus after deleting sketch
JakubValtar Jan 20, 2017
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
19 changes: 14 additions & 5 deletions app/src/processing/app/Mode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,6 +656,7 @@ public void rebuildExamplesFrame() {
if (visible) {
bounds = examplesFrame.getBounds();
examplesFrame.setVisible(false);
examplesFrame.dispose();
}
examplesFrame = null;
if (visible) {
Expand Down Expand Up @@ -691,11 +692,19 @@ public DefaultMutableTreeNode buildSketchbookTree() {

/** Sketchbook has changed, update it on next viewing. */
public void rebuildSketchbookFrame() {
boolean wasVisible =
(sketchbookFrame == null) ? false : sketchbookFrame.isVisible();
sketchbookFrame = null; // Force a rebuild
if (wasVisible) {
showSketchbookFrame();
if (sketchbookFrame != null) {
boolean visible = sketchbookFrame.isVisible();
Rectangle bounds = null;
if (visible) {
bounds = sketchbookFrame.getBounds();
sketchbookFrame.setVisible(false);
sketchbookFrame.dispose();
}
sketchbookFrame = null;
if (visible) {
showSketchbookFrame();
sketchbookFrame.setBounds(bounds);
}
}
}

Expand Down
3 changes: 2 additions & 1 deletion app/src/processing/app/Sketch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,9 +657,10 @@ public void handleDeleteCode() {
// get the changes into the sketchbook menu
//sketchbook.rebuildMenus();

// make a new sketch, and i think this will rebuild the sketch menu
// make a new sketch and rebuild the sketch menu
//editor.handleNewUnchecked();
//editor.handleClose2();
editor.getBase().rebuildSketchbookMenus();
editor.getBase().handleClose(editor, false);

} else {
Expand Down