[client] Swing

1 files changed, 6 insertions, 4 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
index 81a4ffce..c31f4f82 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
@@ -9,6 +9,7 @@ import javax.swing.BoxLayout;
 import javax.swing.ButtonGroup;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
+import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -19,9 +20,10 @@ import javax.swing.UIManager;
 import javax.swing.border.TitledBorder;
 
 import org.apache.log4j.Logger;
+import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.util.ResourceLoader;
 
-public abstract class LoginWindowLayout extends JFrame {
+public abstract class LoginWindowLayout extends JDialog {
 
 	private static final Logger LOGGER = Logger.getLogger(LoginWindowLayout.class);
 
@@ -54,10 +56,9 @@ public abstract class LoginWindowLayout extends JFrame {
 	public LoginWindowLayout() {
 		super();
     	setTitle("Simple example");
-    	setSize(600, 300);
     	setLocationRelativeTo(null);
     	setResizable(false);
-    	setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+    	setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
     	GridBagLayout bag = new GridBagLayout();
     	GridBagConstraints con = new GridBagConstraints();
     	setLayout(bag);
@@ -134,12 +135,13 @@ public abstract class LoginWindowLayout extends JFrame {
 		con.gridwidth = GridBagConstraints.REMAINDER;
 		bag.setConstraints(loginFormPanel, con);
 		add(loginFormPanel);
+		pack();
 	}
 
 	private ImageIcon loadImage() {
 		try {
 			ImageIcon image = ResourceLoader.getIcon("/img/Logo_bwLehrpool.png");
-			java.awt.Rectangle screenSize = getBounds();
+			java.awt.Rectangle screenSize = Gui.getMonitorFromRectangle(getBounds(), true).getDefaultConfiguration().getBounds();
 			float scaleX = (float)screenSize.width / (float)image.getIconWidth();
 			float scaleY = (float)screenSize.height / (float)image.getIconHeight();
 			final float scaling;