Don't center the NPC interraction dialogs

Use the last location the user gave instead. Also, do the same for the
inventory dialog.

9 files changed, 4 insertions, 11 deletions

diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 768dab4d..d267e5ad 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -91,7 +91,6 @@ BuyDialog::BuyDialog(Network *network):
     layout.setRowHeight(0, Layout::AUTO_SET);
 
     loadWindowState();
-    setLocationRelativeTo(getParent());
 }
 
 BuyDialog::~BuyDialog()
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index 818413c2..0550a822 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -49,7 +49,6 @@ BuySellDialog::BuySellDialog(Network *network):
     buyButton->requestFocus();
 
     setContentSize(x, 2 * y + buyButton->getHeight());
-    setLocationRelativeTo(getParent());
 
     requestFocus();
 }
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index e5450748..80017d28 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -103,7 +103,6 @@ InventoryWindow::InventoryWindow(int invSize):
     layout.setRowHeight(0, mDropButton->getHeight());
 
     loadWindowState();
-    setLocationRelativeTo(getParent());
 }
 
 InventoryWindow::~InventoryWindow()
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 61f3e510..53c64a54 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -37,6 +37,7 @@ NpcTextDialog::NpcTextDialog(Network *network):
     Window(_("NPC")), mNetwork(network),
     mState(NPC_TEXT_STATE_WAITING)
 {
+    setWindowName("NPCText");
     setResizable(true);
 
     setMinWidth(200);
@@ -61,7 +62,6 @@ NpcTextDialog::NpcTextDialog(Network *network):
     layout.setRowHeight(0, Layout::AUTO_SET);
 
     loadWindowState();
-    setLocationRelativeTo(getParent());
 }
 
 void NpcTextDialog::clearText()
diff --git a/src/gui/npcintegerdialog.cpp b/src/gui/npcintegerdialog.cpp
index 9778d790..ea06ca8d 100644
--- a/src/gui/npcintegerdialog.cpp
+++ b/src/gui/npcintegerdialog.cpp
@@ -39,6 +39,7 @@ extern NpcTextDialog *npcTextDialog;
 NpcIntegerDialog::NpcIntegerDialog(Network *network):
     Window(_("NPC Number Request")), mNetwork(network)
 {
+    setWindowName("NPCInteger");
     mValueField = new IntTextField;
 
     mDecButton = new Button("-", "decvalue", this);
@@ -62,8 +63,6 @@ NpcIntegerDialog::NpcIntegerDialog(Network *network):
     place(2, 0, cancelButton);
     place(3, 0, okButton);
     reflowLayout(175, 0);
-
-    setLocationRelativeTo(getParent());
 }
 
 void NpcIntegerDialog::setRange(int min, int max)
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index 66c2d9a0..c1493afd 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -42,6 +42,7 @@ extern NpcTextDialog *npcTextDialog;
 NpcListDialog::NpcListDialog(Network *network):
     Window(_("NPC")), mNetwork(network)
 {
+    setWindowName("NPCList");
     setResizable(true);
 
     setMinWidth(200);
@@ -69,7 +70,6 @@ NpcListDialog::NpcListDialog(Network *network):
 
     loadWindowState();
     resetToDefaultSize();
-    setLocationRelativeTo(getParent());
 }
 
 int NpcListDialog::getNumberOfElements()
diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp
index aec30826..525a73a0 100644
--- a/src/gui/npcstringdialog.cpp
+++ b/src/gui/npcstringdialog.cpp
@@ -39,6 +39,7 @@ extern NpcTextDialog *npcTextDialog;
 NpcStringDialog::NpcStringDialog(Network *network):
     Window(_("NPC Text Request")), mNetwork(network)
 {
+    setWindowName("NPCList");
     mValueField = new TextField("");
 
     gcn::Button *okButton = new Button(_("OK"), "ok", this);
@@ -48,8 +49,6 @@ NpcStringDialog::NpcStringDialog(Network *network):
     place(1, 1, cancelButton);
     place(2, 1, okButton);
     reflowLayout(175, 0);
-
-    setLocationRelativeTo(getParent());
 }
 
 std::string NpcStringDialog::getValue()
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 1aa0e2d3..b53a23c1 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -94,7 +94,6 @@ SellDialog::SellDialog(Network *network):
     layout.setRowHeight(0, Layout::AUTO_SET);
 
     loadWindowState();
-    setLocationRelativeTo(getParent());
 }
 
 SellDialog::~SellDialog()
diff --git a/src/gui/storagewindow.cpp b/src/gui/storagewindow.cpp
index 9cdc2da7..2b8ab8f3 100644
--- a/src/gui/storagewindow.cpp
+++ b/src/gui/storagewindow.cpp
@@ -93,7 +93,6 @@ StorageWindow::StorageWindow(Network *network, int invSize):
     layout.setRowHeight(0, mStoreButton->getHeight());
 
     loadWindowState();
-    setLocationRelativeTo(getParent());
 }
 
 StorageWindow::~StorageWindow()