2 files changed, 28 insertions, 8 deletions
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index 6cbdabb2..26382cd2 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -57,6 +57,7 @@ ItemContainer::ItemContainer(Inventory *inventory, bool forceQuantity):
     mGridRows(1),
     mSelectedIndex(-1),
     mHighlightedIndex(-1),
+    mLastUsedSlot(-1),
     mSelectionStatus(SEL_NONE),
     mForceQuantity(forceQuantity),
     mSwapItems(false),
@@ -82,6 +83,19 @@ ItemContainer::~ItemContainer()
     delete mItemPopup;
 }
 
+void ItemContainer::logic()
+{
+    gcn::Widget::logic();
+
+    const int lastUsedSlot = mInventory->getLastUsedSlot();
+
+    if (lastUsedSlot != mLastUsedSlot)
+    {
+        mLastUsedSlot = lastUsedSlot;
+        adjustHeight();
+    }
+}
+
 void ItemContainer::draw(gcn::Graphics *graphics)
 {
     Graphics *g = static_cast<Graphics*>(graphics);
@@ -316,8 +330,13 @@ void ItemContainer::mouseExited(gcn::MouseEvent &event)
 void ItemContainer::widgetResized(const gcn::Event &event)
 {
     mGridColumns = std::max(1, getWidth() / BOX_WIDTH);
-    mGridRows = mInventory->getSize() / mGridColumns;
-    if (mGridRows == 0 || mInventory->getSize() % mGridColumns > 0)
+    adjustHeight();
+}
+
+void ItemContainer::adjustHeight()
+{
+    mGridRows = (mLastUsedSlot + 1) / mGridColumns;
+    if (mGridRows == 0 || (mLastUsedSlot + 1) % mGridColumns > 0)
         ++mGridRows;
 
     setHeight(mGridRows * BOX_HEIGHT);
diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index f446a647..2cfd06b2 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.h
@@ -65,6 +65,11 @@ class ItemContainer : public gcn::Widget,
         virtual ~ItemContainer();
 
         /**
+         * Necessary for checking how full the inventory is.
+         */
+        void logic();
+
+        /**
          * Draws the items.
          */
         void draw(gcn::Graphics *graphics);
@@ -147,14 +152,9 @@ class ItemContainer : public gcn::Widget,
         void setSelectedIndex(int index);
 
         /**
-         * Find the current item index by the most recently used item ID
-         */
-        void refindSelectedItem();
-
-        /**
          * Determine and set the height of the container.
          */
-        void recalculateHeight();
+        void adjustHeight();
 
         /**
          * Sends out selection events to the list of selection listeners.
@@ -174,6 +174,7 @@ class ItemContainer : public gcn::Widget,
         int mGridColumns, mGridRows;
         Image *mSelImg;
         int mSelectedIndex, mHighlightedIndex;
+        int mLastUsedSlot;
         SelectionState mSelectionStatus;
         bool mForceQuantity;
         bool mSwapItems;