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

Add margin handling to the element "Label" (#1895) #1896

Merged
merged 1 commit into from
Sep 6, 2024
+33 −8
Merged

Add margin handling to the element "Label" (#1895) #1896

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 33 additions & 8 deletions ...er.wpml/src/org/eclipse/birt/report/engine/emitter/wpml/writer/AbstractWordXmlWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ public void startParagraph(IStyle style, boolean isInline, int paragraphWidth) {
}

/**
* Used only in inline text .The text align style of inline text is ignored,but
* Used only in inline text .The text align style of inline text is ignored, but
* its parent text align should be applied.
*
* @param style
Expand Down Expand Up @@ -614,7 +614,22 @@ private void writeSpacing(CSSValue height) {
private void writeSpacing(CSSValue top, CSSValue bottom) {
float topSpacingValue = PropertyUtil.getDimensionValue(top);
float bottomSpacingValue = PropertyUtil.getDimensionValue(bottom);
writeSpacing(WordUtil.milliPt2Twips(topSpacingValue) / 2, WordUtil.milliPt2Twips(bottomSpacingValue) / 2);
writeSpacing(WordUtil.milliPt2Twips(topSpacingValue), WordUtil.milliPt2Twips(bottomSpacingValue));
}

private void writeSpacing(CSSValue height, CSSValue top, CSSValue bottom) {
writer.openTag("w:spacing");
if (height != null) {
float spacingValue = PropertyUtil.getDimensionValue(height);
int spacing = WordUtil.milliPt2Twips(spacingValue);
writer.attribute("w:lineRule", "exact");
writer.attribute("w:line", spacing);
}
int beforeTop = WordUtil.milliPt2Twips(PropertyUtil.getDimensionValue(top));
int afterBottom = WordUtil.milliPt2Twips(PropertyUtil.getDimensionValue(bottom));
writer.attribute("w:before", beforeTop);
writer.attribute("w:after", afterBottom);
writer.closeTag("w:spacing");
}

private void writeSpacing(int beforeValue, int afterValue) {
Expand Down Expand Up @@ -1092,17 +1107,27 @@ private void writeTextInParagraph(int type, String txt, IStyle style, String fon

CSSValue lineHeight = style.getProperty(StyleConstants.STYLE_LINE_HEIGHT);
if (!"normal".equalsIgnoreCase(lineHeight.getCssText())) {
writeSpacing(lineHeight);
writeSpacing(lineHeight, style.getProperty(StyleConstants.STYLE_MARGIN_TOP),
style.getProperty(StyleConstants.STYLE_MARGIN_BOTTOM));
} else {
writeSpacing(style.getProperty(StyleConstants.STYLE_MARGIN_TOP),
style.getProperty(StyleConstants.STYLE_MARGIN_BOTTOM));
}

writeAlign(style.getTextAlign(), style.getDirection());
writeBackgroundColor(style.getBackgroundColor());
writeParagraphBorders(style);
int indent = PropertyUtil.getDimensionValue(style.getProperty(StyleConstants.STYLE_TEXT_INDENT),
paragraphWidth * 1000) / 1000 * 20;
if (indent != 0) {
writeIndent(indent);
}

int indent = PropertyUtil.getDimensionValue(style.getProperty(StyleConstants.STYLE_TEXT_INDENT), paragraphWidth)
/ 1000 * 20;

int leftMargin = PropertyUtil.getDimensionValue(style.getProperty(StyleConstants.STYLE_MARGIN_LEFT),
paragraphWidth) / 1000 * 20;

int rightMargin = PropertyUtil.getDimensionValue(style.getProperty(StyleConstants.STYLE_MARGIN_RIGHT),
paragraphWidth) / 1000 * 20;
writeIndent(leftMargin, rightMargin, indent);

writeBidi(CSSConstants.CSS_RTL_VALUE.equals(style.getDirection())); // bidi_hcg
// We need to apply the text font style to the paragraph. It is useful
// if the end user want to paste some text into this paragraph and
Expand Down
Loading