Fixed an issue localized strings and an exception that would happen when language was changed and update method was called on a deallocated object

Fixed GUIButton default skin active state texture (it was null)

BansheeEngine/Source/BsEngineGUI.cpp

@@ -154,6 +154,7 @@ namespace BansheeEngine
 		GUIElementStyle buttonStyle;
 		buttonStyle.normal.texture = cm_shared_ptr<SpriteTexture, PoolAlloc>(std::cref(buttonNormalTex));
 		buttonStyle.hover.texture = cm_shared_ptr<SpriteTexture, PoolAlloc>(std::cref(buttonHoverTex));
+		buttonStyle.active.texture = buttonStyle.hover.texture;
 		buttonStyle.border.left = 5;
 		buttonStyle.border.right = 5;
 		buttonStyle.border.top = 5;

CamelotClient/Include/CmTestTextSprite.h

@@ -18,5 +18,7 @@ namespace CamelotFramework
 
 	private:
 		BS::GUILabel* mLabel;
+
+		void dbgBtn();
 	};
 }

CamelotClient/Source/CmTestTextSprite.cpp

@@ -17,10 +17,12 @@
 #include "BsGUILayout.h"
 #include "BsGUISpace.h"
 #include "BsGUIViewport.h"
+#include "BsGUIButton.h"
 #include "BsCamera.h"
 #include "CmInput.h"
 #include "CmPlatform.h"
 #include "BsGUIContent.h"
+#include "CmStringTable.h"
 
 using namespace BansheeEngine;
 
@@ -52,6 +54,11 @@ namespace CamelotFramework
 		dropDownElements.push_back(HString(L"Element #2"));
 		dropDownElements.push_back(HString(L"Element #3"));
 		area->getLayout().addElement(GUIListBox::create(*this, dropDownElements, GUILayoutOptions::fixed(50, 13)));
+
+		GUIButton* button = GUIButton::create(*this, HString(L"dbgBtn"));
+		button->onClick.connect(boost::bind(&TestTextSprite::dbgBtn, this));
+		area->getLayout().addElement(button);
+
 		area->getLayout().addFlexibleSpace();
 	}
 
@@ -61,4 +68,10 @@ namespace CamelotFramework
 
 		mLabel->setContent(GUIContent(HString(L"")));
 	}
+
+	void TestTextSprite::dbgBtn()
+	{
+		StringTable::instance().setString(L"dbgBtn", Language::Abkhazian, L"ALOALO");
+		StringTable::instance().setActiveLanguage(Language::Abkhazian);
+	}
 }

CamelotUtility/Include/CmHString.h

@@ -32,6 +32,8 @@ namespace CamelotFramework
 
 			mutable bool mIsDirty;
 			mutable WString mCachedString;
+
+			void updateString();
 		};
 
 		explicit HString(const WString& identifierString);
@@ -45,7 +47,5 @@ namespace CamelotFramework
 		boost::signals::connection addOnStringModifiedCallback(boost::function<void()> callback) const;
 	private:
 		std::shared_ptr<StringData> mData;
-
-		void updateString();
 	};
 }

CamelotUtility/Source/CmHString.cpp

@@ -16,13 +16,30 @@ namespace CamelotFramework
 			cm_deleteN(mParameters, mStringData->numParameters);
 	}
 
+	void HString::StringData::updateString()
+	{
+		LocalizedStringData* stringData = &StringTable::instance().getStringData(mStringData->commonData->identifier);
+
+		// If common data changed re-apply the connections
+		if(stringData->commonData != mStringData->commonData)
+		{
+			mUpdateConn.disconnect();
+			mUpdateConn = stringData->commonData->onStringDataModified.connect(boost::bind(&HString::StringData::updateString, this));
+		}
+
+		mStringData = stringData;
+		mIsDirty = true;
+
+		onStringModified();
+	}
+
 	HString::HString()
 	{
 		mData = cm_shared_ptr<StringData>();
 
 		mData->mStringData = &StringTable::instance().getStringData(L"");
 		mData->mParameters = cm_newN<WString>(mData->mStringData->numParameters);
-		mData->mUpdateConn = mData->mStringData->commonData->onStringDataModified.connect(boost::bind(&HString::updateString, this));
+		mData->mUpdateConn = mData->mStringData->commonData->onStringDataModified.connect(boost::bind(&HString::StringData::updateString, mData.get()));
 	}
 
 	HString::HString(const WString& identifierString)
@@ -31,7 +48,7 @@ namespace CamelotFramework
 
 		mData->mStringData = &StringTable::instance().getStringData(identifierString);
 		mData->mParameters = cm_newN<WString>(mData->mStringData->numParameters);
-		mData->mUpdateConn = mData->mStringData->commonData->onStringDataModified.connect(boost::bind(&HString::updateString, this));
+		mData->mUpdateConn = mData->mStringData->commonData->onStringDataModified.connect(boost::bind(&HString::StringData::updateString, mData.get()));
 	}
 
 	HString::HString(const HString& copy)
@@ -67,21 +84,4 @@ namespace CamelotFramework
 	{
 		return mData->onStringModified.connect(callback);
 	}
-
-	void HString::updateString()
-	{
-		LocalizedStringData* stringData = &StringTable::instance().getStringData(mData->mStringData->commonData->identifier);
-
-		// If common data changed re-apply the connections
-		if(stringData->commonData != mData->mStringData->commonData)
-		{
-			mData->mUpdateConn.disconnect();
-			mData->mUpdateConn = stringData->commonData->onStringDataModified.connect(boost::bind(&HString::updateString, this));
-		}
-
-		mData->mStringData = stringData;
-		mData->mIsDirty = true;
-
-		mData->onStringModified();
-	}
 }

Localization.txt

@@ -4,11 +4,9 @@ Test HString:
  - Test changing string
  - Test removing string
 
- HString needs to be introduced in:
- - Label, Button, Toggle, Listbox
-   - Also needs a callback so those elements can be marked as dirty when it is changed
- - Context menu & menu bar
-   - How do I change this when HString is modified or language is changed?
-   - Allow the user to set custom menu name (name used only for display)
-     - Normally the name provided in menu path is used but user can set a localized string if he wants
- - Title bar & window names
+ Exception happens when changing languages
+
+ Update MenuBar, ContextMenu, ListBox and GUIDropDownBox so they handle HString properly
+  - GUIDropDownData also accepts an array of localized strings
+  - MenuBar/ContextMenu/ListBox need to properly fill that array and forward it
+  - That array is then used for naming of menu entries (if it exists, otherwise we just use the name from the menu string)