Removed non-client area button presses - When working with caption non-client mouse release events were not received, causing issues with the GUI system

BansheeCore/Source/Win32/BsWin32Platform.cpp

@@ -867,7 +867,6 @@ namespace BansheeEngine
 					onMouseLeftWindow(win);
 			}
 			return 0;
-		case WM_NCLBUTTONUP:
 		case WM_LBUTTONUP:
 			{
 				ReleaseCapture();
@@ -875,17 +874,13 @@ namespace BansheeEngine
 				Vector2I intMousePos;
 				OSPointerButtonStates btnStates;
 
-				getMouseData(hWnd, wParam, lParam, uMsg == WM_NCLBUTTONUP, intMousePos, btnStates);
+				getMouseData(hWnd, wParam, lParam, false, intMousePos, btnStates);
 
 				if(!onCursorButtonReleased.empty())
 					onCursorButtonReleased(intMousePos, OSMouseButton::Left, btnStates);
 
-				if (uMsg == WM_LBUTTONUP)
-					return 0;
-				else
-					break;
+				return 0;
 			}
-		case WM_NCMBUTTONUP:
 		case WM_MBUTTONUP:
 			{
 				ReleaseCapture();
@@ -893,17 +888,13 @@ namespace BansheeEngine
 				Vector2I intMousePos;
 				OSPointerButtonStates btnStates;
 
-				getMouseData(hWnd, wParam, lParam, uMsg == WM_NCMBUTTONUP, intMousePos, btnStates);
+				getMouseData(hWnd, wParam, lParam, false, intMousePos, btnStates);
 
 				if(!onCursorButtonReleased.empty())
 					onCursorButtonReleased(intMousePos, OSMouseButton::Middle, btnStates);
 
-				if (uMsg == WM_MBUTTONUP)
-					return 0;
-				else
-					break;
+				return 0;
 			}
-		case WM_NCRBUTTONUP:
 		case WM_RBUTTONUP:
 			{
 				ReleaseCapture();
@@ -911,27 +902,13 @@ namespace BansheeEngine
 				Vector2I intMousePos;
 				OSPointerButtonStates btnStates;
 
-				getMouseData(hWnd, wParam, lParam, uMsg == WM_NCRBUTTONUP, intMousePos, btnStates);
+				getMouseData(hWnd, wParam, lParam, false, intMousePos, btnStates);
 
 				if(!onCursorButtonReleased.empty())
 					onCursorButtonReleased(intMousePos, OSMouseButton::Right, btnStates);
 
-				if (uMsg == WM_RBUTTONUP)
-					return 0;
-				else
-					break;
-			}
-		case WM_NCLBUTTONDOWN:
-			{
-				Vector2I intMousePos;
-				OSPointerButtonStates btnStates;
-
-				getMouseData(hWnd, wParam, lParam, true, intMousePos, btnStates);
-
-				if (!onCursorButtonPressed.empty())
-					onCursorButtonPressed(intMousePos, OSMouseButton::Left, btnStates);
+				return 0;
 			}
-			break;
 		case WM_LBUTTONDOWN:
 			{
 				SetCapture(hWnd);
@@ -945,17 +922,6 @@ namespace BansheeEngine
 					onCursorButtonPressed(intMousePos, OSMouseButton::Left, btnStates);
 			}
 			return 0;
-		case WM_NCMBUTTONDOWN:
-			{
-				Vector2I intMousePos;
-				OSPointerButtonStates btnStates;
-
-				getMouseData(hWnd, wParam, lParam, true, intMousePos, btnStates);
-
-				if (!onCursorButtonPressed.empty())
-					onCursorButtonPressed(intMousePos, OSMouseButton::Middle, btnStates);
-			}
-			break;
 		case WM_MBUTTONDOWN:
 			{
 				SetCapture(hWnd);
@@ -969,17 +935,6 @@ namespace BansheeEngine
 					onCursorButtonPressed(intMousePos, OSMouseButton::Middle, btnStates);
 			}
 			return 0;
-		case WM_NCRBUTTONDOWN:
-			{
-				Vector2I intMousePos;
-				OSPointerButtonStates btnStates;
-
-				getMouseData(hWnd, wParam, lParam, true, intMousePos, btnStates);
-
-				if (!onCursorButtonPressed.empty())
-					onCursorButtonPressed(intMousePos, OSMouseButton::Right, btnStates);
-			}
-			break;
 		case WM_RBUTTONDOWN:
 			{
 				SetCapture(hWnd);

BansheeEditor/Source/BsGUIMenuBar.cpp

@@ -199,7 +199,7 @@ namespace BansheeEngine
 		newSubMenu.name = name;
 		newSubMenu.menu = bs_new<GUIMenu>();
 
-		GUIButton* newButton = GUIButton::create(HString(name), "MenuBarBtn");
+		GUIButton* newButton = GUIButton::create(HString(name), getMenuItemButtonStyleType());
 		newButton->onClick.connect(std::bind(&GUIMenuBar::openSubMenu, this, name));
 		newButton->onHover.connect(std::bind(&GUIMenuBar::onSubMenuHover, this, name));
 

BansheeEngine/Source/BsGUIManager.cpp

@@ -1241,7 +1241,6 @@ namespace BansheeEngine
 		});
 
 		// Send MouseOut and MouseOver events
-
 		bool eventProcessed = false;
 
 		for (auto& elementInfo : mNewElementsUnderPointer)