Skip to content

Fix inconsistent margins #1248

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+35 −36
Open

Fix inconsistent margins #1248

Show file tree
Hide file tree
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
14 changes: 7 additions & 7 deletions demos/modules/demo_image.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function genSlide01(pptx) {
y: 0.6,
w: 2.75,
h: 2.5,
margin: 4,
margin: 0.057,
fill: { color: BKGD_LTGRAY },
fontSize: 12,
fontFace: "Segoe UI",
Expand All @@ -72,7 +72,7 @@ function genSlide01(pptx) {
y: 0.6,
w: 2.75,
h: 2.5,
margin: 4,
margin: 0.057,
fill: { color: BKGD_LTGRAY },
fontSize: 12,
fontFace: "Segoe UI",
Expand All @@ -88,7 +88,7 @@ function genSlide01(pptx) {
y: 0.6,
w: 2.75,
h: 2.5,
margin: 4,
margin: 0.057,
fill: { color: BKGD_LTGRAY },
fontSize: 12,
fontFace: "Segoe UI",
Expand All @@ -104,7 +104,7 @@ function genSlide01(pptx) {
y: 0.6,
w: 2.75,
h: 2.5,
margin: 4,
margin: 0.057,
fill: { color: BKGD_LTGRAY },
fontSize: 12,
fontFace: "Segoe UI",
Expand All @@ -130,7 +130,7 @@ function genSlide01(pptx) {
y: 3.5,
w: 3.5,
h: 3.5,
margin: 4,
margin: 0.057,
fill: { color: BKGD_LTGRAY },
fontSize: 12,
fontFace: "Segoe UI",
Expand All @@ -147,7 +147,7 @@ function genSlide01(pptx) {
y: 3.5,
w: 3.5,
h: 3.5,
margin: 4,
margin: 0.057,
fill: { color: BKGD_LTGRAY },
fontSize: 12,
fontFace: "Segoe UI",
Expand All @@ -163,7 +163,7 @@ function genSlide01(pptx) {
y: 3.5,
w: 3.5,
h: 3.5,
margin: 4,
margin: 0.057,
fill: { color: BKGD_LTGRAY },
fontSize: 12,
fontFace: "Segoe UI",
Expand Down
16 changes: 8 additions & 8 deletions demos/modules/demo_text.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function genSlide01(pptx) {
{ text: "(left/top)", options: { fontSize: 12, breakLine: true } },
{ text: "Textbox", options: { bold: true } },
],
{ x: 10, y: 0.75, w: 3.0, h: 1.0, color: "FFFFFF", fill: { color: "00B050" }, valign: "top", align: "left", margin: 15 }
{ x: 10, y: 0.75, w: 3.0, h: 1.0, color: "FFFFFF", fill: { color: "00B050" }, valign: "top", align: "left", margin: 0.214 }
);
slide.addText(
[
Expand Down Expand Up @@ -162,7 +162,7 @@ function genSlide02(pptx) {
{ text: "highlighted", options: { fontSize: 36, fontFace: "Arial", color: pptx.colors.ACCENT5, align: "right", highlight: "FFFF00" } },
{ text: " text!", options: { fontSize: 36, fontFace: "Arial", color: pptx.colors.ACCENT5, align: "right" } },
],
{ x: 0.5, y: 1.0, w: 5.75, h: 6.0, margin: 5, fill: { color: pptx.colors.TEXT1 } }
{ x: 0.5, y: 1.0, w: 5.75, h: 6.0, margin: 0.071, fill: { color: pptx.colors.TEXT1 } }
);

// RIGHT COLUMN ------------------------------------------------------------
Expand Down Expand Up @@ -208,7 +208,7 @@ function genSlide02(pptx) {
y: 6.0,
w: 5.75,
h: 1,
margin: [0, 0, 0, 10],
margin: [0, 0, 0, 0.143],
fill: { color: "F1F1F1" },
});
}
Expand Down Expand Up @@ -340,14 +340,14 @@ function genSlide04(pptx) {
slide.addText("Hyperlinks:", { x: 0.5, y: 0.6, w: "90%", h: 0.3, margin: 0.123, color: pptx.colors.ACCENT1 });
slide.addText(
[{ text: "Link with Tooltip", options: { hyperlink: { url: "https://github.com/gitbrent/pptxgenjs", tooltip: "Visit Homepage" } } }],
{ x: 0.5, y: 1.0, w: 2.5, h: 0.6, margin: 10, fill: { color: "F1F1F1" }, fontSize: 14, align: "center" }
{ x: 0.5, y: 1.0, w: 2.5, h: 0.6, margin: 0.143, fill: { color: "F1F1F1" }, fontSize: 14, align: "center" }
);
slide.addText([{ text: "Link without Tooltip", options: { hyperlink: { url: "https://github.com/gitbrent" } } }], {
x: 3.78,
y: 1.0,
w: 2.5,
h: 0.6,
margin: 10,
margin: 0.143,
fill: { color: "F1F1F1" },
fontSize: 14,
align: "center",
Expand All @@ -357,7 +357,7 @@ function genSlide04(pptx) {
y: 1.0,
w: 2.5,
h: 0.6,
margin: 10,
margin: 0.143,
fill: { color: "F1F1F1" },
fontSize: 14,
align: "center",
Expand All @@ -367,7 +367,7 @@ function genSlide04(pptx) {
y: 1.0,
w: 2.5,
h: 0.6,
margin: 10,
margin: 0.143,
fill: { color: "E2F0D9" },
fontSize: 14,
align: "center",
Expand Down Expand Up @@ -456,7 +456,7 @@ function genSlide05(pptx) {
text: "- the textboxes above have their shrink & resize props set already, just add a space or resize them to trigger shrink and resize behavior",
},
],
{ x: 0.5, y: 6.0, w: 12, h: 1.1, margin: 10, fontSize: 12, color: "393939", fill: { color: "fffccc" } }
{ x: 0.5, y: 6.0, w: 12, h: 1.1, margin: 0.143, fontSize: 12, color: "393939", fill: { color: "fffccc" } }
);
}

Expand Down
12 changes: 6 additions & 6 deletions demos/modules/enums.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ export const BASE_TABLE_OPTS = { x: 0.5, y: 0.13, colW: [9, 3.33] }; // LAYOUT_W
// STYLES
export const BKGD_LTGRAY = "F1F1F1";
export const COLOR_BLUE = "0088CC";
export const CODE_STYLE = { fill: { color: BKGD_LTGRAY }, margin: 6, fontSize: 10, color: '696969' };
export const TITLE_STYLE = { fill: { color: BKGD_LTGRAY }, margin: 4, fontSize: 18, fontFace: "Segoe UI", color: COLOR_BLUE, valign: "top", align: "center" };
export const CODE_STYLE = { fill: { color: BKGD_LTGRAY }, margin: 0.086, fontSize: 10, color: '696969' };
export const TITLE_STYLE = { fill: { color: BKGD_LTGRAY }, margin: 0.057, fontSize: 18, fontFace: "Segoe UI", color: COLOR_BLUE, valign: "top", align: "center" };

// OPTIONS
export const BASE_TEXT_OPTS_L = { color: "9F9F9F", margin: 3, border: [null, null, { pt: "1", color: "CFCFCF" }, null] };
export const BASE_TEXT_OPTS_L = { color: "9F9F9F", margin: 0.043, border: [null, null, { pt: "1", color: "CFCFCF" }, null] };
export const BASE_TEXT_OPTS_R = {
text: "PptxGenJS",
options: { color: "9F9F9F", margin: 3, border: [0, 0, { pt: "1", color: "CFCFCF" }, 0], align: "right" },
options: { color: "9F9F9F", margin: 0.043, border: [0, 0, { pt: "1", color: "CFCFCF" }, 0], align: "right" },
};
export const FOOTER_TEXT_OPTS = { x: 0.0, y: 7.16, w: "100%", h: 0.3, margin: 3, color: "9F9F9F", align: "center", fontSize: 10 };
export const FOOTER_TEXT_OPTS = { x: 0.0, y: 7.16, w: "100%", h: 0.3, margin: 0.043, color: "9F9F9F", align: "center", fontSize: 10 };
export const BASE_CODE_OPTS = {
color: "9F9F9F",
margin: 3,
margin: 0.043,
border: { pt: "1", color: "CFCFCF" },
fill: { color: "F1F1F1" },
fontFace: "Courier",
Expand Down
15 changes: 14 additions & 1 deletion src/gen-objects.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,7 +1070,20 @@ export function addTextDefinition (target: PresSlide, text: TextProps[], opts: T
itemOpts._bodyProp.bIns = inch2Emu(itemOpts.inset)
}

// F: Transform @deprecated props
// F: Margin
if (itemOpts.margin && Array.isArray(itemOpts.margin)) {
itemOpts._bodyProp.tIns = inch2Emu(itemOpts.margin[0] || 0)
itemOpts._bodyProp.rIns = inch2Emu(itemOpts.margin[1] || 0)
itemOpts._bodyProp.bIns = inch2Emu(itemOpts.margin[2] || 0)
itemOpts._bodyProp.lIns = inch2Emu(itemOpts.margin[3] || 0)
} else if (typeof itemOpts.margin === 'number') {
itemOpts._bodyProp.lIns = inch2Emu(itemOpts.margin)
itemOpts._bodyProp.rIns = inch2Emu(itemOpts.margin)
itemOpts._bodyProp.bIns = inch2Emu(itemOpts.margin)
itemOpts._bodyProp.tIns = inch2Emu(itemOpts.margin)
}

// G: Transform @deprecated props
if (typeof itemOpts.underline === 'boolean' && itemOpts.underline === true) itemOpts.underline = { style: 'sng' }
}

Expand Down
14 changes: 0 additions & 14 deletions src/gen-xml.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,20 +389,6 @@ function slideObjectToXml (slide: PresSlide | SlideLayout): string {
// Lines can have zero cy, but text should not
if (!slideItemObj.options.line && cy === 0) cy = EMU * 0.3

// Margin/Padding/Inset for textboxes
if (!slideItemObj.options._bodyProp) slideItemObj.options._bodyProp = {}
if (slideItemObj.options.margin && Array.isArray(slideItemObj.options.margin)) {
slideItemObj.options._bodyProp.lIns = valToPts(slideItemObj.options.margin[0] || 0)
slideItemObj.options._bodyProp.rIns = valToPts(slideItemObj.options.margin[1] || 0)
slideItemObj.options._bodyProp.bIns = valToPts(slideItemObj.options.margin[2] || 0)
slideItemObj.options._bodyProp.tIns = valToPts(slideItemObj.options.margin[3] || 0)
} else if (typeof slideItemObj.options.margin === 'number') {
slideItemObj.options._bodyProp.lIns = valToPts(slideItemObj.options.margin)
slideItemObj.options._bodyProp.rIns = valToPts(slideItemObj.options.margin)
slideItemObj.options._bodyProp.bIns = valToPts(slideItemObj.options.margin)
slideItemObj.options._bodyProp.tIns = valToPts(slideItemObj.options.margin)
}

// A: Start SHAPE =======================================================
strSlideXml += '<p:sp>'

Expand Down