diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-08-13 10:20:19 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-08-13 10:20:19 +0000 |
| commit | d3385829ca6f7d52e21706b25b14fe1083cfe984 (patch) | |
| tree | aea368b2434a49864b33183f95b6aae36abef3b7 /src/gui/inventorywindow.cpp | |
| parent | 7d287027babe615e01ddcf20edc1057f7d778c58 (diff) | |
| download | mana-d3385829ca6f7d52e21706b25b14fe1083cfe984.tar.gz mana-d3385829ca6f7d52e21706b25b14fe1083cfe984.tar.bz2 mana-d3385829ca6f7d52e21706b25b14fe1083cfe984.tar.xz mana-d3385829ca6f7d52e21706b25b14fe1083cfe984.zip | |
Merged Guichan 0.5.0 support from guichan-0.5.0 branch, plus several updates
from the 0.1.0 branch.
Diffstat (limited to 'src/gui/inventorywindow.cpp')
| -rw-r--r-- | src/gui/inventorywindow.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index 8f672bc9..04f07479 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -95,7 +95,7 @@ void InventoryWindow::logic() mWeightLabel->adjustSize(); } -void InventoryWindow::action(const std::string &eventId) +void InventoryWindow::action(const std::string& eventId, gcn::Widget* widget) { Item *item = mItems->getItem(); @@ -168,8 +168,9 @@ void InventoryWindow::mouseMotion(int mx, int my) void InventoryWindow::updateWidgets() { - int width = getContent()->getWidth(); - int height = getContent()->getHeight(); + gcn::Rectangle area = getChildrenArea(); + int width = area.width; + int height = area.height; int columns = width / 24; if (columns < 1) |