1 files changed, 20 insertions, 5 deletions
diff --git a/aoapplication.cpp b/aoapplication.cpp
index 70aeb152..f0576eea 100644
--- a/aoapplication.cpp
+++ b/aoapplication.cpp
@@ -1,11 +1,12 @@
-#include <QDebug>
+#include "aoapplication.h"
 
 #include "lobby.h"
 #include "courtroom.h"
 #include "networkmanager.h"
-#include "text_file_functions.h"
 
-#include "aoapplication.h"
+#include <QDebug>
+#include <QRect>
+#include <QDesktopWidget>
 
 AOApplication::AOApplication(int &argc, char **argv) : QApplication(argc, argv)
 {
@@ -29,6 +30,11 @@ void AOApplication::construct_lobby()
   w_lobby = new Lobby(this);
   lobby_constructed = true;
 
+  QRect screenGeometry = QApplication::desktop()->screenGeometry();
+  int x = (screenGeometry.width()-w_lobby->width()) / 2;
+  int y = (screenGeometry.height()-w_lobby->height()) / 2;
+  w_lobby->move(x, y);
+
   w_lobby->show();
 }
 
@@ -55,8 +61,10 @@ void AOApplication::construct_courtroom()
   w_courtroom = new Courtroom(this);
   courtroom_constructed = true;
 
-  //D3BUG
-  w_courtroom->show();
+  QRect screenGeometry = QApplication::desktop()->screenGeometry();
+  int x = (screenGeometry.width()-w_courtroom->width()) / 2;
+  int y = (screenGeometry.height()-w_courtroom->height()) / 2;
+  w_courtroom->move(x, y);
 }
 
 void AOApplication::destruct_courtroom()
@@ -100,3 +108,10 @@ void AOApplication::add_favorite_server(int p_server)
 
   write_to_serverlist_txt(server_line);
 }
+
+void AOApplication::loading_cancelled()
+{
+  destruct_courtroom();
+
+  w_lobby->hide_loading_overlay();
+}