Fixed some graphical bugs

betacraftuk · Jul 3, 2021 · ce02f1b · ce02f1b
1 parent feadcc1
commit ce02f1b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/src/main/java/org/betacraft/launcher/Launcher.java b/src/main/java/org/betacraft/launcher/Launcher.java
@@ -50,7 +50,7 @@
 
 /** Main class */
 public class Launcher {
-	public static String VERSION = "1.09_14-pre1"; // TODO Always update this
+	public static String VERSION = "1.09_14-pre2"; // TODO Always update this
 
 	public static Instance currentInstance;
 	public static boolean forceUpdate = false;

diff --git a/src/main/java/org/betacraft/launcher/Window.java b/src/main/java/org/betacraft/launcher/Window.java
@@ -105,7 +105,6 @@ public void actionPerformed(ActionEvent e) {
 					Launcher.auth.authenticate();
 
 					Window.nick_input.setText(Launcher.getNickname());
-					Window.setTab(Window.tab);
 					// since there's basically no account selector, this must do... awkward
 					if (Launcher.auth instanceof NoAuth) {
 						nick_input.setEnabled(true);
@@ -226,29 +225,31 @@ public void update() {
 	}
 
 	public static void setTab(Tab tab) {
-		if (Window.centerPanel != null) mainWindow.remove(Window.centerPanel);
-		centerPanel = new WebsitePanel().getEmptyTabFor(tab);
-		Window.tab = Tab.SERVER_LIST;
-		mainWindow.add(Window.centerPanel, BorderLayout.CENTER);
-		mainWindow.setPreferredSize(mainWindow.getSize());
-		mainWindow.pack();
+//		if (Window.centerPanel != null) mainWindow.remove(Window.centerPanel);
+//		centerPanel = new WebsitePanel().getEmptyTabFor(tab);
+//		Window.tab = Tab.SERVER_LIST;
+//		mainWindow.add(Window.centerPanel, BorderLayout.CENTER);
+//		mainWindow.setPreferredSize(mainWindow.getSize());
+//		mainWindow.pack();
 		if (tab == Tab.CHANGELOG) {
 			new Thread() {
 				public void run() {
-					if (Window.centerPanel != null) mainWindow.remove(Window.centerPanel);
+					if (Window.centerPanel != null) mainWindow.getContentPane().remove(Window.centerPanel);
 					centerPanel = new WebsitePanel().getUpdateNews(true);
 					Window.tab = Tab.CHANGELOG;
 					mainWindow.add(Window.centerPanel, BorderLayout.CENTER);
+					mainWindow.setPreferredSize(mainWindow.getSize());
 					mainWindow.pack();
 				}
 			}.start();
 		} else if (tab == Tab.SERVER_LIST) {
 			new Thread() {
 				public void run() {
-					if (Window.centerPanel != null) mainWindow.remove(Window.centerPanel);
+					if (Window.centerPanel != null) mainWindow.getContentPane().remove(Window.centerPanel);
 					centerPanel = new WebsitePanel().getServers(true);
 					Window.tab = Tab.SERVER_LIST;
 					mainWindow.add(Window.centerPanel, BorderLayout.CENTER);
+					mainWindow.setPreferredSize(mainWindow.getSize());
 					mainWindow.pack();
 				}
 			}.start();

diff --git a/src/main/java/pl/betacraft/auth/Authenticator.java b/src/main/java/pl/betacraft/auth/Authenticator.java
@@ -21,7 +21,6 @@ default void authSuccess() {
 			Window.nick_input.setText(Launcher.getNickname());
 			Window.nick_input.setEnabled(false);
 			Window.loginButton.setText(Lang.LOGOUT_BUTTON);
-			Window.setTab(Window.tab);
 		});
 	};
 }
diff --git a/src/main/java/pl/betacraft/auth/NoAuth.java b/src/main/java/pl/betacraft/auth/NoAuth.java
@@ -35,7 +35,6 @@ public void authSuccess() {
 		Window.nick_input.setText(Launcher.getNickname());
 		Window.nick_input.setEnabled(true);
 		Window.loginButton.setText(Lang.LOGIN_BUTTON);
-		Window.setTab(Window.tab);
 	}
 
 	public boolean invalidate() {