summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Friis <peavey@placid.dk>2008-04-27 17:14:35 +0000
committerDennis Friis <peavey@placid.dk>2008-04-27 17:14:35 +0000
commitab08248a2da802de38bb017b994c22e8f7999424 (patch)
tree5251b171504d75859f03ebbf336bdb310d780b93
parent095b6e3d86fe30558abfeff084171e405a1f22d9 (diff)
downloadmana-ab08248a2da802de38bb017b994c22e8f7999424.tar.gz
mana-ab08248a2da802de38bb017b994c22e8f7999424.tar.bz2
mana-ab08248a2da802de38bb017b994c22e8f7999424.tar.xz
mana-ab08248a2da802de38bb017b994c22e8f7999424.zip
Fix ItemContainer not being resized properly when resizing inventory window.
-rw-r--r--ChangeLog5
-rw-r--r--src/gui/inventorywindow.cpp8
2 files changed, 7 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 81c249cb..35992f92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-27 Dennis Friis <peavey@placid.dk>
+
+ * src/gui/inventorywindow.cpp: Fix ItemContainer not being resized
+ properly when resizing inventory window.
+
2008-04-26 Dennis Friis <peavey@placid.dk>
* src/inventory.cpp: Avoid stacking equipment other than arrows. Based on
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 7062720d..91b1ce7c 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -181,12 +181,6 @@ void InventoryWindow::widgetResized(const gcn::Event &event)
const gcn::Rectangle &area = getChildrenArea();
const int width = area.width;
const int height = area.height;
- int columns = width / 24;
-
- if (columns < 1)
- {
- columns = 1;
- }
// Adjust widgets
mUseButton->setPosition(8, height - 8 - mUseButton->getHeight());
@@ -209,6 +203,8 @@ void InventoryWindow::widgetResized(const gcn::Event &event)
mInvenScroll->setSize(width - 16,
mItemDescriptionLabel->getY() - mWeightLabel->getHeight() - 18);
+ mItems->setWidth(width - 16);
+
mWeightLabel->setWidth(width - 16);
}