소스 검색

Fixed a bug in Project Window where vert & horz scrollbars would appear when not needed

Marko Pintera 10 년 전
부모
커밋
93b17b4f0f
2개의 변경된 파일6개의 추가작업 그리고 3개의 파일을 삭제
  1. 6 2
      MBansheeEditor/ProjectWindow.cs
  2. 0 1
      TODO.txt

+ 6 - 2
MBansheeEditor/ProjectWindow.cs

@@ -1047,6 +1047,8 @@ namespace BansheeEditor
 
 
             contentInfo.underlay.AddElement(catchAll);
             contentInfo.underlay.AddElement(catchAll);
 
 
+            Debug.Log(contentBounds);
+
             UpdateDragSelection(dragSelectionEnd);
             UpdateDragSelection(dragSelectionEnd);
         }
         }
 
 
@@ -1354,9 +1356,11 @@ namespace BansheeEditor
         private Rect2I GetScrollAreaBounds()
         private Rect2I GetScrollAreaBounds()
         {
         {
             Rect2I bounds = GUI.Bounds;
             Rect2I bounds = GUI.Bounds;
+            Rect2I folderListBounds = folderListLayout.Bounds;
             Rect2I searchBarBounds = searchBarLayout.Bounds;
             Rect2I searchBarBounds = searchBarLayout.Bounds;
-            bounds.y += searchBarBounds.height;
-            bounds.height -= searchBarBounds.height;
+
+            bounds.y += folderListBounds.height + searchBarBounds.height;
+            bounds.height -= folderListBounds.height + searchBarBounds.height;
 
 
             return bounds;
             return bounds;
         }
         }

+ 0 - 1
TODO.txt

@@ -34,7 +34,6 @@ Test:
  - Cut/Copy/Paste/Duplicate
  - Cut/Copy/Paste/Duplicate
 
 
 Later:
 Later:
- - Drag to select multiple entries?
  - Hook up ping effect so it triggers when I select a resource or sceneobject
  - Hook up ping effect so it triggers when I select a resource or sceneobject
   - Add ping to SceneTreeView
   - Add ping to SceneTreeView
  - Consider delaying search until user stops pressing keys
  - Consider delaying search until user stops pressing keys