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/inventorywindow.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/inventorywindow.cpp')
| -rw-r--r-- | src/gui/inventorywindow.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index a808945e..50b0bd78 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -54,10 +54,12 @@ InventoryWindow::InventoryWindow(int invSize): mItemDesc(false) { setWindowName("Inventory"); - setResizable(false); + setResizable(true); setCloseButton(true); setDefaultSize(387, 307, ImageRect::CENTER); + setMinWidth(316); + setMinHeight(179); addKeyListener(this); std::string longestUseString = getFont()->getWidth(_("Equip")) > @@ -74,14 +76,14 @@ InventoryWindow::InventoryWindow(int invSize): mDropButton = new Button(_("Drop"), "drop", this); #ifdef TMWSERV_SUPPORT mSplitButton = new Button(_("Split"), "split", this); - mItems = new ItemContainer(player_node->getInventory(), 10, 5); + mItems = new ItemContainer(player_node->getInventory()); #else - mItems = new ItemContainer(player_node->getInventory(), 10, 10); + mItems = new ItemContainer(player_node->getInventory()); #endif mItems->addSelectionListener(this); - mInvenScroll = new ScrollArea(mItems); - mInvenScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); + gcn::ScrollArea *invenScroll = new ScrollArea(mItems); + invenScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); mTotalWeight = -1; mMaxWeight = -1; @@ -97,7 +99,7 @@ InventoryWindow::InventoryWindow(int invSize): place(1, 0, mWeightBar, 3); place(4, 0, mSlotsLabel).setPadding(3); place(5, 0, mSlotsBar, 2); - place(0, 1, mInvenScroll, 7).setPadding(3); + place(0, 1, invenScroll, 7).setPadding(3); place(0, 2, mUseButton); place(1, 2, mDropButton); #ifdef TMWSERV_SUPPORT |