From a85a225c73d05728359631814ba670d9373eba04 Mon Sep 17 00:00:00 2001 From: Bernard Xie Date: Tue, 28 Feb 2023 12:45:00 -0800 Subject: [PATCH] reverts --- d2cli/main.go | 13 ++++++------- lib/pdf/pdf.go | 3 +-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/d2cli/main.go b/d2cli/main.go index 76596cdd3..4c405f0cf 100644 --- a/d2cli/main.go +++ b/d2cli/main.go @@ -377,12 +377,11 @@ func render(ctx context.Context, ms *xmain.State, compileDur time.Duration, plug func _render(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, sketch bool, pad int64, themeID int64, darkThemeID *int64, outputPath string, bundle, forceAppendix bool, page playwright.Page, ruler *textmeasure.Ruler, diagram *d2target.Diagram) ([]byte, error) { toPNG := filepath.Ext(outputPath) == ".png" svg, err := d2svg.Render(diagram, &d2svg.RenderOpts{ - Pad: int(pad), - Sketch: sketch, - ThemeID: themeID, - DarkThemeID: darkThemeID, - // SetDimensions: toPNG, - SetDimensions: true, + Pad: int(pad), + Sketch: sketch, + ThemeID: themeID, + DarkThemeID: darkThemeID, + SetDimensions: toPNG, }) if err != nil { return nil, err @@ -460,7 +459,7 @@ func renderPDF(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, ske rootFill := diagram.Root.Fill // gofpdf will print the png img with a slight filter // make the bg fill within the png transparent so that the pdf bg fill is the only bg color present - // diagram.Root.Fill = "transparent" + diagram.Root.Fill = "transparent" svg, err = d2svg.Render(diagram, &d2svg.RenderOpts{ Pad: int(pad), diff --git a/lib/pdf/pdf.go b/lib/pdf/pdf.go index 6ad5cd1e9..731024f71 100644 --- a/lib/pdf/pdf.go +++ b/lib/pdf/pdf.go @@ -78,8 +78,7 @@ func (g *GoFPDF) AddPDFPage(png []byte, boardPath []string, themeID int64, fill headerMargin := 28.0 headerWidth := g.pdf.GetStringWidth(pathString) + 2*headerMargin - // minPageDimension := 576.0 - minPageDimension := 0.0 + minPageDimension := 576.0 pageWidth = math.Max(math.Max(minPageDimension, imageWidth), headerWidth) pageHeight = math.Max(minPageDimension, imageHeight)