Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix area line margin-top of first line after page break (#1443) #1449

Merged
merged 2 commits into from
Oct 14, 2023
Merged

Fix area line margin-top of first line after page break (#1443) #1449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be51a8e
Fix area line margin-top of first line after page break (#1443)
speckyspooky Oct 12, 2023
40a8501
Remove debug comment
speckyspooky Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions ....birt.report.engine/src/org/eclipse/birt/report/engine/nLayout/area/impl/AreaFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,6 @@ protected AbstractArea createNewArea(ContainerArea parent, LayoutContext context
} else {
area = new BlockContainerArea(parent, context, content);
}
if (context.isFixedLayout()) {
area.setPageBreakInside(IStyle.AVOID_VALUE);
}
return area;

case IContent.IMAGE_CONTENT:
Expand Down
66 changes: 33 additions & 33 deletions ...eport.engine/src/org/eclipse/birt/report/engine/nLayout/area/impl/BlockContainerArea.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,45 +290,45 @@ protected SplitResult _split(int height, boolean force) throws BirtException {
result.add(current);
continue;
}
contentHeight -= ah;
int childSplitHeight = cheight - contentHeight;
SplitResult splitResult = current.split(childSplitHeight, force && !isValidResult(result));
if (splitResult.status == SplitResult.SPLIT_SUCCEED_WITH_PART) {
ContainerArea splitChildArea = splitResult.getResult();
result.add(splitChildArea);
status = SplitResult.SPLIT_SUCCEED_WITH_PART;
contentHeight += splitChildArea.getAllocatedHeight();
break;
} else if (splitResult.status == SplitResult.SPLIT_BEFORE_AVOID_WITH_NULL) {
if (force) {
if (result.size() > 0) {
status = SplitResult.SPLIT_SUCCEED_WITH_PART;
}
contentHeight -= ah;
int childSplitHeight = cheight - contentHeight;
SplitResult splitResult = current.split(childSplitHeight, force && !isValidResult(result));
if (splitResult.status == SplitResult.SPLIT_SUCCEED_WITH_PART) {
ContainerArea splitChildArea = splitResult.getResult();
result.add(splitChildArea);
status = SplitResult.SPLIT_SUCCEED_WITH_PART;
contentHeight += splitChildArea.getAllocatedHeight();
break;
} else if (splitResult.status == SplitResult.SPLIT_BEFORE_AVOID_WITH_NULL) {
if (force) {
if (result.size() > 0) {
status = SplitResult.SPLIT_SUCCEED_WITH_PART;
}
break;
} else if (splitResult.status == SplitResult.SPLIT_SUCCEED_WITH_NULL) {
if (isValidResult(result)) {
if (force) {
status = SplitResult.SPLIT_SUCCEED_WITH_PART;
break;
}
if (previous.isPageBreakAfterAvoid()) {
status = SplitResult.SPLIT_BEFORE_AVOID_WITH_NULL;
break;
}
}
break;
} else if (splitResult.status == SplitResult.SPLIT_SUCCEED_WITH_NULL) {
if (isValidResult(result)) {
if (force) {
status = SplitResult.SPLIT_SUCCEED_WITH_PART;
break;
} else if (force) {
// error status
status = SplitResult.SPLIT_SUCCEED_WITH_PART;
}
if (previous.isPageBreakAfterAvoid()) {
status = SplitResult.SPLIT_BEFORE_AVOID_WITH_NULL;
break;
} else {
if (isPageBreakBeforeAvoid()) {
return SplitResult.BEFORE_AVOID_WITH_NULL;
}
return SplitResult.SUCCEED_WITH_NULL;
}
status = SplitResult.SPLIT_SUCCEED_WITH_PART;
break;
} else if (force) {
// error status
status = SplitResult.SPLIT_SUCCEED_WITH_PART;
break;
} else {
if (isPageBreakBeforeAvoid()) {
return SplitResult.BEFORE_AVOID_WITH_NULL;
}
return SplitResult.SUCCEED_WITH_NULL;
}
}
}
// split height is larger than content height.(cell)
if (result.size() == children.size()) {
Expand Down
4 changes: 3 additions & 1 deletion ...irt.report.engine/src/org/eclipse/birt/report/engine/nLayout/area/impl/ContainerArea.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,9 @@ public void setAllocatedHeight(int aHeight) {
}

/**
* Get content height
* Get content height, that is the height available for the content.
*
* This is computed as allocatedHeight minus bottom/top margin/border/padding. *
*
* @param allocatedHeight
* @return Return the content height
Expand Down
7 changes: 7 additions & 0 deletions ...pse.birt.report.engine/src/org/eclipse/birt/report/engine/nLayout/area/impl/LineArea.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,13 @@ public SplitResult split(int height, boolean force) throws BirtException {
result.addChild(splitChildArea);
splitChildArea.setParent(result);
} else {
// reset the line height due to negative height caused by page break.
// Otherwise the first line could be rendered too far down.
// See (old) BIRT bug 562873 and
// https://github.com/eclipse-birt/birt/issues/1443.
if (height < 0) {
height = 0;
}
child.setY(Math.max(0, child.getY() - height));
}
}
Expand Down
Loading