Made NPC dialogues resizeable.

(cherry picked from Aethyra commit 81299ca9acc39dec62e1e504781721ad0db0d471)

Conflicts:

	src/gui/inventorywindow.cpp
	src/gui/npc_text.cpp

4 files changed, 94 insertions, 7 deletions

diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 3c4beaf3..ad2ccdce 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -32,10 +32,16 @@
 NpcTextDialog::NpcTextDialog():
     Window("NPC")
 {
+    setResizable(true);
+
+    setMinWidth(200);
+    setMinHeight(150);
+
     mTextBox = new TextBox;
     mTextBox->setEditable(false);
-    gcn::ScrollArea *scrollArea = new ScrollArea(mTextBox);
-    Button *okButton = new Button("OK", "ok", this);
+
+    scrollArea = new ScrollArea(mTextBox);
+    okButton = new Button("OK", "ok", this);
 
     setContentSize(260, 175);
     scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
@@ -55,13 +61,36 @@ NpcTextDialog::NpcTextDialog():
 void
 NpcTextDialog::setText(const std::string &text)
 {
-    mTextBox->setTextWrapped(text);
+    mText = text;
+    draw();
 }
 
 void
 NpcTextDialog::addText(const std::string &text)
 {
-    mTextBox->setTextWrapped(mTextBox->getText() + text + "\n");
+    mText = mTextBox->getText() + text + "\n";
+    draw();
+}
+
+void NpcTextDialog::widgetResized(const gcn::Event &event)
+{
+    Window::widgetResized(event);
+    draw();
+}
+
+void NpcTextDialog::draw()
+{
+    const gcn::Rectangle &area = getChildrenArea();
+    const int width = area.width;
+    const int height = area.height;
+
+    mTextBox->setTextWrapped(mText);
+
+    scrollArea->setDimension(gcn::Rectangle(
+                5, 5, width - 10, height - 15 - okButton->getHeight()));
+    okButton->setPosition(
+            width - 5 - okButton->getWidth(),
+            height - 5 - okButton->getHeight());
 }
 
 void
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index 2c9771d3..939fb8fa 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -45,6 +45,18 @@ class NpcTextDialog : public Window, public gcn::ActionListener
         NpcTextDialog();
 
         /**
+         * Called when resizing the window
+         *
+         * @param event The calling event
+         */
+        void widgetResized(const gcn::Event &event);
+
+        /**
+         * Redraws the window
+         */
+        void draw();
+
+        /**
          * Called when receiving actions from the widgets.
          */
         void
@@ -68,7 +80,11 @@ class NpcTextDialog : public Window, public gcn::ActionListener
         addText(const std::string &string);
 
     private:
+        gcn::Button *okButton;
+        gcn::ScrollArea *scrollArea;
         TextBox *mTextBox;
+
+        std::string mText;
 };
 
 #endif
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index 90444f1a..4f3bc893 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -32,10 +32,15 @@
 NpcListDialog::NpcListDialog():
     Window("NPC")
 {
+    setResizable(true);
+
+    setMinWidth(200);
+    setMinHeight(150);
+
     mItemList = new ListBox(this);
-    ScrollArea *scrollArea = new ScrollArea(mItemList);
-    Button *okButton = new Button("OK", "ok", this);
-    Button *cancelButton = new Button("Cancel", "cancel", this);
+    scrollArea = new ScrollArea(mItemList);
+    okButton = new Button("OK", "ok", this);
+    cancelButton = new Button("Cancel", "cancel", this);
 
     setContentSize(260, 175);
     scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
@@ -88,6 +93,28 @@ NpcListDialog::reset()
     mItems.clear();
 }
 
+void NpcListDialog::widgetResized(const gcn::Event &event)
+{
+    Window::widgetResized(event);
+    draw();
+}
+
+void NpcListDialog::draw()
+{
+    const gcn::Rectangle &area = getChildrenArea();
+    const int width = area.width;
+    const int height = area.height;
+
+    scrollArea->setDimension(gcn::Rectangle(
+                5, 5, width - 10, height - 15 - okButton->getHeight()));
+    cancelButton->setPosition(
+            width - 5 - cancelButton->getWidth(),
+            height - 5 - cancelButton->getHeight());
+    okButton->setPosition(
+            cancelButton->getX() - 5 - okButton->getWidth(),
+            cancelButton->getY());
+}
+
 void
 NpcListDialog::action(const gcn::ActionEvent &event)
 {
diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h
index 0e6760f1..0c9ca495 100644
--- a/src/gui/npclistdialog.h
+++ b/src/gui/npclistdialog.h
@@ -49,6 +49,18 @@ class NpcListDialog : public Window, public gcn::ActionListener,
         NpcListDialog();
 
         /**
+         * Called when resizing the window
+         *
+         * @param event The calling event
+         */
+        void widgetResized(const gcn::Event &event);
+
+        /**
+         * Redraws the window
+         */
+        void draw();
+
+        /**
          * Called when receiving actions from the widgets.
          */
         void
@@ -82,6 +94,9 @@ class NpcListDialog : public Window, public gcn::ActionListener,
 
     private:
         gcn::ListBox *mItemList;
+        gcn::ScrollArea *scrollArea;
+        gcn::Button *okButton;
+        gcn::Button *cancelButton;
 
         std::vector<std::string> mItems;
 };