[client] Scale windows with font size.

4 files changed, 14 insertions, 5 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
index f3cff2f0..78a63f4a 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
@@ -190,7 +190,10 @@ public abstract class MainWindow {
 
 		// Set layout for the mainshell, items added to the shell should get a gridData
 		mainContainer.setLayout(new BoxLayout(mainContainer, BoxLayout.PAGE_AXIS));
-		mainWindow.setMinimumSize(new Dimension(850, 650));
+		
+		// Scale the ui with the font.
+		int scale = Config.getFontScaling();
+		mainWindow.setMinimumSize(new Dimension(850 * scale / 100, 650 * scale / 100));
 
 		// register all pages of the main window
 		registerPage(new MainMenuWindow());
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageCustomPermissionManager.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageCustomPermissionManager.java
index 9b969963..7e260032 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageCustomPermissionManager.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageCustomPermissionManager.java
@@ -28,6 +28,7 @@ import org.openslx.dozmod.gui.window.UserListWindow.UserAddedCallback;
 /**
  * Panel including ImagePermissionTable and add/remove buttons for setting customImagePermissions.
  */
+@SuppressWarnings("serial")
 public class ImageCustomPermissionManager extends JPanel {
 
 	protected ImagePermissionTable permissionTable;	
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java
index 3b711132..1e53abb2 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java
@@ -12,6 +12,7 @@ import javax.swing.JDialog;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
+import org.openslx.dozmod.Config;
 import org.openslx.dozmod.gui.helper.GridManager;
 
 @SuppressWarnings("serial")
@@ -72,8 +73,9 @@ public abstract class VirtualizerNoticeWindowLayout extends JDialog {
 		grid.nextRow();
 		grid.finish(false);
 
-
-		setSize(new Dimension(600, 250));
+		// Scale window with font
+		int scale = Config.getFontScaling();
+		setSize(new Dimension(600 * scale /100, 250 * scale / 100));
 		setLocationRelativeTo(modalParent);
 		validate();
 	}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/Wizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/Wizard.java
index 2ba24604..26f0d4d1 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/Wizard.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/Wizard.java
@@ -23,6 +23,7 @@ import javax.swing.JSeparator;
 import javax.swing.SwingConstants;
 
 import org.apache.log4j.Logger;
+import org.openslx.dozmod.Config;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.control.QLabel;
 import org.openslx.dozmod.gui.helper.GridManager;
@@ -90,8 +91,10 @@ public abstract class Wizard extends JDialog {
 		contentPanel.setLayout(new BoxLayout(contentPanel, BoxLayout.PAGE_AXIS));
 		contentPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
 		add(contentPanel, BorderLayout.CENTER);
-		//
-		setPreferredSize(new Dimension(550, 420));
+		
+		// Scale window with font size
+		int scale = Config.getFontScaling(); 
+		setPreferredSize(new Dimension(550 * scale / 100, 420 * scale / 100));
 		setResizable(false);
 
 		pack();