xtink4/crosspoint-reader
0
0
Fork 0
mirror of https://github.com/crosspoint-reader/crosspoint-reader.git synced 2026-04-29 10:26:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

Correct CSS vertical margin merging

Browse Source
This commit is contained in:
Zach Nelson
2026-04-16 00:46:22 -05:00
parent ea55e6ec47
commit 86706e061c
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Epub/Epub/blocks/BlockStyle.h
+6 -4
View File
@@ -1,5 +1,6 @@
#pragma once
#include <algorithm>
#include <cstdint>
#include "Epub/css/CssStyle.h"
@@ -38,10 +39,11 @@ struct BlockStyle {
return result;
}
// Return a copy with the source's bottom margins/padding added to this style's.
// Return a copy with bottom margins/padding collapsed (max) with the source's.
// Uses CSS margin collapsing: adjacent parent-child margins resolve to the larger value.
[[nodiscard]] BlockStyle addBottom(const BlockStyle& source) const {
BlockStyle result = *this;
result.marginBottom = static_cast<int16_t>(marginBottom + source.marginBottom);
result.marginBottom = std::max(marginBottom, source.marginBottom);
result.paddingBottom = static_cast<int16_t>(paddingBottom + source.paddingBottom);
return result;
}
@@ -70,8 +72,8 @@ struct BlockStyle {
result.textAlignDefined = true;
}
} else {
result.marginTop = static_cast<int16_t>(child.marginTop + marginTop);
result.marginBottom = static_cast<int16_t>(child.marginBottom + marginBottom);
result.marginTop = std::max(child.marginTop, marginTop);
result.marginBottom = std::max(child.marginBottom, marginBottom);
result.paddingTop = static_cast<int16_t>(child.paddingTop + paddingTop);
result.paddingBottom = static_cast<int16_t>(child.paddingBottom + paddingBottom);
}