Pārlūkot izejas kodu

Calculate position of GUI space elements so their contribution is properly accounted for when calculating GUILayout size (useful for padding)

BearishSun 9 gadi atpakaļ
vecāks
revīzija
534215532f

+ 1 - 1
Source/BansheeEngine/Source/BsGUILayoutX.cpp

@@ -374,7 +374,7 @@ namespace BansheeEngine
 				elementAreas[childIdx].x = layoutArea.x + xOffset;
 				elementAreas[childIdx].x = layoutArea.x + xOffset;
 				elementAreas[childIdx].y = layoutArea.y + yOffset;
 				elementAreas[childIdx].y = layoutArea.y + yOffset;
 			}
 			}
-			else if (child->_getType() == GUIElementBase::Type::Layout || child->_getType() == GUIElementBase::Type::Panel)
+			else
 			{
 			{
 				elementAreas[childIdx].x = layoutArea.x + xOffset;
 				elementAreas[childIdx].x = layoutArea.x + xOffset;
 				elementAreas[childIdx].y = layoutArea.y;
 				elementAreas[childIdx].y = layoutArea.y;

+ 1 - 1
Source/BansheeEngine/Source/BsGUILayoutY.cpp

@@ -381,7 +381,7 @@ namespace BansheeEngine
 				elementAreas[childIdx].x = layoutArea.x + xOffset;
 				elementAreas[childIdx].x = layoutArea.x + xOffset;
 				elementAreas[childIdx].y = layoutArea.y + yOffset;
 				elementAreas[childIdx].y = layoutArea.y + yOffset;
 			}
 			}
-			else if (child->_getType() == GUIElementBase::Type::Layout || child->_getType() == GUIElementBase::Type::Panel)
+			else
 			{
 			{
 				elementAreas[childIdx].x = layoutArea.x;
 				elementAreas[childIdx].x = layoutArea.x;
 				elementAreas[childIdx].y = layoutArea.y + yOffset;
 				elementAreas[childIdx].y = layoutArea.y + yOffset;