浏览代码

Inline-box fix max-width min-width

Michael 7 年之前
父节点
当前提交
a2f38415ba
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      Source/Core/LayoutBlockBox.cpp

+ 2 - 2
Source/Core/LayoutBlockBox.cpp

@@ -560,12 +560,12 @@ Vector2f LayoutBlockBox::InternalContentSize() const
 			if (min_width)
 			if (min_width)
 			{
 			{
 				float value = element->ResolveProperty(min_width, block_width);
 				float value = element->ResolveProperty(min_width, block_width);
-				content_box.x = Math::Min(content_box.x, value);
+				content_box.x = Math::Max(content_box.x, value);
 			}
 			}
 			if (max_width)
 			if (max_width)
 			{
 			{
 				float value = element->ResolveProperty(max_width, block_width);
 				float value = element->ResolveProperty(max_width, block_width);
-				content_box.x = Math::Max(content_box.x, value);
+				content_box.x = Math::Min(content_box.x, value);
 			}
 			}
 		}
 		}