Browse Source

Properly mark mouse move events as used in GUI manager, so that cursor doesn't change in response to elements underneath the top element

BearishSun 10 years ago
parent
commit
c3b12ec0e3
2 changed files with 2 additions and 6 deletions
  1. 2 2
      BansheeEngine/Source/BsGUIManager.cpp
  2. 0 4
      TODO.txt

+ 2 - 2
BansheeEngine/Source/BsGUIManager.cpp

@@ -815,7 +815,7 @@ namespace BansheeEngine
 							event.markAsUsed();
 					}
 
-					if (!hasCustomCursor && mDragState == DragState::NoDrag)
+					if (mDragState == DragState::NoDrag)
 					{
 						CursorType newCursor = CursorType::Arrow;
 						if(elementInfo.element->_hasCustomCursor(localPos, newCursor))
@@ -830,7 +830,7 @@ namespace BansheeEngine
 						}
 					}
 
-					if(moveProcessed && hasCustomCursor)
+					if(moveProcessed)
 						break;
 				}
 

+ 0 - 4
TODO.txt

@@ -55,11 +55,7 @@ Polish
 Open a project window and closing it, then attempting shutdown causes a crash when destroying a ScriptGUILayout
  - Likely due to clearScene() deleting all GUIWidgets and their related elements before managed elements were destroyed
 
-Newly created project has invalid layout
- - Potentially original project's layout is also corrupted
-
 Ribek use:
- - 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)
  - UseCustomInspector isn't implemented