From 3a5477cb50c44a0837019a4e4453141f281e32a4 Mon Sep 17 00:00:00 2001
From: User <User@DESKTOP-M1CIE3L.fritz.box>
Date: Mon, 19 Apr 2021 10:41:19 +0200
Subject: [PATCH] Windows are always visible on start

---
 .../platform/MSPEXP430F5438/Exp5438Gui.java   |  2 +-
 se/sics/mspsim/ui/WindowUtils.java            | 54 +++++++++++++------
 2 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/se/sics/mspsim/platform/MSPEXP430F5438/Exp5438Gui.java b/se/sics/mspsim/platform/MSPEXP430F5438/Exp5438Gui.java
index 6b75d3e..0870be9 100644
--- a/se/sics/mspsim/platform/MSPEXP430F5438/Exp5438Gui.java
+++ b/se/sics/mspsim/platform/MSPEXP430F5438/Exp5438Gui.java
@@ -80,7 +80,7 @@ public class Exp5438Gui extends AbstractNodeGUI {
 	};
 
 	public Exp5438Gui(Exp5438Node node) {
-		super("MSPSIM fork by Prof. Rüdiger Heintz 0.4.26", "images/MSP-EXP430F5438.jpg");
+		super("MSPSIM fork by Prof. Rüdiger Heintz 0.4.27", "images/MSP-EXP430F5438.jpg");
 		this.node = node;
 		Action scaleDownAction = new AbstractAction() {
 			private static final long serialVersionUID = 1L;
diff --git a/se/sics/mspsim/ui/WindowUtils.java b/se/sics/mspsim/ui/WindowUtils.java
index 1a6bcb4..3869baf 100644
--- a/se/sics/mspsim/ui/WindowUtils.java
+++ b/se/sics/mspsim/ui/WindowUtils.java
@@ -36,6 +36,13 @@
  */
 
 package se.sics.mspsim.ui;
+import java.awt.Dimension;
+import java.awt.DisplayMode;
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.awt.Rectangle;
+import java.awt.Toolkit;
 import java.awt.Window;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
@@ -79,23 +86,40 @@ public class WindowUtils {
   }
 
   private static void setBounds(Window window, String bounds) {
-    String[] b;
-    if ((bounds != null)
+    
+	String[] b;
+	if ((bounds != null)
 	&& ((b = bounds.split(",")) != null)
 	&& b.length == 4) {
-      try {
-	window.setBounds(Integer.parseInt(b[0]),
-			 Integer.parseInt(b[1]),
-			 Integer.parseInt(b[2]),
-			 Integer.parseInt(b[3]));
-      } catch (Exception e) {
-	e.printStackTrace();
-	window.pack();
-      }
-    } else {
-      window.setLocationByPlatform(true);
-      window.pack();
-    }
+	  try {
+		  
+		  Rectangle virtualBounds = new Rectangle();
+		  GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
+		  GraphicsDevice[] gs =ge.getScreenDevices();
+		  for (int j = 0; j < gs.length; j++) { 
+		      GraphicsDevice gd = gs[j];
+		      GraphicsConfiguration[] gc =gd.getConfigurations();
+		      for (int i=0; i < gc.length; i++) {
+		          virtualBounds =virtualBounds.union(gc[i].getBounds());
+		      }
+		  }
+		  int x=Integer.parseInt(b[0]);
+		  int y=Integer.parseInt(b[1]);
+		  int w=Integer.parseInt(b[2]);
+		  int h=Integer.parseInt(b[3]);
+		  
+		  if(x<virtualBounds.x) x=virtualBounds.x;
+		  if(y<virtualBounds.y) y=virtualBounds.y;
+		  
+		  window.setBounds(x,y,w,h);
+	  } catch (Exception e) {
+		  e.printStackTrace();
+		  window.pack();
+	  }
+	} else {
+		window.setLocationByPlatform(true);
+		window.pack();
+	}
   }
 
   public static void clearState() {