Merge branch 'master' into strippedstripped1.1.10.2

Conflicts:
	packaging/debian/watch

1 files changed, 14 insertions, 1 deletions

diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index c32fd8905..9dadeb5a8 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -45,6 +45,7 @@ class DropDown;
 class Item;
 class ItemContainer;
 class InventoryFilter;
+class LayoutCell;
 class ProgressBar;
 class SortListModel;
 //class TextBox;
@@ -84,6 +85,11 @@ class InventoryWindow : public Window,
         Item* getSelectedItem() const;
 
         /**
+         * Handles closing of the window
+         */
+        void widgetHidden(const gcn::Event &event);
+
+        /**
          * Handles the mouse clicks.
          */
         void mouseClicked(gcn::MouseEvent &event);
@@ -133,6 +139,8 @@ class InventoryWindow : public Window,
 
         bool isInputFocused() const;
 
+        void widgetResized(const gcn::Event &event);
+
         static bool isAnyInputFocused();
 
     private:
@@ -154,15 +162,20 @@ class InventoryWindow : public Window,
                     *mSplitButton, *mOutfitButton, *mShopButton,
                     *mStoreButton, *mRetrieveButton, *mCloseButton;
 
-        gcn::Label *mWeightLabel, *mSlotsLabel, *mFilterLabel, *mSorterLabel;
+        gcn::Label *mWeightLabel, *mSlotsLabel, *mFilterLabel;
 
         ProgressBar *mWeightBar, *mSlotsBar;
         InventoryFilter *mFilter;
         DropDown *mSortDropDown;
         SortListModel *mSortModel;
         TextField *mNameFilter;
+        LayoutCell *mSortDropDownCell;
+        LayoutCell *mNameFilterCell;
+        LayoutCell *mFilterCell;
+        LayoutCell *mSlotsBarCell;
 
         bool mSplit;
+        bool mCompactMode;
 };
 
 extern InventoryWindow *inventoryWindow;