summaryrefslogtreecommitdiff
path: root/src/gui/npc_text.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-23 21:59:21 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-23 22:00:09 +0100
commit99e8a3fd77b63a029fe02dcf771b6af1aad252ed (patch)
tree03c296d1f89859aae35336dfe2f58df09d256fd3 /src/gui/npc_text.cpp
parentfa8a4bf49100c0a1d5b96e00803f43bbbb861100 (diff)
parent347452b9b69ef3af29c577b7751082822e900c01 (diff)
downloadmana-client-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.tar.gz
mana-client-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.tar.bz2
mana-client-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.tar.xz
mana-client-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.zip
Merge branch 'aethyra/master'
Conflicts: Many files.
Diffstat (limited to 'src/gui/npc_text.cpp')
-rw-r--r--src/gui/npc_text.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 5bc654b8..5bde7f36 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -43,7 +43,7 @@ NpcTextDialog::NpcTextDialog(Network *network):
setMinWidth(200);
setMinHeight(150);
- setDefaultSize(0, 0, 260, 200);
+ setDefaultSize(260, 200, ImageRect::CENTER);
mTextBox = new TextBox;
mTextBox->setEditable(false);
@@ -140,3 +140,9 @@ void NpcTextDialog::widgetResized(const gcn::Event &event)
setText(mText);
}
+
+void NpcTextDialog::requestFocus()
+{
+ loadWindowState();
+ setVisible(true);
+}