Fix for #234

Author: Sander van Rossen

RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/View/GUI/EditModeGUI/EditModeSelection.GUI.cs

@@ -11,7 +11,6 @@ internal sealed partial class EditModeSelectionGUI
 	{
 		static int SceneViewBrushEditorOverlayHash = "SceneViewBrushEditorOverlay".GetHashCode();
 
-		static GUI.WindowFunction windowFunction = new GUI.WindowFunction(EditModeSelectionGUI.HandleSceneGUI);
 
 		public static float OnEditModeSelectionGUI()
 		{			
@@ -32,6 +31,7 @@ public static float OnEditModeSelectionGUI()
 		}
 
 		static GUIStyle sceneViewOverlayTransparentBackground = "SceneViewOverlayTransparentBackground";
+		static GUI.WindowFunction windowFunction = new GUI.WindowFunction(EditModeSelectionGUI.HandleSceneGUI);
 
 		public static void HandleWindowGUI(Rect windowRect)
 		{

RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/View/GUI/EditModeGUI/EditModes/EditMode.Surface.GUI.cs

@@ -1053,6 +1053,7 @@ public static void OnSceneGUI(Rect windowRect, EditModeSurface tool)
 				boxArea.width		 += scrollbarWidth;
 			}
 			GUI.Box(boxArea, ContentSurfacesLabel, windowStyle);
+			int windowControlID = GUIUtility.GetControlID(SceneViewSurfaceOverlayHash, FocusType.Keyboard, boxArea);
 			{
 				currentArea.x += 5;
 				currentArea.width += 2;
@@ -1086,13 +1087,12 @@ public static void OnSceneGUI(Rect windowRect, EditModeSurface tool)
 				EditModeToolWindowSceneGUI.GetWindow();
 
 			TooltipUtility.SetToolTip(CSG_GUIStyleUtility.PopOutTooltip, buttonArea);
-			int controlID = GUIUtility.GetControlID(SceneViewSurfaceOverlayHash, FocusType.Keyboard, boxArea);
-			switch (Event.current.GetTypeForControl(controlID))
+			switch (Event.current.GetTypeForControl(windowControlID))
 			{
-				case EventType.MouseDown:	{ if (boxArea.Contains(Event.current.mousePosition)) { GUIUtility.hotControl = controlID; GUIUtility.keyboardControl = controlID; Event.current.Use(); } break; }
+				case EventType.MouseDown:	{ if (boxArea.Contains(Event.current.mousePosition)) { GUIUtility.hotControl = windowControlID; GUIUtility.keyboardControl = windowControlID; Event.current.Use(); } break; }
 				case EventType.MouseMove:	{ if (boxArea.Contains(Event.current.mousePosition)) { Event.current.Use(); } break; }
-				case EventType.MouseUp:		{ if (GUIUtility.hotControl == controlID) { GUIUtility.hotControl = 0; GUIUtility.keyboardControl = 0; Event.current.Use(); } break; }
-				case EventType.MouseDrag:	{ if (GUIUtility.hotControl == controlID) { Event.current.Use(); } break; }
+				case EventType.MouseUp:		{ if (GUIUtility.hotControl == windowControlID) { GUIUtility.hotControl = 0; GUIUtility.keyboardControl = 0; Event.current.Use(); } break; }
+				case EventType.MouseDrag:	{ if (GUIUtility.hotControl == windowControlID) { Event.current.Use(); } break; }
 				case EventType.ScrollWheel: { if (boxArea.Contains(Event.current.mousePosition)) { Event.current.Use(); } break; }
 			}
 		}

RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/View/GUI/EditModeGUI/EditModes/EditMode.Surface.cs

@@ -947,6 +947,7 @@ void CreateControlIDs()
 
         [NonSerialized] Vector2 prevMousePos;
 
+        bool clickedInScene = false;
 
         public void HandleEvents(SceneView sceneView, Rect sceneRect)
         {
@@ -969,27 +970,40 @@ public void HandleEvents(SceneView sceneView, Rect sceneRect)
 
                 switch (Event.current.type)
                 {
-                    //case EventType.MouseDown:
+                    case EventType.MouseDown:
+                    {
+                        clickedInScene = false;
+                        if (!sceneRect.Contains(Event.current.mousePosition))
+                            break;
+
+                        var guiArea = GetLastSceneGUIRect();
+                        if (guiArea.Contains(Event.current.mousePosition))
+                            break;
+
+                        clickedInScene = true;
+                        break;
+                    }
                     case EventType.MouseUp:
                     case EventType.MouseDrag:
                     {
-                        if (Event.current.button != 0 ||
+                        if (!clickedInScene ||
+                            Event.current.button != 0 ||
                             GUIUtility.hotControl != 0)
                             break;
-                        
+
                         if (!sceneRect.Contains(Event.current.mousePosition))
                             break;
 
                         var guiArea = GetLastSceneGUIRect();
-                        GameObject gameObject = null;
                         if (guiArea.Contains(Event.current.mousePosition))
                             break;
 
+                        GameObject gameObject = null;
                         if (SceneQueryUtility.FindUnityWorldIntersection(camera, Event.current.mousePosition, out gameObject))
                         {
                             if (gameObject == null &&
                                 Event.current.type == EventType.MouseUp)
-                            {
+                            { 
                                 SelectionUtility.DeselectAll();
                             } else
                                 SelectionUtility.DoSelectionClick(sceneView);