Fix button overlap issues in login dialogs

Reviewed-by: Thorbjørn Lindeijer

2 files changed, 12 insertions, 2 deletions

diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 9eb3f2c0..78914475 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -76,7 +76,7 @@ LoginDialog::LoginDialog(LoginData *loginData):
     place(0, 6, mRegisterButton).setHAlign(LayoutCell::LEFT);
     place(2, 6, mServerButton);
     place(3, 6, mLoginButton);
-    reflowLayout(250, 0);
+    reflowLayout();
 
     addKeyListener(this);
 
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index dd34a24e..eb6e9b4b 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -189,7 +189,17 @@ ServerDialog::ServerDialog(ServerInfo *serverInfo, const std::string &dir):
     // Make sure the list has enough height
     getLayout().setRowHeight(3, 80);
 
-    reflowLayout(300, 0);
+    // Do this manually instead of calling reflowLayout so we can enforce a
+    // minimum width.
+    int width = 0, height = 0;
+    getLayout().reflow(width, height);
+    if (width < 300)
+    {
+        width = 300;
+        getLayout().reflow(width, height);
+    }
+
+    setContentSize(width, height);
 
     addKeyListener(this);