From 3aa9e681e466b1596a99b0361277975476790c3f Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Tue, 10 Mar 2009 09:35:26 -0600
Subject: Allow NPCList dialog to use it's old location

---
 src/gui/npclistdialog.cpp | 2 +-
 src/gui/window.cpp        | 4 ++--
 src/gui/window.h          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index 94dfabeb..95fe5983 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -69,7 +69,7 @@ NpcListDialog::NpcListDialog(Network *network):
     layout.setRowHeight(0, Layout::AUTO_SET);
 
     loadWindowState();
-    resetToDefaultSize();
+    resetToDefaultSize(false);
 }
 
 int NpcListDialog::getNumberOfElements()
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 48229ec8..8eaaf31d 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -490,9 +490,9 @@ void Window::setDefaultSize(int defaultX, int defaultY,
     mDefaultHeight = defaultHeight;
 }
 
-void Window::resetToDefaultSize()
+void Window::resetToDefaultSize(bool changePosition)
 {
-    setPosition(mDefaultX, mDefaultY);
+    if (changePosition) setPosition(mDefaultX, mDefaultY);
     setSize(mDefaultWidth, mDefaultHeight);
 }
 
diff --git a/src/gui/window.h b/src/gui/window.h
index 518de6e9..9977aff4 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -243,7 +243,7 @@ class Window : public gcn::Window, gcn::WidgetListener
          * Reset the win pos and size to default. Don't forget to set defaults
          * first.
          */
-        void resetToDefaultSize();
+        void resetToDefaultSize(bool changePosition = true);
 
         /**
          * Gets the layout handler for this window.
-- 
cgit v1.2.3-60-g2f50