Browse Source

Revert "Fixed height in the same manner as the width fix for elements with precalculated height, like form elements."

This reverts commit ccc0fb784a9dcdbb8f312dfb528cb7ca46a8d340.
Lloyd Weehuizen 13 years ago
parent
commit
e4e35809db
1 changed files with 1 additions and 5 deletions
  1. 1 5
      Source/Core/LayoutEngine.cpp

+ 1 - 5
Source/Core/LayoutEngine.cpp

@@ -584,12 +584,8 @@ void LayoutEngine::BuildBoxHeight(Box& box, Element* element, float containing_b
 
 	// Determine if the element has an automatic height, and if not calculate it.
 	bool height_auto;
-	int display_property = element->GetProperty< int >(DISPLAY);
-
-	if (display_property == DISPLAY_INLINE_BLOCK)
-	{
+	if (content_area.y >= 0)
 		height_auto = false;
-	}
 	else
 	{
 		const Property* height_property = element->GetProperty(HEIGHT);