Submenu drop down box buttons now have hover

Submenus close once you mouse over other sub-menu elements
GUIManager blocks input while drop down box is open

BansheeEngine/Include/BsGUIManager.h

@@ -107,6 +107,7 @@ namespace BansheeEngine
 		// Drop down box
 		bool mDropDownBoxOpenScheduled;
 		bool mDropDownBoxActive;
+		bool mDropDownBoxCloseScheduled;
 		CM::HSceneObject mDropDownSO;
 		CM::GameObjectHandle<GUIDropDownBox> mDropDownBox;
 		std::function<void(CM::UINT32)> mListBoxSelectionMade;

BansheeEngine/Source/BsEngineGUI.cpp

@@ -560,7 +560,7 @@ namespace BansheeEngine
 
 		// DropDown entry button with expand
 		HTexture dropDownExpEntryBtnNormal = static_resource_cast<Texture>(Importer::instance().import(FileSystem::getCurrentPath() + "\\" + DropDownBoxEntryExpNormalTex));
-		HTexture dropDownExpEntryBtnHover = static_resource_cast<Texture>(Importer::instance().import(FileSystem::getCurrentPath() + "\\" + DropDownBoxEntryExpNormalTex));
+		HTexture dropDownExpEntryBtnHover = static_resource_cast<Texture>(Importer::instance().import(FileSystem::getCurrentPath() + "\\" + DropDownBoxEntryExpHoverTex));
 
 		GUIElementStyle dropDownEntryExpBtnStyle;
 		dropDownEntryExpBtnStyle.normal.texture = cm_shared_ptr<SpriteTexture, PoolAlloc>(std::cref(dropDownExpEntryBtnNormal));

BansheeEngine/Source/BsGUIDropDownBox.cpp

@@ -331,6 +331,7 @@ namespace BansheeEngine
 				else
 				{
 					entryBtn = GUIButton::create(*this, mElements[i].getLabel(), mEntryBtnStyle);
+					entryBtn->onHover.connect(boost::bind(&GUIDropDownBox::closeSubMenu, this));
 					entryBtn->onClick.connect(boost::bind(&GUIDropDownBox::elementClicked, this,  i));
 				}
 

BansheeEngine/Source/BsGUIManager.cpp

@@ -55,7 +55,8 @@ namespace BansheeEngine
 		:mMouseOverElement(nullptr), mMouseOverWidget(nullptr), mSeparateMeshesByWidget(true), mActiveElement(nullptr), 
 		mActiveWidget(nullptr), mActiveMouseButton(GUIMouseButton::Left), mKeyboardFocusElement(nullptr), mKeyboardFocusWidget(nullptr),
 		mCaretTexture(nullptr), mCaretBlinkInterval(0.5f), mCaretLastBlinkTime(0.0f), mCaretColor(1.0f, 0.6588f, 0.0f), mIsCaretOn(false),
-		mTextSelectionColor(1.0f, 0.6588f, 0.0f), mInputCaret(nullptr), mInputSelection(nullptr), mDropDownBoxActive(false), mDropDownBoxOpenScheduled(false)
+		mTextSelectionColor(1.0f, 0.6588f, 0.0f), mInputCaret(nullptr), mInputSelection(nullptr), mDropDownBoxActive(false), mDropDownBoxOpenScheduled(false),
+		mDropDownBoxCloseScheduled(false)
 	{
 		mOnButtonDownConn = gInput().onButtonDown.connect(boost::bind(&GUIManager::onButtonDown, this, _1));
 		mOnButtonUpConn = gInput().onButtonUp.connect(boost::bind(&GUIManager::onButtonUp, this, _1));
@@ -174,6 +175,12 @@ namespace BansheeEngine
 			mDropDownBoxOpenScheduled = false;
 		}
 
+		if(mDropDownBoxCloseScheduled)
+		{
+			closeDropDownBox();
+			mDropDownBoxCloseScheduled = false;
+		}
+
 		// Update layouts
 		for(auto& widgetInfo : mWidgets)
 		{
@@ -646,6 +653,21 @@ namespace BansheeEngine
 
 			GUIMouseButton guiButton = buttonToMouseButton(event.buttonCode);
 
+			// Close drop down box(es) if user clicks outside of one
+			if(mDropDownBoxActive)
+			{
+				bool clickedOnDropDownBox = false;
+
+				if(mMouseOverElement != nullptr && (&mMouseOverElement->_getParentWidget() == mDropDownBox.get()))
+					clickedOnDropDownBox = true;
+
+				if(!clickedOnDropDownBox)
+				{
+					mDropDownBoxCloseScheduled = true;
+					return;
+				}
+			}
+
 			// We only check for mouse down if mouse isn't already being held down, and we are hovering over an element
 			bool acceptMouseDown = mActiveElement == nullptr && mMouseOverElement != nullptr;
 			if(acceptMouseDown)
@@ -686,19 +708,10 @@ namespace BansheeEngine
 				const GUIContextMenu* menu = mMouseOverElement->getContextMenu();
 
 				if(menu != nullptr)
+				{
 					openContextMenu(menu, gInput().getMousePosition(), *mMouseOverWidget);
-			}
-
-			// Close drop down box(es) if user clicks outside of one
-			if(mDropDownBoxActive)
-			{
-				bool clickedOnDropDownBox = false;
-
-				if(mMouseOverElement != nullptr && (&mMouseOverElement->_getParentWidget() == mDropDownBox.get()))
-					clickedOnDropDownBox = true;
-
-				if(!clickedOnDropDownBox)
-					closeDropDownBox();
+					event.markAsUsed();
+				}
 			}
 		}
 	}
@@ -733,6 +746,13 @@ namespace BansheeEngine
 
 			mMouseEvent = GUIMouseEvent(buttonStates, shiftDown, ctrlDown, altDown);
 
+			// Ignore input if drop box is active and we're not interacting with its elements
+			if(mDropDownBoxActive)
+			{
+				if(mMouseOverElement == nullptr || (&mMouseOverElement->_getParentWidget() != mDropDownBox.get()))
+					return;	
+			}
+
 			Int2 localPos;
 			if(mMouseOverWidget != nullptr)
 			{
@@ -891,6 +911,13 @@ namespace BansheeEngine
 	{
 		bool eventProcessed = false;
 
+		// Ignore input if drop box is active and we're not interacting with its elements
+		if(mDropDownBoxActive)
+		{
+			if(element == nullptr || (&element->_getParentWidget() != mDropDownBox.get()))
+				return false;	
+		}
+
 		Int2 localPos;
 		if(widget != nullptr)
 		{

CamelotClient/Source/CmTestTextSprite.cpp

@@ -38,6 +38,7 @@ namespace CamelotFramework
 	void TestTextSprite::init(const HCamera& camera, const String& text, CM::RenderTexturePtr sceneView)
 	{
 		setSkin(EngineGUI::instance().getSkin());
+		setDepth(128);
 
 		GUIArea* area = GUIArea::createStretchedXY(*this, 0, 0, 0, 0);