[client] Now correctly scale user list with number of users.

1 files changed, 10 insertions, 5 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/UserListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/UserListWindow.java
index df552f5c..1a257e7e 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/UserListWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/UserListWindow.java
@@ -11,6 +11,7 @@ import java.awt.event.WindowEvent;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.swing.JTable;
 import javax.swing.RowFilter;
 import javax.swing.UIManager;
 import javax.swing.event.DocumentEvent;
@@ -56,10 +57,18 @@ public class UserListWindow extends UserListWindowLayout implements UiFeedback {
 
 							userList.add(user);
 						}
+
+						// Scale the window after getting the list of users.
+						int calcHeight = 150 + userList.size() * 20;
+						calcHeight = calcHeight > 350 ? calcHeight : 350;
+						me.setPreferredSize(Gui.getScaledDimension(450, (calcHeight < 600) ? calcHeight : 600));
+						me.pack();
+
 						Gui.asyncExec(new Runnable() {
 							@Override
 							public void run() {
 								userTable.setData(userList, true);
+								userTable.setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS);
 							}
 						});
 					}
@@ -119,11 +128,7 @@ public class UserListWindow extends UserListWindowLayout implements UiFeedback {
 				}
 			}
 		});
-		
-		
-		int calcHeight = userTable.getRowCount() * 20;
-		setPreferredSize(Gui.getScaledDimension(400, (calcHeight > 350 && calcHeight < 600) ? calcHeight : 350));
-		pack();
+
 		Gui.centerShellOverShell(modalParent, this);
 		//		this.setLocationRelativeTo(SwingUtilities.getWindowAncestor(modalParent));
 	}