From f902c8fa6f154db5dd5383878781cc817c2dd01f Mon Sep 17 00:00:00 2001
From: pchan3 <chantlerpeter@gmail.com>
Date: Wed, 18 Apr 2012 22:35:35 +1000
Subject: [PATCH] Fixes on Namespace issue & more.

---
 apps/openmw/mwgui/container.cpp    | 73 ++++++++++++++++++++++++------
 apps/openmw/mwworld/actionopen.cpp |  2 +-
 2 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp
index 3f27351a9..094b958db 100644
--- a/apps/openmw/mwgui/container.cpp
+++ b/apps/openmw/mwgui/container.cpp
@@ -28,7 +28,7 @@ ContainerWindow::ContainerWindow(WindowManager& parWindowManager,MWWorld::Enviro
     mEnvironment(environment)
 {
     setText("_Main", "Name of Container");
-    center();
+    //center();
     adjustWindowCaption();
 
     getWidget(containerWidget, "Items");
@@ -90,7 +90,54 @@ void ContainerWindow::open(MWWorld::Ptr& container)
     containerStore.add(bukkitRef.getPtr());
     containerStore.add(bukkitRef.getPtr());
     containerStore.add(goldRef.getPtr());
-
+    containerStore.add(furRef.getPtr());
+    containerStore.add(furRef.getPtr());
+    containerStore.add(furRef.getPtr());
+    containerStore.add(broomRef.getPtr());
+    containerStore.add(broomRef.getPtr());
+    containerStore.add(broomRef.getPtr());
+    containerStore.add(broomRef.getPtr());
+    containerStore.add(broomRef.getPtr());
+    containerStore.add(broomRef.getPtr());
+    containerStore.add(broomRef.getPtr());
+    containerStore.add(broomRef.getPtr());
+    containerStore.add(broomRef.getPtr());
+    containerStore.add(broomRef.getPtr());
+    containerStore.add(bukkitRef.getPtr());
+    containerStore.add(bukkitRef.getPtr());
+    containerStore.add(bukkitRef.getPtr());
+    containerStore.add(bukkitRef.getPtr());
+    containerStore.add(bukkitRef.getPtr());
+    containerStore.add(bukkitRef.getPtr());
+    containerStore.add(bukkitRef.getPtr());
+    containerStore.add(bukkitRef.getPtr());
+    containerStore.add(bukkitRef.getPtr());
+    containerStore.add(bukkitRef.getPtr());
+    containerStore.add(goldRef.getPtr());
+    containerStore.add(furRef.getPtr());
+    containerStore.add(furRef.getPtr());
+    containerStore.add(furRef.getPtr());
+    containerStore.add(broomRef.getPtr());
+    containerStore.add(broomRef.getPtr());
+    containerStore.add(broomRef.getPtr());
+    containerStore.add(broomRef.getPtr());
+    containerStore.add(broomRef.getPtr());
+    containerStore.add(broomRef.getPtr());
+    containerStore.add(broomRef.getPtr());
+    containerStore.add(broomRef.getPtr());
+    containerStore.add(broomRef.getPtr());
+    containerStore.add(broomRef.getPtr());
+    containerStore.add(bukkitRef.getPtr());
+    containerStore.add(bukkitRef.getPtr());
+    containerStore.add(bukkitRef.getPtr());
+    containerStore.add(bukkitRef.getPtr());
+    containerStore.add(bukkitRef.getPtr());
+    containerStore.add(bukkitRef.getPtr());
+    containerStore.add(bukkitRef.getPtr());
+    containerStore.add(bukkitRef.getPtr());
+    containerStore.add(bukkitRef.getPtr());
+    containerStore.add(bukkitRef.getPtr());
+    containerStore.add(goldRef.getPtr());
 
 
     // ESMS::LiveCellRef<ESM::Armor, MWWorld::RefData> *ref = iter->get<ESM::Armor>();
@@ -103,39 +150,35 @@ void ContainerWindow::open(MWWorld::Ptr& container)
     for (MWWorld::ContainerStoreIterator iter (containerStore.begin()); iter!=containerStore.end(); ++iter)
     {
         std::string path = std::string("icons\\");
-
-
         path+=MWWorld::Class::get(*iter).getInventoryIcon(*iter);
         count++;
 
-        if(count % 8 == 0)
+        MyGUI::ImageBox* image = containerWidget->createWidget<MyGUI::ImageBox>("ImageBox", MyGUI::IntCoord(x, y, 32, 32), MyGUI::Align::Default);
+        MyGUI::TextBox* text = containerWidget->createWidget<MyGUI::TextBox>("SandBrightText", MyGUI::IntCoord(x, y, 18, 18), MyGUI::Align::Default, std::string("Label"));
+
+        x += 36;
+        if(count % 20 == 0)
         {
             y += 36;
             x = 4;
             count = 0;
         }
-        x += 36;
-
-
-        MyGUI::ImageBox* image = containerWidget->createWidget<MyGUI::ImageBox>("ImageBox", MyGUI::IntCoord(x, y, 32, 32), MyGUI::Align::Default);
-        MyGUI::TextBox* text = containerWidget->createWidget<MyGUI::TextBox>("SandBrightText", MyGUI::IntCoord(x, y, 18, 18), MyGUI::Align::Default, std::string("Label"));
 
         if(iter->getRefData().getCount() > 1)
             text->setCaption(boost::lexical_cast<std::string>(iter->getRefData().getCount()));
 
-
         containerWidgets.push_back(image);
 
-
         int pos = path.rfind(".");
         path.erase(pos);
         path.append(".dds");
-
         //std::cout << path << std::endl;
         image->setImageTexture(path);
     }
 
 
+
+
     setVisible(true);
 }
 
@@ -146,6 +189,8 @@ void ContainerWindow::Update()
 
 void ContainerWindow::onByeClicked(MyGUI::Widget* _sender)
 {
-    mEnvironment.mWindowManager->setGuiMode(MWGui::GuiMode::GM_Game);
+    mEnvironment.mWindowManager->setGuiMode(GM_Game);
+
+    setVisible(false);
 }
 
diff --git a/apps/openmw/mwworld/actionopen.cpp b/apps/openmw/mwworld/actionopen.cpp
index aa4a67b2b..e245989d7 100644
--- a/apps/openmw/mwworld/actionopen.cpp
+++ b/apps/openmw/mwworld/actionopen.cpp
@@ -16,7 +16,7 @@ namespace MWWorld
 
     void ActionOpen::execute (Environment& environment)
     {
-        environment.mWindowManager->setGuiMode(MWGui::GuiMode::GM_Container);
+        environment.mWindowManager->setGuiMode(MWGui::GM_Container);
         environment.mWindowManager->getContainerWindow()->open(mContainer);
     }
 }