diff options
| author | Keith Packard <keithp@keithp.com> | 2016-06-15 22:37:39 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2016-06-15 22:37:39 -0700 |
| commit | 2a4d741872449b5332f28e018fa3acc53ed7d891 (patch) | |
| tree | 29ce4678f749eee98b10b378a0b7ca8e2ca4f0bf | |
| parent | 04c6f4c54ac10f6464ffb8cab2186ac2b2eafb00 (diff) | |
altosuilib: Track open frames, exit when none remain
This will let us not have the altosui window open by causing the
application to shut down when the last frame closes.
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | altosui/AltosGraphUI.java | 2 | ||||
| -rw-r--r-- | altosuilib/AltosUIFrame.java | 20 |
2 files changed, 19 insertions, 3 deletions
diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java index 32b59977..4f394d73 100644 --- a/altosui/AltosGraphUI.java +++ b/altosui/AltosGraphUI.java @@ -100,8 +100,6 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent e) { - setVisible(false); - dispose(); AltosUIPreferences.unregister_font_listener(AltosGraphUI.this); AltosPreferences.unregister_units_listener(AltosGraphUI.this); } diff --git a/altosuilib/AltosUIFrame.java b/altosuilib/AltosUIFrame.java index 05266f8d..ac440190 100644 --- a/altosuilib/AltosUIFrame.java +++ b/altosuilib/AltosUIFrame.java @@ -23,8 +23,13 @@ import javax.swing.*; import java.util.*; class AltosUIFrameListener extends WindowAdapter { + @Override public void windowClosing (WindowEvent e) { - AltosUIPreferences.unregister_ui_listener((AltosUIFrame) e.getWindow()); + AltosUIFrame frame = (AltosUIFrame) e.getWindow(); + AltosUIPreferences.unregister_ui_listener(frame); + AltosUIFrame.frame_closed(); + frame.setVisible(false); + frame.dispose(); } } @@ -263,10 +268,23 @@ public class AltosUIFrame extends JFrame implements AltosUIListener, AltosPositi return constraints(x, width, GridBagConstraints.NONE); } + static int open_frames; + + public static void frame_opened() { + ++open_frames; + } + + public static void frame_closed() { + --open_frames; + if (open_frames == 0) + System.exit(0); + } + void init() { AltosUIPreferences.register_ui_listener(this); AltosUIPreferences.register_position_listener(this); position = AltosUIPreferences.position(); + frame_opened(); addWindowListener(new AltosUIFrameListener()); /* Try to make menus live in the menu bar like regular Mac apps */ |