diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-11-02 21:26:57 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-11-02 21:26:57 +0000 |
| commit | 19e15c87a1fc74f71fd6f9a743201a24ac582997 (patch) | |
| tree | a615525476ef6bad8a2af4d8b90c8aea935f9109 /src/gui/trade.cpp | |
| parent | 29f07d2f98b82674708f1185f26ed3c482992b04 (diff) | |
| download | mana-19e15c87a1fc74f71fd6f9a743201a24ac582997.tar.gz mana-19e15c87a1fc74f71fd6f9a743201a24ac582997.tar.bz2 mana-19e15c87a1fc74f71fd6f9a743201a24ac582997.tar.xz mana-19e15c87a1fc74f71fd6f9a743201a24ac582997.zip | |
Merged trunk changes from revision 2716 to 2756 into the 0.1.0 branch.
Diffstat (limited to 'src/gui/trade.cpp')
| -rw-r--r-- | src/gui/trade.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp index 630881ea..2ac56ae5 100644 --- a/src/gui/trade.cpp +++ b/src/gui/trade.cpp @@ -47,7 +47,8 @@ TradeWindow::TradeWindow(): mMyInventory(new Inventory()), mPartnerInventory(new Inventory()) { - setContentSize(322, 150); + setWindowName("Trade"); + setDefaultSize(115, 197, 322, 150); mAddButton = new Button("Add", "add", this); mOkButton = new Button("Ok", "ok", this); @@ -100,12 +101,12 @@ TradeWindow::TradeWindow(): mMoneyLabel->setPosition(8 + 60 + 50 + 6, getHeight() - 20); mMoneyLabel2->setPosition(8, getHeight() - 20); - mCancelButton->setPosition(getWidth() - 48, getHeight() - 49); - mTradeButton->setPosition(mCancelButton->getX() - 40 + mCancelButton->setPosition(getWidth() - 54, getHeight() - 49); + mTradeButton->setPosition(mCancelButton->getX() - 41 , getHeight() - 49); mOkButton->setPosition(mTradeButton->getX() - 24, getHeight() - 49); - mAddButton->setPosition(mOkButton->getX() - 32, + mAddButton->setPosition(mOkButton->getX() - 31, getHeight() - 49); mMyItemContainer->setSize(getWidth() - 24 - 12 - 1, @@ -121,7 +122,6 @@ TradeWindow::TradeWindow(): mItemDescriptionLabel->setPosition(8, mItemNameLabel->getY() + mItemNameLabel->getHeight() + 4); - setContentSize(getWidth(), getHeight()); } TradeWindow::~TradeWindow() |