From 69a7cfc9ea345b001ebb9be18a0d9d63e4e233eb Mon Sep 17 00:00:00 2001 From: skylarmt Date: Thu, 16 Apr 2015 23:06:29 -0600 Subject: [PATCH] Tweaking --- src/net/apocalypselabs/symat/Main.java | 16 +++++++++++++++- src/net/apocalypselabs/symat/SplashScreen.form | 2 +- src/net/apocalypselabs/symat/SplashScreen.java | 2 +- .../apocalypselabs/symat/resources/homepage.html | 7 +++---- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/net/apocalypselabs/symat/Main.java b/src/net/apocalypselabs/symat/Main.java index c1d71d8..4f99181 100644 --- a/src/net/apocalypselabs/symat/Main.java +++ b/src/net/apocalypselabs/symat/Main.java @@ -72,11 +72,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import javafx.application.Platform; +import javafx.embed.swing.JFXPanel; import javax.swing.ImageIcon; import javax.swing.JFileChooser; import javax.swing.JInternalFrame; import javax.swing.JOptionPane; import javax.swing.ListModel; +import javax.swing.SwingUtilities; import javax.swing.UIManager; import javax.swing.filechooser.FileFilter; import javax.swing.filechooser.FileNameExtensionFilter; @@ -1086,7 +1088,19 @@ public class Main extends JRibbonFrame { Debug.stacktrace(ex); } - Platform.setImplicitExit(false); + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + new JFXPanel(); // this will prepare JavaFX toolkit and environment + Platform.runLater(new Runnable() { + @Override + public void run() { + Platform.setImplicitExit(false); + } + }); + } + }); + /* Create and display the form */ java.awt.EventQueue.invokeLater(() -> { diff --git a/src/net/apocalypselabs/symat/SplashScreen.form b/src/net/apocalypselabs/symat/SplashScreen.form index 13de119..7f27875 100644 --- a/src/net/apocalypselabs/symat/SplashScreen.form +++ b/src/net/apocalypselabs/symat/SplashScreen.form @@ -85,7 +85,7 @@ - + diff --git a/src/net/apocalypselabs/symat/SplashScreen.java b/src/net/apocalypselabs/symat/SplashScreen.java index a824ae5..81c3824 100644 --- a/src/net/apocalypselabs/symat/SplashScreen.java +++ b/src/net/apocalypselabs/symat/SplashScreen.java @@ -118,7 +118,7 @@ public class SplashScreen extends javax.swing.JFrame { jLabel1.setFont(net.apocalypselabs.symat.Main.ubuntuRegular.deriveFont(36.0F)); jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); - jLabel1.setText(""+net.apocalypselabs.symat.Main.SYMAT+" "+net.apocalypselabs.symat.Main.VERSION_NAME+""); + jLabel1.setText(""+net.apocalypselabs.symat.Main.SYMAT+" "+net.apocalypselabs.symat.Main.VERSION_NAME+""); jLayeredPane1.add(jLabel1); jLabel1.setBounds(100, 220, 300, 50); jLayeredPane1.setLayer(jLabel1, javax.swing.JLayeredPane.POPUP_LAYER); diff --git a/src/net/apocalypselabs/symat/resources/homepage.html b/src/net/apocalypselabs/symat/resources/homepage.html index 0c80a38..750645c 100644 --- a/src/net/apocalypselabs/symat/resources/homepage.html +++ b/src/net/apocalypselabs/symat/resources/homepage.html @@ -51,8 +51,7 @@ you permission, that decision is considered final and binding.