Hovering over GUI menu bar items will now properly open the sub-menus if menu bar is active

BansheeEngine/Source/BsGUIDropDownMenu.cpp

@@ -98,8 +98,12 @@ namespace BansheeEngine
 		mBackHitBox->_changeParentWidget(this);
 		mBackHitBox->_markContentAsDirty();
 
+		Rect2I targetBounds(0, 0, desc.target->getWidth(), desc.target->getHeight());
+		Vector<Rect2I> captureBounds;
+		targetBounds.cut(desc.additionalBounds, captureBounds);
+
 		mCaptureHitBox = GUIDropDownHitBox::create(true, false);
-		mCaptureHitBox->setBounds(Rect2I(0, 0, desc.target->getWidth(), desc.target->getHeight()));
+		mCaptureHitBox->setBounds(captureBounds);
 		GUILayoutData captureHitboxLayoutData = mCaptureHitBox->_getLayoutData();
 		captureHitboxLayoutData.setWidgetDepth(0);
 		captureHitboxLayoutData.setPanelDepth(std::numeric_limits<INT16>::max());

BansheeUtility/Include/BsRect2I.h

@@ -40,6 +40,20 @@ namespace BansheeEngine
 		 */
 		void clip(const Rect2I& clipRect);
 
+		/**
+		 * @brief	Cuts the current rectangle with the provided rectangle and outputs
+		 *			the pieces. The pieces will contain all area of the current rectangle
+		 *			without including the cut rectangle area.
+		 */
+		void cut(const Rect2I& cutRect, Vector<Rect2I>& pieces);
+
+		/**
+		 * @brief	Cuts the current rectangle with the provided rectangles and outputs
+		 *			the pieces. The pieces will contain all area of the current rectangle
+		 *			without including the cut rectangles area.
+		 */
+		void cut(const Vector<Rect2I>& cutRects, Vector<Rect2I>& pieces);
+
 		/**
 		 * @brief	Transforms the bounds by the given matrix.
 		 * 			Resulting value is an axis aligned rectangle encompassing the transformed points.

BansheeUtility/Source/BsRect2I.cpp

@@ -79,6 +79,96 @@ namespace BansheeEngine
 		height = std::max(0, newBottom - newTop);
 	}
 
+	void Rect2I::cut(const Rect2I& cutRect, Vector<Rect2I>& pieces)
+	{
+		UINT32 initialPieces = (UINT32)pieces.size();
+
+		// Cut horizontal
+		if (cutRect.x > x && cutRect.x < (x + width))
+		{
+			Rect2I leftPiece;
+			leftPiece.x = x;
+			leftPiece.width = cutRect.x - x;
+			leftPiece.y = y;
+			leftPiece.height = height;
+
+			pieces.push_back(leftPiece);
+		}
+
+		if ((cutRect.x + cutRect.width) > x && (cutRect.x + cutRect.width) < (x + width))
+		{
+			Rect2I rightPiece;
+			rightPiece.x = cutRect.x + cutRect.width;
+			rightPiece.width = (x + width) - (cutRect.x + cutRect.width);
+			rightPiece.y = y;
+			rightPiece.height = height;
+
+			pieces.push_back(rightPiece);
+		}
+
+		// Cut vertical
+		INT32 cutLeft = std::min(std::max(x, cutRect.x), x + width);
+		INT32 cutRight = std::max(std::min(x + width, cutRect.x + cutRect.width), x);
+
+		if (cutLeft != cutRight)
+		{
+			if (cutRect.y > y && cutRect.y < (y + height))
+			{
+				Rect2I topPiece;
+				topPiece.y = y;
+				topPiece.height = cutRect.y - y;
+				topPiece.x = cutLeft;
+				topPiece.width = cutRight - cutLeft;
+
+				pieces.push_back(topPiece);
+			}
+
+			if ((cutRect.y + cutRect.height) > y && (cutRect.y + cutRect.height) < (y + height))
+			{
+				Rect2I bottomPiece;
+				bottomPiece.y = cutRect.y + cutRect.height;
+				bottomPiece.height = (y + height) - (cutRect.y + cutRect.height);
+				bottomPiece.x = cutLeft;
+				bottomPiece.width = cutRight - cutLeft;
+
+				pieces.push_back(bottomPiece);
+			}
+		}
+
+		// No cut
+		if (initialPieces == (UINT32)pieces.size())
+		{
+			if (cutRect.x <= x && (cutRect.x + cutRect.width) >= (x + width) &&
+				cutRect.y <= y && (cutRect.y + cutRect.height) >= (y + height))
+			{
+				// Cut rectangle completely encompasses this one
+			}
+			else
+				pieces.push_back(*this); // Cut rectangle doesn't even touch this one
+		}
+	}
+
+	void Rect2I::cut(const Vector<Rect2I>& cutRects, Vector<Rect2I>& pieces)
+	{
+		Vector<Rect2I> tempPieces[2];
+		UINT32 bufferIdx = 0;
+
+		tempPieces[0].push_back(*this);
+
+		for (auto& cutRect : cutRects)
+		{
+			UINT32 currentBufferIdx = bufferIdx;
+
+			bufferIdx = (bufferIdx + 1) % 2;
+			tempPieces[bufferIdx].clear();
+
+			for (auto& rect : tempPieces[currentBufferIdx])
+				rect.cut(cutRect, tempPieces[bufferIdx]);
+		}
+
+		pieces = tempPieces[bufferIdx];
+	}
+
 	void Rect2I::transform(const Matrix4& matrix)
 	{
 		Vector4 verts[4];