Merged with Aethyra master as of 2009-01-27

Conflicts:
	Almost everywhere.

1 files changed, 12 insertions, 26 deletions

diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 6ad698bc..a2e043d1 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -19,14 +19,15 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "npc_text.h"
-
 #include <string>
 
+#include "npc_text.h"
 #include "browserbox.h"
 #include "button.h"
 #include "scrollarea.h"
 
+#include "widgets/layout.h"
+
 #include "../npc.h"
 
 #include "../utils/gettext.h"
@@ -39,24 +40,24 @@ NpcTextDialog::NpcTextDialog():
     setMinWidth(200);
     setMinHeight(150);
 
+    setDefaultSize(0, 0, 260, 200);
+
     mBrowserBox = new BrowserBox(BrowserBox::AUTO_WRAP);
-    mBrowserBox->setOpaque(true);
+    mBrowserBox->setOpaque(false);
 
     scrollArea = new ScrollArea(mBrowserBox);
     okButton = new Button(_("OK"), "ok", this);
 
-    setContentSize(260, 175);
     scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
     scrollArea->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
-    scrollArea->setDimension(gcn::Rectangle(
-                5, 5, 250, 160 - okButton->getHeight()));
-    okButton->setPosition(
-            260 - 5 - okButton->getWidth(),
-            175 - 5 - okButton->getHeight());
 
-    add(scrollArea);
-    add(okButton);
+    place(0, 0, scrollArea, 5).setPadding(3);
+    place(4, 1, okButton);
+
+    Layout &layout = getLayout();
+    layout.setRowHeight(0, Layout::AUTO_SET);
 
+    loadWindowState();
     setLocationRelativeTo(getParent());
 }
 
@@ -76,21 +77,6 @@ void NpcTextDialog::addText(const std::string &text)
     mBrowserBox->addRow(text);
 }
 
-void NpcTextDialog::widgetResized(const gcn::Event &event)
-{
-    Window::widgetResized(event);
-
-    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()));
-    okButton->setPosition(
-            width - 5 - okButton->getWidth(),
-            height - 5 - okButton->getHeight());
-}
-
 void NpcTextDialog::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "ok")