Added garbage collection to the ScrollArea class. Fixed slider not being updated in the item amount box when the buttons are used.

1 files changed, 7 insertions, 3 deletions

diff --git a/src/gui/item_amount.cpp b/src/gui/item_amount.cpp
index f308b7ab..d92f53e1 100644
--- a/src/gui/item_amount.cpp
+++ b/src/gui/item_amount.cpp
@@ -106,6 +106,7 @@ void ItemAmountWindow::resetAmount()
 
 void ItemAmountWindow::action(const std::string& eventId)
 {
+    int amount = mItemAmountTextBox->getInt();
 
     if (eventId == "Cancel")
     {
@@ -123,15 +124,18 @@ void ItemAmountWindow::action(const std::string& eventId)
     }
     else if (eventId == "Plus")
     {
-        mItemAmountTextBox->setInt(mItemAmountTextBox->getInt() + 1);
+        amount++;
     }
     else if (eventId == "Minus")
     {
-        mItemAmountTextBox->setInt(mItemAmountTextBox->getInt() - 1);
+        amount--;
     }
     else if (eventId == "Slide")
     {
-        mItemAmountTextBox->setInt((int)(mItemAmountSlide->getValue()*mItem->getQuantity()));
+        amount = (int)(mItemAmountSlide->getValue()*(mItem->getQuantity()+1));
     }
+    mItemAmountTextBox->setInt(amount);
+    amount = mItemAmountTextBox->getInt(); // The textbox cares about bounds
+    mItemAmountSlide->setValue((amount-1)*1.0f/(mItem->getQuantity()-1));
 }