diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-10 21:57:09 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-10 21:57:09 +0100 |
| commit | 9f2a8799eea3d609a3863a7732ec280d83f12e47 (patch) | |
| tree | 719f9e8703211937fc2452055c7a8d5be05bd2f8 /src/gui/inventorywindow.cpp | |
| parent | 53840c3fe951c77fa7965efcac4ed77b52da14d9 (diff) | |
| parent | a8a992ade40c9d68c9faec1cc3a54e7f064fb9d5 (diff) | |
| download | mana-client-9f2a8799eea3d609a3863a7732ec280d83f12e47.tar.gz mana-client-9f2a8799eea3d609a3863a7732ec280d83f12e47.tar.bz2 mana-client-9f2a8799eea3d609a3863a7732ec280d83f12e47.tar.xz mana-client-9f2a8799eea3d609a3863a7732ec280d83f12e47.zip | |
Merge branch 'aethyra/master'
Conflicts:
docs/FAQ.txt
packaging/windows/make-translations.vbs
src/Makefile.am
src/gui/colour.cpp
src/gui/colour.h
src/gui/popupmenu.cpp
src/gui/setup_colours.h
src/main.cpp
src/main.h
src/resources/resourcemanager.cpp
src/text.cpp
src/text.h
src/textmanager.cpp
src/textmanager.h
Diffstat (limited to 'src/gui/inventorywindow.cpp')
| -rw-r--r-- | src/gui/inventorywindow.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index b9fe1c90..af3b29a2 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -87,12 +87,12 @@ InventoryWindow::InventoryWindow(int invSize): mWeightBar = new ProgressBar(1.0f, 100, 20, 0, 0, 255); setMinHeight(130); - setMinWidth(mWeightLabel->getWidth() + mSlotsLabel->getWidth() + 310); + setMinWidth(mWeightLabel->getWidth() + mSlotsLabel->getWidth() + 280); place(0, 0, mWeightLabel).setPadding(3); - place(1, 0, mWeightBar, 2); - place(3, 0, mSlotsLabel).setPadding(3); - place(4, 0, mSlotsBar, 2); + place(1, 0, mWeightBar, 3); + place(4, 0, mSlotsLabel).setPadding(3); + place(5, 0, mSlotsBar, 2); place(0, 1, mInvenScroll, 7, 4); place(5, 5, mDropButton); place(6, 5, mUseButton); |