diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | src/gui/inventorywindow.cpp | 4 | ||||
| -rw-r--r-- | src/gui/inventorywindow.h | 3 |
3 files changed, 8 insertions, 2 deletions
@@ -4,6 +4,9 @@ width and height adjusted for any visible scrollbars. * src/gui/itemcontainer.cpp: Fix buildup of whitespace by using correct gridHeight and adding just 4px space to bottom. + * src/gui/inventorywindow.h, src/gui/inventorywindow.cpp: Switch to + use our extended ScrollArea and use adjusted width to proper calculate + the grid for itemcontainer. 2008-04-27 Dennis Friis <peavey@placid.dk> diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index 91b1ce7c..a5460f1d 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -96,6 +96,8 @@ void InventoryWindow::logic() mWeightLabel->setCaption( "Total Weight: " + toString(player_node->mTotalWeight) + " - " "Maximum Weight: " + toString(player_node->mMaxWeight)); + + mItems->setWidth(mInvenScroll->getAdjustedWidth()); } void InventoryWindow::action(const gcn::ActionEvent &event) @@ -203,7 +205,7 @@ void InventoryWindow::widgetResized(const gcn::Event &event) mInvenScroll->setSize(width - 16, mItemDescriptionLabel->getY() - mWeightLabel->getHeight() - 18); - mItems->setWidth(width - 16); + mItems->setWidth(mInvenScroll->getAdjustedWidth()); mWeightLabel->setWidth(width - 16); } diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h index 1a6e01af..c016f707 100644 --- a/src/gui/inventorywindow.h +++ b/src/gui/inventorywindow.h @@ -33,6 +33,7 @@ class Item; class ItemContainer; +class ScrollArea; /** * Inventory dialog. @@ -78,7 +79,7 @@ class InventoryWindow : public Window, gcn::ActionListener, ItemContainer *mItems; gcn::Button *mUseButton, *mDropButton; - gcn::ScrollArea *mInvenScroll; + ScrollArea *mInvenScroll; gcn::Label *mItemNameLabel; gcn::Label *mItemDescriptionLabel; gcn::Label *mItemEffectLabel; |