Merge branch 'count' into 'master'

Improve item count handling

See merge request OpenMW/openmw!2430

apps/openmw/mwgui/countdialog.cpp

@@ -40,7 +40,7 @@ namespace MWGui
         mSlider->setScrollRange(maxCount);
         mItemText->setCaption(item);
 
-        int width = std::max(mItemText->getTextSize().width + 128, 320);
+        int width = std::max(mItemText->getTextSize().width + 160, 320);
         setCoord(viewSize.width / 2 - width / 2, viewSize.height / 2 - mMainWidget->getHeight() / 2, width,
             mMainWidget->getHeight());
 

apps/openmw/mwgui/itemwidget.cpp

@@ -30,11 +30,11 @@ namespace
         {
             if (count > 999999999)
                 return MyGUI::utility::toString(count / 1000000000) + "b";
-            else if (count > 9999999)
+            else if (count > 99999999)
                 return ">9m";
             else if (count > 999999)
                 return MyGUI::utility::toString(count / 1000000) + "m";
-            else if (count > 9999)
+            else if (count > 99999)
                 return ">9k";
             else if (count > 999)
                 return MyGUI::utility::toString(count / 1000) + "k";

files/data/mygui/openmw_count_window.layout

@@ -5,10 +5,10 @@
         <Widget type="TextBox" skin="SandText" position="0 4 592 24" align="Left Top HStretch" name="LabelText">
             <Property key="TextAlign" value="Center"/>
         </Widget>
-        <Widget type="TextBox" skin="SandText" position="12 36 521 24" align="Left Top HStretch" name="ItemText">
+        <Widget type="TextBox" skin="SandText" position="12 36 471 24" align="Left Top HStretch" name="ItemText">
             <Property key="TextAlign" value="Left"/>
         </Widget>
-        <Widget type="NumericEditBox" skin="MW_TextEdit" position="535 36 50 24" align="Right Top" name="ItemEdit">
+        <Widget type="NumericEditBox" skin="MW_TextEdit" position="485 36 100 24" align="Right Top" name="ItemEdit">
             <Property key="TextAlign" value="Center"/>
         </Widget>
         <Widget type="ScrollBar" skin="MW_HScroll" position="7 67 578 18" align="Left Top HStretch" name="CountSlider">