diff options
author | Yuri Kobets <yuri.kobets@gmail.com> | 2024-01-07 01:33:36 +0300 |
---|---|---|
committer | Yuri Kobets <yuri.kobets@gmail.com> | 2024-01-07 01:33:36 +0300 |
commit | d5354e69f1bb420213d9c2b7680aedaf7c7ad98e (patch) | |
tree | fc527436fc5c5f1be6e950d1c76ba6fbc69a13cf | |
parent | 2289e1be28a001c96f92468516f3c8b3fa86bf62 (diff) |
flex: fixed the height calc in size_mode_content mode
-rw-r--r-- | src/render_block.cpp | 2 | ||||
-rw-r--r-- | test/render/flex/--flexbox-abspos-child-001b.htm (renamed from test/render/flex/flexbox-abspos-child-001b.htm) | 0 | ||||
-rw-r--r-- | test/render/flex/flex-flow-007.htm (renamed from test/render/flex/--flex-flow-007.htm) | 0 | ||||
-rw-r--r-- | test/render/flex/flex-flow-007.htm.png | bin | 0 -> 922 bytes | |||
-rw-r--r-- | test/render/flex/flex-flow-010.htm (renamed from test/render/flex/--flex-flow-010.htm) | 0 | ||||
-rw-r--r-- | test/render/flex/flex-flow-010.htm.png | bin | 0 -> 922 bytes |
6 files changed, 1 insertions, 1 deletions
diff --git a/src/render_block.cpp b/src/render_block.cpp index 84289ae7..33339523 100644 --- a/src/render_block.cpp +++ b/src/render_block.cpp @@ -285,7 +285,7 @@ int litehtml::render_item_block::_render(int x, int y, const containing_block_co { if(self_size.height.type == containing_block_context::cbc_value_type_absolute) { - if(self_size.height > m_pos.height) + if(m_pos.height > self_size.height) { m_pos.height = self_size.height; } diff --git a/test/render/flex/flexbox-abspos-child-001b.htm b/test/render/flex/--flexbox-abspos-child-001b.htm index f216dc2e..f216dc2e 100644 --- a/test/render/flex/flexbox-abspos-child-001b.htm +++ b/test/render/flex/--flexbox-abspos-child-001b.htm diff --git a/test/render/flex/--flex-flow-007.htm b/test/render/flex/flex-flow-007.htm index 55487def..55487def 100644 --- a/test/render/flex/--flex-flow-007.htm +++ b/test/render/flex/flex-flow-007.htm diff --git a/test/render/flex/flex-flow-007.htm.png b/test/render/flex/flex-flow-007.htm.png Binary files differnew file mode 100644 index 00000000..0b9ed1f4 --- /dev/null +++ b/test/render/flex/flex-flow-007.htm.png diff --git a/test/render/flex/--flex-flow-010.htm b/test/render/flex/flex-flow-010.htm index 3d46f868..3d46f868 100644 --- a/test/render/flex/--flex-flow-010.htm +++ b/test/render/flex/flex-flow-010.htm diff --git a/test/render/flex/flex-flow-010.htm.png b/test/render/flex/flex-flow-010.htm.png Binary files differnew file mode 100644 index 00000000..0b9ed1f4 --- /dev/null +++ b/test/render/flex/flex-flow-010.htm.png |