Fix broken coin placement in levelup dialog + possible memleak

apps/openmw/mwgui/levelupdialog.cpp

@@ -83,13 +83,19 @@ namespace MWGui
     {
         const int coinSpacing = 10;
         int curX = mCoinBox->getWidth()/2 - (coinSpacing*(mCoinCount - 1) + 16*mCoinCount)/2;
-        for (unsigned int i=0; i<mCoinCount; ++i)
+        for (unsigned int i=0; i<sMaxCoins; ++i)
         {
             MyGUI::ImageBox* image = mCoins[i];
             image->detachFromWidget();
             image->attachToWidget(mCoinBox);
-            image->setCoord(MyGUI::IntCoord(curX,0,16,16));
-            curX += 16+coinSpacing;
+            if (i < mCoinCount)
+            {
+                mCoins[i]->setVisible(true);
+                image->setCoord(MyGUI::IntCoord(curX,0,16,16));
+                curX += 16+coinSpacing;
+            }
+            else
+                mCoins[i]->setVisible(false);
         }
     }
 
@@ -178,14 +184,6 @@ namespace MWGui
 
         mCoinCount = std::min(sMaxCoins, availableAttributes);
 
-        for (unsigned int i = 0; i < sMaxCoins; i++)
-        {
-            if (i < mCoinCount)
-                mCoins[i]->attachToWidget(mCoinBox);
-            else
-                mCoins[i]->detachFromWidget();
-        }
-
         mSpentAttributes.clear();
         resetCoins();
 

apps/openmw/mwgui/widgets.cpp

@@ -559,6 +559,8 @@ namespace MWGui
                     Box * b = dynamic_cast<Box*>(parent);
                     if (b)
                         b->notifyChildrenSizeChanged();
+                    else
+                        break;
                     parent = parent->getParent();
                 }
             }

files/mygui/openmw_enchanting_dialog.layout

@@ -92,7 +92,6 @@
                     <UserString key="HStretch" value="true"/>
                 </Widget>
             </Widget>
-            <Widget type="Widget"/>
         </Widget>
 
         <!-- Available effects -->