From 7a8454ebc642680f7454aad87284cc9fca27f1a6 Mon Sep 17 00:00:00 2001
From: WrinklyNinja <wrinklyninja1@gmail.com>
Date: Mon, 23 Jun 2014 21:44:27 +0100
Subject: [PATCH] Fixed window size memory.

Closes #71.
---
 src/gui/editor.cpp   | 7 ++++++-
 src/gui/main.cpp     | 8 ++++++--
 src/gui/settings.cpp | 3 +++
 src/gui/viewer.cpp   | 5 ++++-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/gui/editor.cpp b/src/gui/editor.cpp
index 034cca67..7b45d834 100644
--- a/src/gui/editor.cpp
+++ b/src/gui/editor.cpp
@@ -1181,6 +1181,9 @@ MiniEditor::MiniEditor(wxWindow *parent, const wxString& title, wxPoint pos, wxS
     SetIcon(wxIconLocation("LOOT.exe"));
 
     SetSizerAndFit(bigBox);
+
+    if (size != wxDefaultSize)
+        SetSize(size);
 }
 
 void MiniEditor::OnApply(wxCommandEvent& event) {
@@ -1228,7 +1231,9 @@ FullEditor::FullEditor(wxWindow *parent, const wxString& title, wxPoint pos, wxS
     SetIcon(wxIconLocation("LOOT.exe"));
 
     SetSizerAndFit(bigBox);
-    Layout();
+
+    if (size != wxDefaultSize)
+        SetSize(size);
 }
 
 void FullEditor::OnQuit(wxCommandEvent& event) {
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 4f00e96f..509f1084 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -552,8 +552,12 @@ Launcher::Launcher(const wxChar *title, YAML::Node& settings, Game * game, vecto
     //Now set the layout and sizes.
     SetMenuBar(MenuBar);
 	SetBackgroundColour(wxColour(255,255,255));
-	SetSizerAndFit(buttonBox);
-    SetSize(wxSize(250, 200));
+    SetSizerAndFit(buttonBox);
+
+    if (size != wxDefaultSize)
+        SetSize(size);
+    else
+        SetSize(wxSize(250, 200));
 
     SortButton->SetFocus();
 }
diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp
index d8c1e6df..0b46bdb1 100644
--- a/src/gui/settings.cpp
+++ b/src/gui/settings.cpp
@@ -143,6 +143,9 @@ SettingsFrame::SettingsFrame(wxWindow *parent, const wxString& title, YAML::Node
 	SetBackgroundColour(wxColour(255,255,255));
     SetIcon(wxIconLocation("LOOT.exe"));
 	SetSizerAndFit(bigBox);
+
+    if (size != wxDefaultSize)
+        SetSize(size);
 }
 
 void SettingsFrame::SetDefaultValues() {
diff --git a/src/gui/viewer.cpp b/src/gui/viewer.cpp
index 1ad37f5e..309cf018 100644
--- a/src/gui/viewer.cpp
+++ b/src/gui/viewer.cpp
@@ -37,7 +37,10 @@ Viewer::Viewer(wxWindow *parent, const wxString& title, const wxString& url, wxP
     topsizer->Add(web, 1, wxEXPAND);
 
     SetSizer(topsizer);
-    SetSize(800,600);
+    if (size != wxDefaultSize)
+        SetSize(size);
+    else
+        SetSize(800, 600);
     SetIcon(wxIconLocation("LOOT.exe"));
 }