diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-04-19 15:40:32 +0200 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-04-19 15:40:32 +0200 |
| commit | 124865b5d67c8c7b199046d19380e1e154ee99e4 (patch) | |
| tree | ce9b63c4eb87f3b8d930fd73a98cf63929fba365 /src/gui/trade.cpp | |
| parent | 3a15ac0bf3519173b9fd767a05c146793ba7eb1f (diff) | |
| parent | e7f9c983dd7a8d2aeb4b14e5621cef89ecc398f6 (diff) | |
| download | mana-client-124865b5d67c8c7b199046d19380e1e154ee99e4.tar.gz mana-client-124865b5d67c8c7b199046d19380e1e154ee99e4.tar.bz2 mana-client-124865b5d67c8c7b199046d19380e1e154ee99e4.tar.xz mana-client-124865b5d67c8c7b199046d19380e1e154ee99e4.zip | |
Merge branch '0.0.29'
Diffstat (limited to 'src/gui/trade.cpp')
| -rw-r--r-- | src/gui/trade.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp index 899c55d5..c67b0b7b 100644 --- a/src/gui/trade.cpp +++ b/src/gui/trade.cpp @@ -59,9 +59,11 @@ TradeWindow::TradeWindow(): mStatus(PROPOSING) { setWindowName("Trade"); - setResizable(false); + setResizable(true); setCloseButton(true); setDefaultSize(386, 180, ImageRect::CENTER); + setMinWidth(386); + setMinHeight(180); std::string longestName = getFont()->getWidth(_("OK")) > getFont()->getWidth(_("Trade")) ? @@ -76,15 +78,17 @@ TradeWindow::TradeWindow(): mOkButton->setWidth(8 + width); - mMyItemContainer = new ItemContainer(mMyInventory.get(), 5, 2); + mMyItemContainer = new ItemContainer(mMyInventory.get()); mMyItemContainer->addSelectionListener(this); ScrollArea *myScroll = new ScrollArea(mMyItemContainer); + myScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); - mPartnerItemContainer = new ItemContainer(mPartnerInventory.get(), 5, 2); + mPartnerItemContainer = new ItemContainer(mPartnerInventory.get()); mPartnerItemContainer->addSelectionListener(this); ScrollArea *partnerScroll = new ScrollArea(mPartnerItemContainer); + partnerScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); mMoneyLabel = new Label(strprintf(_("You get %s."), "")); gcn::Label *mMoneyLabel2 = new Label(_("You give:")); |