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