Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit d129e78

Browse files
committed
[macOS] Modify behaviour when last editor gets closed
Don't call System.exit() but trust the ThinkDifferent handler Handle reopen only if no editor is visible Don't dispose last closing editor (so its toolbars are still in active state)
1 parent 617430a commit d129e78

File tree

2 files changed

+24
-3
lines changed

2 files changed

+24
-3
lines changed

‎app/src/processing/app/Base.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import processing.app.debug.TargetPackage;
4646
import processing.app.debug.TargetPlatform;
4747
import processing.app.helpers.*;
48+
import processing.app.helpers.OSUtils;
4849
import processing.app.helpers.filefilters.OnlyDirs;
4950
import processing.app.helpers.filefilters.OnlyFilesWithExtension;
5051
import processing.app.javax.swing.filechooser.FileNameExtensionFilter;
@@ -921,7 +922,10 @@ public boolean handleClose(Editor editor) {
921922
storeSketches();
922923

923924
// This will store the sketch count as zero
925+
editor.setVisible(false);
926+
//editor.dispose();
924927
editors.remove(editor);
928+
925929
try {
926930
Editor.serialMonitor.close();
927931
} catch (Exception e) {
@@ -932,9 +936,10 @@ public boolean handleClose(Editor editor) {
932936
// Save out the current prefs state
933937
PreferencesData.save();
934938

935-
// Since this wasn't an actual Quit event, call System.exit()
936-
System.exit(0);
937-
939+
// Since this wasn't an actual Quit event, call System.exit() (not on OSX)
940+
if (!OSUtils.isMacOS()) {
941+
System.exit(0);
942+
}
938943
} else {
939944
// More than one editor window open,
940945
// proceed with closing the current window.

‎app/src/processing/app/macosx/ThinkDifferent.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
package processing.app.macosx;
2424

2525
import com.apple.eawt.*;
26+
import com.apple.eawt.AppEvent.AppReOpenedEvent;
27+
2628
import processing.app.Base;
2729
import processing.app.Editor;
2830

@@ -45,6 +47,20 @@ public class ThinkDifferent {
4547

4648
static public void init() {
4749
Application application = Application.getApplication();
50+
51+
application.addAppEventListener(new AppReOpenedListener() {
52+
@Override
53+
public void appReOpened(AppReOpenedEvent aroe) {
54+
try {
55+
if (Base.INSTANCE.getEditors().size() == 0) {
56+
Base.INSTANCE.handleNew();
57+
}
58+
} catch (Exception e) {
59+
// TODO Auto-generated catch block
60+
e.printStackTrace();
61+
}
62+
}
63+
});
4864
application.setAboutHandler(new AboutHandler() {
4965
@Override
5066
public void handleAbout(AppEvent.AboutEvent aboutEvent) {

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /