Skip to content

Commit b0e3fa1

Browse files
committed
Fix some minor min/max width algo issues. Update some cmps.
Do not overwrite max-width with min-width if it wasn't set explicitly. Fix minor typo in autolayout algorithm. DEVSIX-1947
1 parent d0f1e78 commit b0e3fa1

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

layout/src/main/java/com/itextpdf/layout/renderer/BlockRenderer.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -899,12 +899,15 @@ protected MinMaxWidth getMinMaxWidth() {
899899
}
900900
if (minWidth != null) {
901901
minMaxWidth.setChildrenMinWidth((float) minWidth);
902+
902903
}
904+
// if max-width was defined explicitly, it shouldn't be overwritten
903905
if (maxWidth != null) {
904906
minMaxWidth.setChildrenMaxWidth((float) maxWidth);
905-
}
906-
if (minMaxWidth.getChildrenMinWidth() > minMaxWidth.getChildrenMaxWidth()) {
907-
minMaxWidth.setChildrenMaxWidth(minMaxWidth.getChildrenMaxWidth());
907+
} else {
908+
if (minMaxWidth.getChildrenMinWidth() > minMaxWidth.getChildrenMaxWidth()) {
909+
minMaxWidth.setChildrenMaxWidth(minMaxWidth.getChildrenMinWidth());
910+
}
908911
}
909912
}
910913

0 commit comments

Comments
 (0)