Move item count text to ItemWidget

apps/openmw/mwgui/alchemywindow.cpp

@@ -203,12 +203,7 @@ namespace MWGui
             ingredient->setUserString("ToolTipType", "ItemPtr");
             ingredient->setUserData(item);
 
-            MyGUI::TextBox* text = ingredient->createWidget<MyGUI::TextBox>("SandBrightText", MyGUI::IntCoord(0, 14, 32, 18), MyGUI::Align::Default, std::string("Label"));
+            ingredient->setCount(ingredient->getUserData<MWWorld::Ptr>()->getRefData().getCount());
-            text->setTextAlign(MyGUI::Align::Right);
-            text->setNeedMouseFocus(false);
-            text->setTextShadow(true);
-            text->setTextShadowColour(MyGUI::Colour(0,0,0));
-            text->setCaption(ItemView::getCountString(ingredient->getUserData<MWWorld::Ptr>()->getRefData().getCount()));
         }
 
         mItemView->update();

apps/openmw/mwgui/container.cpp

@@ -92,16 +92,7 @@ namespace MWGui
         mDraggedWidget = baseWidget;
         baseWidget->setItem(mItem.mBase);
         baseWidget->setNeedMouseFocus(false);
-
+        baseWidget->setCount(count);
-        // text widget that shows item count
-        // TODO: move to ItemWidget
-        MyGUI::TextBox* text = baseWidget->createWidget<MyGUI::TextBox>("SandBrightText",
-            MyGUI::IntCoord(0, 14, 32, 18), MyGUI::Align::Default, std::string("Label"));
-        text->setTextAlign(MyGUI::Align::Right);
-        text->setNeedMouseFocus(false);
-        text->setTextShadow(true);
-        text->setTextShadowColour(MyGUI::Colour(0,0,0));
-        text->setCaption(ItemView::getCountString(count));
 
         sourceView->update();
 

apps/openmw/mwgui/itemview.cpp

@@ -17,16 +17,6 @@
 namespace MWGui
 {
 
-std::string ItemView::getCountString(int count)
-{
-    if (count == 1)
-        return "";
-    if (count > 9999)
-        return boost::lexical_cast<std::string>(int(count/1000.f)) + "k";
-    else
-        return boost::lexical_cast<std::string>(count);
-}
-
 ItemView::ItemView()
     : mModel(NULL)
     , mScrollView(NULL)
@@ -123,19 +113,10 @@ void ItemView::update()
         if (item.mType == ItemStack::Type_Equipped)
             state = ItemWidget::Equip;
         itemWidget->setItem(item.mBase, state);
+        itemWidget->setCount(item.mCount);
 
         itemWidget->eventMouseButtonClick += MyGUI::newDelegate(this, &ItemView::onSelectedItem);
         itemWidget->eventMouseWheel += MyGUI::newDelegate(this, &ItemView::onMouseWheel);
-
-        // text widget that shows item count
-        // TODO: move to ItemWidget
-        MyGUI::TextBox* text = itemWidget->createWidget<MyGUI::TextBox>("SandBrightText",
-            MyGUI::IntCoord(5, 19, 32, 18), MyGUI::Align::Default, std::string("Label"));
-        text->setTextAlign(MyGUI::Align::Right);
-        text->setNeedMouseFocus(false);
-        text->setTextShadow(true);
-        text->setTextShadowColour(MyGUI::Colour(0,0,0));
-        text->setCaption(getCountString(item.mCount));
     }
 
     layoutWidgets();

apps/openmw/mwgui/itemview.hpp

@@ -30,8 +30,6 @@ namespace MWGui
 
         void update();
 
-        static std::string getCountString(int count);
-
     private:
         virtual void initialiseOverride();
 

apps/openmw/mwgui/itemwidget.cpp

@@ -2,16 +2,34 @@
 
 #include <MyGUI_FactoryManager.h>
 #include <MyGUI_ImageBox.h>
+#include <MyGUI_TextBox.h>
+
+#include <boost/lexical_cast.hpp>
 
 #include <components/misc/resourcehelpers.hpp>
 
 #include "../mwworld/class.hpp"
 
+namespace
+{
+    std::string getCountString(int count)
+    {
+        if (count == 1)
+            return "";
+        if (count > 9999)
+            return boost::lexical_cast<std::string>(int(count/1000.f)) + "k";
+        else
+            return boost::lexical_cast<std::string>(count);
+    }
+}
+
 namespace MWGui
 {
 
     ItemWidget::ItemWidget()
         : mItem(NULL)
+        , mFrame(NULL)
+        , mText(NULL)
     {
 
     }
@@ -29,10 +47,20 @@ namespace MWGui
         assignWidget(mFrame, "Frame");
         if (mFrame)
             mFrame->setNeedMouseFocus(false);
+        assignWidget(mText, "Text");
+        if (mText)
+            mText->setNeedMouseFocus(false);
 
         Base::initialiseOverride();
     }
 
+    void ItemWidget::setCount(int count)
+    {
+        if (!mText)
+            return;
+        mText->setCaption(getCountString(count));
+    }
+
     void ItemWidget::setIcon(const std::string &icon)
     {
         if (mItem)

apps/openmw/mwgui/itemwidget.hpp

@@ -29,6 +29,9 @@ namespace MWGui
             Magic
         };
 
+        /// Set count to be displayed in a textbox over the item
+        void setCount(int count);
+
         /// \a ptr may be empty
         void setItem (const MWWorld::Ptr& ptr, ItemState state = None);
 
@@ -42,6 +45,7 @@ namespace MWGui
 
         MyGUI::ImageBox* mItem;
         MyGUI::ImageBox* mFrame;
+        MyGUI::TextBox* mText;
     };
 
 }

files/mygui/openmw_resources.xml

@@ -322,6 +322,10 @@
     <Resource type="ResourceLayout" name="MW_ItemIcon" version="3.2.0">
         <Widget type="Widget" skin="" position="0 0 42 42" name="Root">
             <Widget type="ImageBox" skin="ImageBox" position="0 0 42 42" align="Stretch" name="Frame">
+                <Widget type="TextBox" skin="SandBrightText" position="5 19 32 18" align="Right Bottom" name="Text">
+                    <Property key="TextAlign" value="Right"/>
+                    <Property key="TextShadow" value="true"/>
+                </Widget>
                 <Widget type="ImageBox" skin="ImageBox" position="5 5 32 32" align="Stretch" name="Item"/>
             </Widget>
         </Widget>
@@ -338,6 +342,10 @@
     <Resource type="ResourceLayout" name="MW_ItemIconBox" version="3.2.0">
         <Widget type="Widget" skin="" position="0 0 50 50" name="Root">
             <Widget type="ImageBox" skin="ImageBox" position="4 4 42 42" align="Center" name="Frame">
+                <Widget type="TextBox" skin="SandBrightText" position="5 19 32 18" align="Right Bottom" name="Text">
+                    <Property key="TextAlign" value="Right"/>
+                    <Property key="TextShadow" value="true"/>
+                </Widget>
                 <Widget type="ImageBox" skin="ImageBox" position="5 5 32 32" align="Center" name="Item"/>
             </Widget>