Skip to content

Commit 200e094

Browse files
committed
Merge remote-tracking branch 'origin/master' into dev
2 parents 7b6ee7e + 6072fe1 commit 200e094

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
<license.copyrightOwners>Tobias Pietzsch, Jean-Yves Tinevez</license.copyrightOwners>
197197

198198
<mastodon-collection.version>1.0.0-beta-24</mastodon-collection.version>
199-
<mastodon-graph.version>1.0.0-beta-22</mastodon-graph.version>
199+
<mastodon-graph.version>1.0.0-beta-23</mastodon-graph.version>
200200

201201
<!-- NB: Deploy releases to the SciJava Maven repository. -->
202202
<releaseProfiles>sign,deploy-to-scijava</releaseProfiles>

src/main/java/org/mastodon/mamut/launcher/MastodonDndLauncher.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,16 @@ public Object open(Location source) throws IOException {
6868

6969
final String projectPath = fsource.getFile().getAbsolutePath();
7070

71+
//make sure that the menus appear on top of the screen
72+
//to look natively in the Apple world
7173
System.setProperty( "apple.laf.useScreenMenuBar", "true" );
74+
75+
//start up "the main object behind the scenes" -- the WindowManager,
7276
final WindowManager windowManager = new WindowManager( getContext() );
7377

78+
//start up the main/central Mastodon window
7479
final MainWindow mainWindow = new MainWindow( windowManager );
7580
mainWindow.setVisible( true );
76-
mainWindow.setDefaultCloseOperation( WindowConstants.EXIT_ON_CLOSE );
7781

7882
try {
7983
final MamutProject project = new MamutProjectIO().load( projectPath );

0 commit comments

Comments
 (0)