Fixed a memory corruption issue in GUIManager that happened when a widget was deleted

Fixed Library Window drag and drop start condition so drag doesn't start unless mouse click occurred within window bounds
Fixed a crash in library window when scroll area bounds are zero

BansheeEditor/Include/BsGUIWindowFrameWidget.h

@@ -32,11 +32,6 @@ namespace BansheeEngine
 		 */
 		virtual void update() override;
 
-		/**
-		 * @copydoc	GUIWidget::ownerWindowFocusChanged
-		 */
-		virtual bool _mouseEvent(GUIElement* element, const GUIMouseEvent& ev) override;
-
 		/**
 		 * @copydoc	GUIWidget::ownerWindowFocusChanged
 		 */

BansheeEditor/Source/BsGUIWindowFrameWidget.cpp

@@ -41,11 +41,6 @@ namespace BansheeEngine
 
 	}
 
-	bool WindowFrameWidget::_mouseEvent(GUIElement* element, const GUIMouseEvent& ev)
-	{
-		return CGUIWidget::_mouseEvent(element, ev);
-	}
-
 	void WindowFrameWidget::ownerWindowFocusChanged()
 	{
 		mWindowFrame->setFocused(mParentWindow->getProperties().hasFocus());

BansheeEngine/Include/BsCGUIWidget.h

@@ -126,30 +126,6 @@ namespace BansheeEngine
 		 */
 		void _updateLayout(GUIElementBase* elem);
 
-		/**
-		 * @brief	Forwards the specified mouse event to the specified element. The element
-		 * 			must be a child of this widget.
-		 */
-		virtual bool _mouseEvent(GUIElement* element, const GUIMouseEvent& ev);
-				
-		/**
-		 * @brief	Forwards the specified key event to the specified element. The element
-		 * 			must be a child of this widget.
-		 */
-		virtual bool _textInputEvent(GUIElement* element, const GUITextInputEvent& ev);
-
-		/**
-		 * @brief	Forwards the specified key event to the specified element. The element
-		 * 			must be a child of this widget.
-		 */
-		virtual bool _commandEvent(GUIElement* element, const GUICommandEvent& ev);
-
-		/**
-		 * @brief	Forwards the specified virtual button event to the specified element. The element
-		 * 			must be a child of this widget.
-		 */
-		virtual bool _virtualButtonEvent(GUIElement* element, const GUIVirtualButtonEvent& ev);
-
 	protected:
 		friend class SceneObject;
 		friend class GUIElementBase;

BansheeEngine/Include/BsGUIManager.h

@@ -320,7 +320,7 @@ namespace BansheeEngine
 		/**
 		 * @brief	Converts screen coordinates to coordinates relative to the specified widget.
 		 */
-		Vector2I getWidgetRelativePos(const CGUIWidget& widget, const Vector2I& screenPos) const;
+		Vector2I getWidgetRelativePos(const CGUIWidget* widget, const Vector2I& screenPos) const;
 
 		/**
 		 * @brief	Converts window coordinates to coordinates relative to the specified bridged widget.
@@ -338,38 +338,34 @@ namespace BansheeEngine
 		/**
 		 * @brief	Sends a mouse event to the specified GUI element.
 		 *
-		 * @param	widget	Parent widget of the element to send the event to.
 		 * @param	element	Element to send the event to.
 		 * @param	event	Event data.
 		 */
-		bool sendMouseEvent(CGUIWidget* widget, GUIElement* element, const GUIMouseEvent& event);
+		bool sendMouseEvent(GUIElement* element, const GUIMouseEvent& event);
 
 		/**
 		 * @brief	Sends a text input event to the specified GUI element.
 		 *
-		 * @param	widget	Parent widget of the element to send the event to.
 		 * @param	element	Element to send the event to.
 		 * @param	event	Event data.
 		 */
-		bool sendTextInputEvent(CGUIWidget* widget, GUIElement* element, const GUITextInputEvent& event);
+		bool sendTextInputEvent(GUIElement* element, const GUITextInputEvent& event);
 
 		/**
 		 * @brief	Sends a command event to the specified GUI element.
 		 *
-		 * @param	widget	Parent widget of the element to send the event to.
 		 * @param	element	Element to send the event to.
 		 * @param	event	Event data.
 		 */
-		bool sendCommandEvent(CGUIWidget* widget, GUIElement* element, const GUICommandEvent& event);
+		bool sendCommandEvent(GUIElement* element, const GUICommandEvent& event);
 
 		/**
 		 * @brief	Sends a virtual button event to the specified GUI element.
 		 *
-		 * @param	widget	Parent widget of the element to send the event to.
 		 * @param	element	Element to send the event to.
 		 * @param	event	Event data.
 		 */
-		bool sendVirtualButtonEvent(CGUIWidget* widget, GUIElement* element, const GUIVirtualButtonEvent& event);
+		bool sendVirtualButtonEvent(GUIElement* element, const GUIVirtualButtonEvent& event);
 
 		static const UINT32 DRAG_DISTANCE;
 

BansheeEngine/Source/BsCGUIWidget.cpp

@@ -219,26 +219,6 @@ namespace BansheeEngine
 		bs_frame_clear();
 	}
 
-	bool CGUIWidget::_mouseEvent(GUIElement* element, const GUIMouseEvent& ev)
-	{
-		return element->_mouseEvent(ev);
-	}
-
-	bool CGUIWidget::_textInputEvent(GUIElement* element, const GUITextInputEvent& ev)
-	{
-		return element->_textInputEvent(ev);
-	}
-
-	bool CGUIWidget::_commandEvent(GUIElement* element, const GUICommandEvent& ev)
-	{
-		return element->_commandEvent(ev);
-	}
-
-	bool CGUIWidget::_virtualButtonEvent(GUIElement* element, const GUIVirtualButtonEvent& ev)
-	{
-		return element->_virtualButtonEvent(ev);
-	}
-
 	void CGUIWidget::_registerElement(GUIElementBase* elem)
 	{
 		assert(elem != nullptr && !elem->_isDestroyed());

BansheeEngine/Source/BsGUIManager.cpp

@@ -173,6 +173,27 @@ namespace BansheeEngine
 				mWidgets.erase(findIter);
 		}
 
+		{
+			auto findIter = std::find_if(begin(mElementsInFocus), end(mElementsInFocus), [=](const ElementInfo& x) { return x.widget == widget; });
+
+			if (findIter != mElementsInFocus.end())
+				findIter->widget = nullptr;
+		}
+
+		{
+			auto findIter = std::find_if(begin(mElementsUnderPointer), end(mElementsUnderPointer), [=](const ElementInfoUnderPointer& x) { return x.widget == widget; });
+
+			if (findIter != mElementsUnderPointer.end())
+				findIter->widget = nullptr;
+		}
+
+		{
+			auto findIter = std::find_if(begin(mActiveElements), end(mActiveElements), [=](const ElementInfo& x) { return x.widget == widget; });
+
+			if (findIter != mActiveElements.end())
+				findIter->widget = nullptr;
+		}
+
 		const Viewport* renderTarget = widget->getTarget();
 		GUIRenderData& renderData = mCachedGUIData[renderTarget];
 
@@ -256,7 +277,7 @@ namespace BansheeEngine
 						mCommandEvent = GUICommandEvent();
 						mCommandEvent.setType(GUICommandEventType::FocusGained);
 
-						sendCommandEvent(focusElementInfo.element->_getParentWidget(), focusElementInfo.element, mCommandEvent);
+						sendCommandEvent(focusElementInfo.element, mCommandEvent);
 					}
 				}
 				else
@@ -269,7 +290,7 @@ namespace BansheeEngine
 							mCommandEvent = GUICommandEvent();
 							mCommandEvent.setType(GUICommandEventType::FocusLost);
 
-							sendCommandEvent(elementInfo.widget, elementInfo.element, mCommandEvent);
+							sendCommandEvent(elementInfo.element, mCommandEvent);
 						}
 						else
 							mNewElementsInFocus.push_back(elementInfo);
@@ -296,7 +317,7 @@ namespace BansheeEngine
 
 			for (auto& elementInfo : mElementsInFocus)
 			{
-				sendCommandEvent(elementInfo.widget, elementInfo.element, mCommandEvent);
+				sendCommandEvent(elementInfo.element, mCommandEvent);
 			}
 		}
 
@@ -657,7 +678,7 @@ namespace BansheeEngine
 				Vector2I localPos;
 
 				if(elementInfo.widget != nullptr)
-					localPos = getWidgetRelativePos(*elementInfo.widget, event.screenPos);
+					localPos = getWidgetRelativePos(elementInfo.widget, event.screenPos);
 
 				bool acceptDrop = true;
 				if(DragAndDropManager::instance().needsValidDropTarget())
@@ -668,7 +689,7 @@ namespace BansheeEngine
 				if(acceptDrop)
 				{
 					mMouseEvent.setDragAndDropDroppedData(localPos, DragAndDropManager::instance().getDragTypeId(), DragAndDropManager::instance().getDragData());
-					dragInfo.processed = sendMouseEvent(elementInfo.widget, elementInfo.element, mMouseEvent);
+					dragInfo.processed = sendMouseEvent(elementInfo.element, mMouseEvent);
 
 					if(dragInfo.processed)
 						return;
@@ -700,11 +721,11 @@ namespace BansheeEngine
 			{
 				for(auto& activeElement : mActiveElements)
 				{
-					Vector2I localPos = getWidgetRelativePos(*activeElement.widget, event.screenPos);
-					Vector2I localDragStartPos = getWidgetRelativePos(*activeElement.widget, mLastPointerClickPos);
+					Vector2I localPos = getWidgetRelativePos(activeElement.widget, event.screenPos);
+					Vector2I localDragStartPos = getWidgetRelativePos(activeElement.widget, mLastPointerClickPos);
 
 					mMouseEvent.setMouseDragStartData(localPos, localDragStartPos);
-					if(sendMouseEvent(activeElement.widget, activeElement.element, mMouseEvent))
+					if(sendMouseEvent(activeElement.element, mMouseEvent))
 						event.markAsUsed();
 				}
 
@@ -720,10 +741,10 @@ namespace BansheeEngine
 			{
 				if(mLastPointerScreenPos != event.screenPos)
 				{
-					Vector2I localPos = getWidgetRelativePos(*activeElement.widget, event.screenPos);
+					Vector2I localPos = getWidgetRelativePos(activeElement.widget, event.screenPos);
 
 					mMouseEvent.setMouseDragData(localPos, event.screenPos - mDragStartPos);
-					if(sendMouseEvent(activeElement.widget, activeElement.element, mMouseEvent))
+					if(sendMouseEvent(activeElement.element, mMouseEvent))
 						event.markAsUsed();
 				}
 			}
@@ -736,7 +757,7 @@ namespace BansheeEngine
 				bool acceptDrop = true;
 				for(auto& elementInfo : mElementsUnderPointer)
 				{
-					Vector2I localPos = getWidgetRelativePos(*elementInfo.widget, event.screenPos);
+					Vector2I localPos = getWidgetRelativePos(elementInfo.widget, event.screenPos);
 
 					acceptDrop = true;
 					if(DragAndDropManager::instance().needsValidDropTarget())
@@ -747,7 +768,7 @@ namespace BansheeEngine
 					if(acceptDrop)
 					{
 						mMouseEvent.setDragAndDropDraggedData(localPos, DragAndDropManager::instance().getDragTypeId(), DragAndDropManager::instance().getDragData());
-						if(sendMouseEvent(elementInfo.widget, elementInfo.element, mMouseEvent))
+						if(sendMouseEvent(elementInfo.element, mMouseEvent))
 						{
 							event.markAsUsed();
 							break;
@@ -781,13 +802,13 @@ namespace BansheeEngine
 				bool hasCustomCursor = false;
 				for(auto& elementInfo : mElementsUnderPointer)
 				{
-					Vector2I localPos = getWidgetRelativePos(*elementInfo.widget, event.screenPos);
+					Vector2I localPos = getWidgetRelativePos(elementInfo.widget, event.screenPos);
 
 					if(!moveProcessed)
 					{
 						// Send MouseMove event
 						mMouseEvent.setMouseMoveData(localPos);
-						moveProcessed = sendMouseEvent(elementInfo.widget, elementInfo.element, mMouseEvent);
+						moveProcessed = sendMouseEvent(elementInfo.element, mMouseEvent);
 
 						if(moveProcessed)
 							event.markAsUsed();
@@ -833,7 +854,7 @@ namespace BansheeEngine
 				for(auto& elementInfo : mElementsUnderPointer)
 				{
 					mMouseEvent.setMouseWheelScrollData(event.mouseWheelScrollAmount);
-					if(sendMouseEvent(elementInfo.widget, elementInfo.element, mMouseEvent))
+					if(sendMouseEvent(elementInfo.element, mMouseEvent))
 					{
 						event.markAsUsed();
 						break;
@@ -871,10 +892,10 @@ namespace BansheeEngine
 
 				if(iterFind2 != mActiveElements.end())
 				{
-					Vector2I localPos = getWidgetRelativePos(*elementInfo.widget, event.screenPos);
+					Vector2I localPos = getWidgetRelativePos(elementInfo.widget, event.screenPos);
 					mMouseEvent.setMouseUpData(localPos, guiButton);
 
-					if(sendMouseEvent(elementInfo.widget, elementInfo.element, mMouseEvent))
+					if(sendMouseEvent(elementInfo.element, mMouseEvent))
 					{
 						event.markAsUsed();
 						break;
@@ -893,10 +914,10 @@ namespace BansheeEngine
 			{
 				for(auto& activeElement : mActiveElements)
 				{
-					Vector2I localPos = getWidgetRelativePos(*activeElement.widget, event.screenPos);
+					Vector2I localPos = getWidgetRelativePos(activeElement.widget, event.screenPos);
 
 					mMouseEvent.setMouseDragEndData(localPos);
-					if(sendMouseEvent(activeElement.widget, activeElement.element, mMouseEvent))
+					if(sendMouseEvent(activeElement.element, mMouseEvent))
 						event.markAsUsed();
 				}
 			}
@@ -940,11 +961,10 @@ namespace BansheeEngine
 			mNewActiveElements.clear();
 			for(auto& elementInfo : mElementsUnderPointer)
 			{
-				Vector2I localPos = getWidgetRelativePos(*elementInfo.widget, event.screenPos);
-
+				Vector2I localPos = getWidgetRelativePos(elementInfo.widget, event.screenPos);
 				mMouseEvent.setMouseDownData(localPos, guiButton);
 
-				bool processed = sendMouseEvent(elementInfo.widget, elementInfo.element, mMouseEvent);
+				bool processed = sendMouseEvent(elementInfo.element, mMouseEvent);
 
 				if(guiButton == GUIMouseButton::Left)
 				{
@@ -980,7 +1000,7 @@ namespace BansheeEngine
 
 			if(iterFind == mElementsInFocus.end())
 			{
-				sendCommandEvent(elementInfo.widget, elementInfo.element, mCommandEvent);
+				sendCommandEvent(elementInfo.element, mCommandEvent);
 			}
 		}
 
@@ -994,7 +1014,7 @@ namespace BansheeEngine
 
 			if(iterFind == mNewElementsInFocus.end())
 			{
-				sendCommandEvent(elementInfo.widget, elementInfo.element, mCommandEvent);
+				sendCommandEvent(elementInfo.element, mCommandEvent);
 			}
 		}
 
@@ -1010,7 +1030,7 @@ namespace BansheeEngine
 			{
 				GUIContextMenuPtr menu = elementInfo.element->_getContextMenu();
 
-				if(menu != nullptr)
+				if(menu != nullptr && elementInfo.widget != nullptr)
 				{
 					const RenderWindow* window = getWidgetWindow(*elementInfo.widget);
 					Vector2I windowPos = window->screenToWindowPos(event.screenPos);
@@ -1043,10 +1063,10 @@ namespace BansheeEngine
 		// We only check for mouse down if we are hovering over an element
 		for(auto& elementInfo : mElementsUnderPointer)
 		{
-			Vector2I localPos = getWidgetRelativePos(*elementInfo.widget, event.screenPos);
+			Vector2I localPos = getWidgetRelativePos(elementInfo.widget, event.screenPos);
 
 			mMouseEvent.setMouseDoubleClickData(localPos, guiButton);
-			if(sendMouseEvent(elementInfo.widget, elementInfo.element, mMouseEvent))
+			if(sendMouseEvent(elementInfo.element, mMouseEvent))
 			{
 				event.markAsUsed();
 				break;
@@ -1103,7 +1123,7 @@ namespace BansheeEngine
 
 		for(auto& elementInfo : mElementsInFocus)
 		{
-			sendCommandEvent(elementInfo.widget, elementInfo.element, mCommandEvent);
+			sendCommandEvent(elementInfo.element, mCommandEvent);
 		}		
 	}
 
@@ -1113,7 +1133,7 @@ namespace BansheeEngine
 		
 		for(auto& elementInFocus : mElementsInFocus)
 		{
-			bool processed = sendVirtualButtonEvent(elementInFocus.widget, elementInFocus.element, mVirtualButtonEvent);
+			bool processed = sendVirtualButtonEvent(elementInFocus.element, mVirtualButtonEvent);
 
 			if(processed)
 				break;
@@ -1184,7 +1204,7 @@ namespace BansheeEngine
 				if(widgetWindows[widgetIdx] == windowUnderPointer && widget->inBounds(windowToBridgedCoords(*widget, windowPos)))
 				{
 					const Vector<GUIElement*>& elements = widget->getElements();
-					Vector2I localPos = getWidgetRelativePos(*widget, pointerScreenPos);
+					Vector2I localPos = getWidgetRelativePos(widget, pointerScreenPos);
 
 					// Elements with lowest depth (most to the front) get handled first
 					for(auto iter = elements.begin(); iter != elements.end(); ++iter)
@@ -1243,16 +1263,14 @@ namespace BansheeEngine
 			// Send MouseOver event
 			if (mActiveElements.size() == 0 || iterFind != mActiveElements.end())
 			{
-				Vector2I localPos;
-				if (widget != nullptr)
-					localPos = getWidgetRelativePos(*widget, pointerScreenPos);
+				Vector2I localPos = getWidgetRelativePos(widget, pointerScreenPos);
 
 				mMouseEvent = GUIMouseEvent(buttonStates, shift, control, alt);
 
 				mMouseEvent.setMouseOverData(localPos);
 				elementInfo.receivedMouseOver = true;
 				elementInfo.isHovering = true;
-				if (sendMouseEvent(widget, element, mMouseEvent))
+				if (sendMouseEvent(element, mMouseEvent))
 				{
 					eventProcessed = true;
 					elementInfo.usesMouseOver = true;
@@ -1272,10 +1290,10 @@ namespace BansheeEngine
 
 				if (iterFind == mNewElementsUnderPointer.end())
 				{
-					Vector2I localPos = getWidgetRelativePos(*elementInfo.widget, pointerScreenPos);
+					Vector2I localPos = getWidgetRelativePos(elementInfo.widget, pointerScreenPos);
 
 					mMouseEvent.setDragAndDropLeftData(localPos, DragAndDropManager::instance().getDragTypeId(), DragAndDropManager::instance().getDragData());
-					if (sendMouseEvent(elementInfo.widget, elementInfo.element, mMouseEvent))
+					if (sendMouseEvent(elementInfo.element, mMouseEvent))
 					{
 						eventProcessed = true;
 						break;
@@ -1303,10 +1321,10 @@ namespace BansheeEngine
 				// Send MouseOut event
 				if(mActiveElements.size() == 0 || iterFind2 != mActiveElements.end())
 				{
-					Vector2I localPos = getWidgetRelativePos(*widget, pointerScreenPos);
+					Vector2I localPos = getWidgetRelativePos(widget, pointerScreenPos);
 
 					mMouseEvent.setMouseOutData(localPos);
-					if (sendMouseEvent(widget, element, mMouseEvent))
+					if (sendMouseEvent(element, mMouseEvent))
 					{
 						eventProcessed = true;
 						break;
@@ -1327,7 +1345,7 @@ namespace BansheeEngine
 
 		for(auto& elementInFocus : mElementsInFocus)
 		{
-			if(sendTextInputEvent(elementInFocus.widget, elementInFocus.element, mTextInputEvent))
+			if(sendTextInputEvent(elementInFocus.element, mTextInputEvent))
 				event.markAsUsed();
 		}
 	}
@@ -1357,12 +1375,12 @@ namespace BansheeEngine
 			if (focusedElement.element->_isDestroyed())
 				continue;
 
-			if(getWidgetWindow(*focusedElement.widget) == &win)
+			if (focusedElement.widget != nullptr && getWidgetWindow(*focusedElement.widget) == &win)
 			{
 				mCommandEvent = GUICommandEvent();
 				mCommandEvent.setType(GUICommandEventType::FocusLost);
 
-				sendCommandEvent(focusedElement.widget, focusedElement.element, mCommandEvent);
+				sendCommandEvent(focusedElement.element, mCommandEvent);
 			}
 			else
 				mNewElementsInFocus.push_back(focusedElement);
@@ -1387,7 +1405,7 @@ namespace BansheeEngine
 			GUIElement* element = elementInfo.element;
 			CGUIWidget* widget = elementInfo.widget;
 
-			if(widget->getTarget()->getTarget().get() != &win)
+			if (widget != nullptr && widget->getTarget()->getTarget().get() != &win)
 			{
 				mNewElementsUnderPointer.push_back(elementInfo);
 				continue;
@@ -1399,10 +1417,10 @@ namespace BansheeEngine
 			// Send MouseOut event
 			if(mActiveElements.size() == 0 || iterFind != mActiveElements.end())
 			{
-				Vector2I curLocalPos = getWidgetRelativePos(*widget, Vector2I());
+				Vector2I localPos = getWidgetRelativePos(widget, Vector2I());
 
-				mMouseEvent.setMouseOutData(curLocalPos);
-				sendMouseEvent(widget, element, mMouseEvent);
+				mMouseEvent.setMouseOutData(localPos);
+				sendMouseEvent(element, mMouseEvent);
 			}
 		}
 
@@ -1466,16 +1484,19 @@ namespace BansheeEngine
 		BS_EXCEPT(InvalidParametersException, "Provided button is not a GUI supported mouse button.");
 	}
 
-	Vector2I GUIManager::getWidgetRelativePos(const CGUIWidget& widget, const Vector2I& screenPos) const
+	Vector2I GUIManager::getWidgetRelativePos(const CGUIWidget* widget, const Vector2I& screenPos) const
 	{
-		const RenderWindow* window = getWidgetWindow(widget);
+		if (widget == nullptr)
+			return screenPos;
+
+		const RenderWindow* window = getWidgetWindow(*widget);
 		if(window == nullptr)
 			return Vector2I();
 
 		Vector2I windowPos = window->screenToWindowPos(screenPos);
-		windowPos = windowToBridgedCoords(widget, windowPos);
+		windowPos = windowToBridgedCoords(*widget, windowPos);
 
-		const Matrix4& worldTfrm = widget.SO()->getWorldTfrm();
+		const Matrix4& worldTfrm = widget->SO()->getWorldTfrm();
 
 		Vector4 vecLocalPos = worldTfrm.inverse().multiplyAffine(Vector4((float)windowPos.x, (float)windowPos.y, 0.0f, 1.0f));
 		Vector2I curLocalPos(Math::roundToInt(vecLocalPos.x), Math::roundToInt(vecLocalPos.y));
@@ -1541,36 +1562,36 @@ namespace BansheeEngine
 		return nullptr;
 	}
 
-	bool GUIManager::sendMouseEvent(CGUIWidget* widget, GUIElement* element, const GUIMouseEvent& event)
+	bool GUIManager::sendMouseEvent(GUIElement* element, const GUIMouseEvent& event)
 	{
 		if (element->_isDestroyed())
 			return false;
 
-		return widget->_mouseEvent(element, event);
+		return element->_mouseEvent(event);
 	}
 
-	bool GUIManager::sendTextInputEvent(CGUIWidget* widget, GUIElement* element, const GUITextInputEvent& event)
+	bool GUIManager::sendTextInputEvent(GUIElement* element, const GUITextInputEvent& event)
 	{
 		if (element->_isDestroyed())
 			return false;
 
-		return widget->_textInputEvent(element, event);
+		return element->_textInputEvent(event);
 	}
 
-	bool GUIManager::sendCommandEvent(CGUIWidget* widget, GUIElement* element, const GUICommandEvent& event)
+	bool GUIManager::sendCommandEvent(GUIElement* element, const GUICommandEvent& event)
 	{
 		if (element->_isDestroyed())
 			return false;
 
-		return widget->_commandEvent(element, event);
+		return element->_commandEvent(event);
 	}
 
-	bool GUIManager::sendVirtualButtonEvent(CGUIWidget* widget, GUIElement* element, const GUIVirtualButtonEvent& event)
+	bool GUIManager::sendVirtualButtonEvent(GUIElement* element, const GUIVirtualButtonEvent& event)
 	{
 		if (element->_isDestroyed())
 			return false;
 
-		return widget->_virtualButtonEvent(element, event);
+		return element->_virtualButtonEvent(event);
 	}
 
 	GUIManager& gGUIManager()

MBansheeEditor/LibraryDropTarget.cs

@@ -58,7 +58,7 @@ namespace BansheeEditor
 
         void Input_OnPointerMoved(PointerEvent ev)
         {
-            Vector2I currentWindowPos = parentWindow.ScreenToWindowPos(ev.screenPos);
+            Vector2I currentWindowPos = parentWindow.ScreenToWindowPos(ev.ScreenPos);
 
             if (isMouseDown && !isLocalDragInProgress)
             {
@@ -74,17 +74,24 @@ namespace BansheeEditor
 
         void Input_OnPointerReleased(PointerEvent ev)
         {
+            if (isLocalDragInProgress)
+                triggerEndLocalDrag = true;
+
             isLocalDragInProgress = false;
             isMouseDown = false;
             isDragInBounds = false;
-            triggerEndLocalDrag = true;
             triggerStartLocalDrag = false;
         }
 
         void Input_OnPointerPressed(PointerEvent ev)
         {
-            isMouseDown = true;
-            mouseDownScreenPos = ev.screenPos;
+            Vector2I currentWindowPos = parentWindow.ScreenToWindowPos(ev.ScreenPos);
+
+            if (Bounds.Contains(currentWindowPos))
+            {
+                isMouseDown = true;
+                mouseDownScreenPos = ev.ScreenPos;
+            }
         }
 
         public void Update()

MBansheeEditor/LibraryWindow.cs

@@ -185,6 +185,8 @@ namespace BansheeEditor
 
         private void DoOnDragStart(Vector2I windowPos)
         {
+            Debug.Log("DRAG STARTED + " + windowPos + " - " + GUI.Bounds);
+
             ElementEntry underCursorElem = FindElementAt(windowPos);
             if (underCursorElem == null)
             {
@@ -1433,7 +1435,10 @@ namespace BansheeEditor
                         elementsPerRow = (availableWidth - GRID_ENTRY_SPACING * 2) / elemSize;
                     }
 
-                    labelWidth = (availableWidth - (elementsPerRow + 1) * MIN_HORZ_SPACING) / elementsPerRow;
+                    if (elementsPerRow > 0)
+                        labelWidth = (availableWidth - (elementsPerRow + 1)*MIN_HORZ_SPACING)/elementsPerRow;
+                    else
+                        labelWidth = 0;
                 }
 
                 this.window = window;

MBansheeEngine/Input.cs

@@ -57,15 +57,15 @@ namespace BansheeEngine
             _mouseWheelScrollAmount = mouseWheelScrollAmount;
         }
 
-        public Vector2I screenPos { get { return _screenPos; } }
-        public Vector2I delta { get { return _delta; } }
-        public PointerButton button { get { return _button; } }
+        public Vector2I ScreenPos { get { return _screenPos; } }
+        public Vector2I Delta { get { return _delta; } }
+        public PointerButton Button { get { return _button; } }
 
-        public bool shift { get { return _shift; } }
-        public bool control { get { return _control; } }
-        public bool alt { get { return _alt; } }
+        public bool Shift { get { return _shift; } }
+        public bool Control { get { return _control; } }
+        public bool Alt { get { return _alt; } }
 
-        public float scrollAmount { get { return _mouseWheelScrollAmount; } }
+        public float ScrollAmount { get { return _mouseWheelScrollAmount; } }
     }
 
     public struct TextInputEvent

TODO.txt

@@ -63,7 +63,6 @@ Move data folder within current repo
  - Finally test if opening/creating a project while another one is open is possible
 
 Ribek use:
- - Crash on shutdown due to RenderStateCoreManager getting shut down before all states are freed
  - When mousing over GUIMenu elements cursor changes if underlying GUI element changes
  - Hook up color picker to guicolor field
  - When starting drag from hierarchy tree view it tends to select another object (can't repro)