Merge pull request #11 from jasmineRepo/dev-ui-formatting

update gui
jasmineRepo · Feb 4, 2023 · 4df52ac · 4df52ac
2 parents ff86c24 + de38044
commit 4df52ac
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/microsim-gui/pom.xml b/microsim-gui/pom.xml
@@ -128,8 +128,13 @@
 			<artifactId>JAS-mine-core</artifactId>
 			<version>4.1.0</version>
 		</dependency>
+        <dependency>
+            <groupId>com.formdev</groupId>
+            <artifactId>flatlaf</artifactId>
+            <version>3.0</version>
+        </dependency>
 
-	</dependencies>
+    </dependencies>
 
 	<repositories>
 		<repository>

diff --git a/microsim-gui/src/main/java/Start.java b/microsim-gui/src/main/java/Start.java
@@ -3,7 +3,7 @@ public class Start {
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 }
diff --git a/microsim-gui/src/main/java/microsim/gui/shell/MicrosimShell.java b/microsim-gui/src/main/java/microsim/gui/shell/MicrosimShell.java
@@ -22,6 +22,8 @@
 import javax.swing.UIManager;
 import javax.swing.filechooser.FileSystemView;
 
+import com.formdev.flatlaf.FlatLightLaf;
+
 import microsim.engine.EngineListener;
 import microsim.engine.SimulationEngine;
 import microsim.engine.SimulationManager;
@@ -210,7 +212,8 @@ public void windowClosing(java.awt.event.WindowEvent e) {
 		try {
 			UIManager//.setLookAndFeel("com.jgoodies.looks.plastic.PlasticXPLookAndFeel");
 			//.setLookAndFeel("com.jgoodies.looks.windows.WindowsLookAndFeel");
-			.setLookAndFeel("net.infonode.gui.laf.InfoNodeLookAndFeel");
+			//.setLookAndFeel("net.infonode.gui.laf.InfoNodeLookAndFeel");
+			.setLookAndFeel( new FlatLightLaf() );
 			SwingUtilities.updateComponentTreeUI(this);
 		} catch (Exception e) {
 			System.out.println("Error loading L&F " + e);
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ public class Start { @@
     	public static void main(String[] args) {
     		// TODO Auto-generated method stub
     	}
     }