Improved a lot windows reset to default size and pos. Also corrected a few the default win position. And moved the setposition from game to each win, to clarify the code.

1 files changed, 7 insertions, 2 deletions

diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index 13d95032..ea15fccf 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -32,13 +32,15 @@
 #include "status.h"
 #include "skill.h"
 
+#include "graphics.h"
+extern Graphics *graphics;
 extern Window *setupWindow;
 
-
 MenuWindow::MenuWindow():
     Window("")
 {
     setResizable(false);
+    setWindowName("Menu");
     setMovable(false);
     setTitleBarHeight(0);
 
@@ -74,7 +76,10 @@ MenuWindow::MenuWindow():
     setupButton->setPosition(skillsButton->getX() + skillsButton->getWidth() + 3, statusButton->getY());
     add(setupButton);
 
-    setContentSize(setupButton->getX() + setupButton->getWidth(), setupButton->getY() + setupButton->getHeight());
+    int menuWidth = setupButton->getX() + setupButton->getWidth();
+    setDefaultSize((graphics->getWidth() - menuWidth - 5), 0,
+                menuWidth,
+                (setupButton->getY() + setupButton->getHeight()));
 }
 
 MenuWindow::~MenuWindow()