4 files changed, 28 insertions, 5 deletions
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 75968d668..84313d64f 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -513,6 +513,9 @@ void ItemContainer::updateMatrix()
     int i = 0;
     int j = 0;
 
+    std::string temp = mName;
+    toLower(temp);
+
     for (unsigned idx = 0; idx < mInventory->getSize(); idx ++)
     {
         Item *item = mInventory->getItem(idx);
@@ -520,7 +523,15 @@ void ItemContainer::updateMatrix()
         if (!item || item->getId() == 0 || !item->isHaveTag(mTag))
             continue;
 
-        sortedItems.push_back(new ItemIdPair(idx, item));
+        if (mName.empty())
+        {
+            sortedItems.push_back(new ItemIdPair(idx, item));
+            continue;
+        }
+        std::string name = item->getInfo().getName();
+        toLower(name);
+        if (name.find(temp) != std::string::npos)
+            sortedItems.push_back(new ItemIdPair(idx, item));
     }
 
     switch (mSortType)
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index df7de63ee..845bfb3a9 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -125,6 +125,9 @@ class ItemContainer : public gcn::Widget,
 
         void setSortType (int sortType);
 
+        void setName(std::string str)
+        { mName = str; }
+
         void updateMatrix();
 
     private:
@@ -194,6 +197,7 @@ class ItemContainer : public gcn::Widget,
         int mDragPosX, mDragPosY;
         int mTag;
         int mSortType;
+        std::string mName;
 
         ItemPopup *mItemPopup;
         int *mShowMatrix;
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index d9f5bed9a..5d4fbc0b4 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -48,12 +48,14 @@ float TextField::mAlpha = 1.0;
 ImageRect TextField::skin;
 
 TextField::TextField(const std::string &text, bool loseFocusOnTab,
-                     gcn::ActionListener* listener, std::string eventId):
+                     gcn::ActionListener* listener, std::string eventId,
+                     bool sendAlwaysEvents):
     gcn::TextField(text),
     mNumeric(false),
     mMinimum(0),
     mMaximum(0),
-    mLastEventPaste(false)
+    mLastEventPaste(false),
+    mSendAlwaysEvents(sendAlwaysEvents)
 {
     setFrameSize(2);
 
@@ -276,7 +278,9 @@ void TextField::keyPressed(gcn::KeyEvent &keyEvent)
 
         case Key::ENTER:
             distributeActionEvent();
-            break;
+            keyEvent.consume();
+            fixScroll();
+            return;
 
         case Key::HOME:
             mCaretPosition = 0;
@@ -337,6 +341,9 @@ void TextField::keyPressed(gcn::KeyEvent &keyEvent)
             break;
     }
 
+    if (mSendAlwaysEvents)
+        distributeActionEvent();
+
     keyEvent.consume();
     fixScroll();
 }
diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h
index 79790d83a..7e19099e8 100644
--- a/src/gui/widgets/textfield.h
+++ b/src/gui/widgets/textfield.h
@@ -41,7 +41,7 @@ class TextField : public gcn::TextField
          */
         TextField(const std::string &text = "", bool loseFocusOnTab = true,
                   gcn::ActionListener* listener = NULL,
-                  std::string eventId = "");
+                  std::string eventId = "", bool sendAlwaysEvents = false);
 
         ~TextField();
 
@@ -109,6 +109,7 @@ class TextField : public gcn::TextField
         int mMaximum;
         bool mLoseFocusOnTab;
         int mLastEventPaste;
+        bool mSendAlwaysEvents;
 };
 
 #endif