1 files changed, 62 insertions, 33 deletions

diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 399ae62b..63e7d704 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -49,58 +49,44 @@ SellDialog::SellDialog(Network *network):
     mNetwork(network),
     mMaxItems(0), mAmountItems(0)
 {
+    setResizable(true);
+    setMinWidth(260);
+    setMinHeight(230);
+    setDefaultSize(0, 0, 260, 230);
+
     mShopItems = new ShopItems();
 
     mShopItemList = new ShopListBox(mShopItems, mShopItems);
-    ScrollArea *scrollArea = new ScrollArea(mShopItemList);
+    mScrollArea = new ScrollArea(mShopItemList);
     mSlider = new Slider(1.0);
     mQuantityLabel = new gcn::Label("0");
     mMoneyLabel = new gcn::Label("Money: 0 GP / Total: 0 GP");
-    mItemDescLabel = new gcn::Label("Description:");
-    mItemEffectLabel = new gcn::Label("Effect:");
     mIncreaseButton = new Button("+", "+", this);
     mDecreaseButton = new Button("-", "-", this);
     mSellButton = new Button("Sell", "sell", this);
-    Button *quitButton = new Button("Quit", "quit", this);
-    mSellButton->setEnabled(false);
-
-    setContentSize(260, 210);
-    scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-    scrollArea->setDimension(gcn::Rectangle(5, 5, 250, 110));
-    mShopItemList->setDimension(gcn::Rectangle(5, 5, 238, 110));
-
-    mSlider->setDimension(gcn::Rectangle(5, 120, 200, 10));
-    mSlider->setEnabled(false);
-
-    mQuantityLabel->setPosition(215, 120);
+    mQuitButton = new Button("Quit", "quit", this);
+    mItemDescLabel = new gcn::Label("Description:");
+    mItemEffectLabel = new gcn::Label("Effect:");
 
-    mIncreaseButton->setPosition(40, 186);
     mIncreaseButton->setSize(20, 20);
-    mIncreaseButton->setEnabled(false);
-
-    mDecreaseButton->setPosition(10, 186);
     mDecreaseButton->setSize(20, 20);
-    mDecreaseButton->setEnabled(false);
-
-    mMoneyLabel->setPosition(5, 130);
-    mItemEffectLabel->setDimension(gcn::Rectangle(5, 150, 240, 14));
-    mItemDescLabel->setDimension(gcn::Rectangle(5, 169, 240, 14));
+    mQuantityLabel->setWidth(60);
 
-    mSellButton->setPosition(175, 186);
+    mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mIncreaseButton->setEnabled(false);
+    mDecreaseButton->setEnabled(false);
     mSellButton->setEnabled(false);
+    mSlider->setEnabled(false);
 
-    quitButton->setPosition(208, 186);
-
+    mShopItemList->setPriceCheck(false);
     mShopItemList->setActionEventId("item");
     mSlider->setActionEventId("slider");
 
-    mShopItemList->setPriceCheck(false);
-
     mShopItemList->addActionListener(this);
     mShopItemList->addSelectionListener(this);
     mSlider->addActionListener(this);
 
-    add(scrollArea);
+    add(mScrollArea);
     add(mSlider);
     add(mQuantityLabel);
     add(mMoneyLabel);
@@ -109,8 +95,10 @@ SellDialog::SellDialog(Network *network):
     add(mIncreaseButton);
     add(mDecreaseButton);
     add(mSellButton);
-    add(quitButton);
+    add(mQuitButton);
 
+    addWindowListener(this);
+    loadWindowState();
     setLocationRelativeTo(getParent());
 }
 
@@ -226,6 +214,49 @@ void SellDialog::selectionChanged(const SelectionEvent &event)
     mSlider->gcn::Slider::setScale(1, mMaxItems);
 }
 
+void SellDialog::windowResized(const WindowEvent &event)
+{
+    gcn::Rectangle area = getChildrenArea();
+    int width = area.width;
+    int height = area.height;
+
+    mDecreaseButton->setPosition(8, height - 8 - mDecreaseButton->getHeight());
+    mIncreaseButton->setPosition(
+            mDecreaseButton->getX() + mDecreaseButton->getWidth() + 5,
+            mDecreaseButton->getY());
+
+    mQuitButton->setPosition(
+            width - 8 - mQuitButton->getWidth(),
+            height - 8 - mQuitButton->getHeight());
+    mSellButton->setPosition(
+            mQuitButton->getX() - 5 - mSellButton->getWidth(),
+            mQuitButton->getY());
+
+    mItemDescLabel->setDimension(gcn::Rectangle(8,
+                mSellButton->getY() - 5 - mItemDescLabel->getHeight(),
+                width - 16,
+                mItemDescLabel->getHeight()));
+    mItemEffectLabel->setDimension(gcn::Rectangle(8,
+                mItemDescLabel->getY() - 5 - mItemEffectLabel->getHeight(),
+                width - 16,
+                mItemEffectLabel->getHeight()));
+    mMoneyLabel->setDimension(gcn::Rectangle(8,
+                mItemEffectLabel->getY() - 5 - mMoneyLabel->getHeight(),
+                width - 16,
+                mMoneyLabel->getHeight()));
+
+    mQuantityLabel->setPosition(
+            width - mQuantityLabel->getWidth() - 8,
+            mMoneyLabel->getY() - 5 - mQuantityLabel->getHeight());
+    mSlider->setDimension(gcn::Rectangle(8,
+                mQuantityLabel->getY(),
+                mQuantityLabel->getX() - 8 - 8,
+                10));
+
+    mScrollArea->setDimension(gcn::Rectangle(8, 8, width - 16,
+                mSlider->getY() - 5 - 8));
+}
+
 void SellDialog::setMoney(int amount)
 {
     mPlayerMoney = amount;
@@ -269,8 +300,6 @@ SellDialog::updateButtonsAndLabels()
     // Update the quantity and money labels
     mQuantityLabel->setCaption(
             toString(mAmountItems) + " / " + toString(mMaxItems));
-    mQuantityLabel->adjustSize();
     mMoneyLabel->setCaption("Money: " + toString(income) + " GP / Total: "
                             + toString(mPlayerMoney + income) + " GP");
-    mMoneyLabel->adjustSize();
 }