OrgGo/unipdf
1
0
Fork 0
mirror of https://github.com/unidoc/unipdf.git synced 2025-04-27 13:48:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added : Offset for cornet adjustment

Browse Source
This commit is contained in:
Sakib Sami 2018-07-10 00:51:45 +06:00
parent be739f6ac1
commit 58f80ed6b2
2 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pdf/creator/border.go
View File

@ -124,7 +124,7 @@ func (border *border) GeneratePageBlocks(ctx DrawContext) ([]*Block, DrawContext
drawrect := draw.Rectangle{
Opacity: 1.0,
X: border.x + (border.borderWidthLeft * 3) - 0.5,
Y: (ctx.PageHeight - border.y - border.height) + (border.borderWidthLeft * 2) - 0.5,
Y: (ctx.PageHeight - border.y - border.height) + (border.borderWidthLeft * 2),
Height: border.height - (border.borderWidthBottom * 3),
Width: border.width - (border.borderWidthRight * 3),
}
@ -144,10 +144,16 @@ func (border *border) GeneratePageBlocks(ctx DrawContext) ([]*Block, DrawContext
}
if border.borderWidthTop != 0 {
offsetX1 := 0.0
offsetX2 := 0.0
y1 := startY
y2 := startY
if border.StyleTop == CellBorderStyleDoubleTop {
offsetX1 = 1
offsetX2 = 1
// Line Top
lineTop := draw.Line{
LineWidth: border.borderWidthTop,
@ -155,9 +161,9 @@ func (border *border) GeneratePageBlocks(ctx DrawContext) ([]*Block, DrawContext
LineColor: border.borderColorTop,
LineEndingStyle1: draw.LineEndingStyleNone,
LineEndingStyle2: draw.LineEndingStyleNone,
X1: startX + autoTopAdjustmentOnLeft + 1, // +1 for corner adjustment
X1: startX + autoTopAdjustmentOnLeft + offsetX1,
Y1: y1 - (doubleBorderAdjustment * border.borderWidthTop),
X2: ((startX + border.width) - autoTopAdjustmentOnRight) + 0.5, // +0.5 for corner adjustment
X2: ((startX + border.width) - autoTopAdjustmentOnRight) + offsetX2,
Y2: y2 - (doubleBorderAdjustment * border.borderWidthTop),
LineStyle: border.LineStyle,
}
@ -172,6 +178,11 @@ func (border *border) GeneratePageBlocks(ctx DrawContext) ([]*Block, DrawContext
y1 = y1 + (doubleBorderAdjustment * border.borderWidthTop)
y2 = y2 + (doubleBorderAdjustment * border.borderWidthTop)
offsetX1 = (-(border.borderWidthRight / 2)) + 0.5
} else {
offsetX1 = 1
offsetX2 = -1
}
// Line Top
@ -181,9 +192,9 @@ func (border *border) GeneratePageBlocks(ctx DrawContext) ([]*Block, DrawContext
LineColor: border.borderColorTop,
LineEndingStyle1: draw.LineEndingStyleNone,
LineEndingStyle2: draw.LineEndingStyleNone,
X1: startX + 0.5,
X1: startX + offsetX1,
Y1: y1,
X2: startX + border.width + autoTopAdjustmentOnRight + 0.5,
X2: startX + border.width + autoTopAdjustmentOnRight + offsetX2,
Y2: y2,
LineStyle: border.LineStyle,
}
@ -198,8 +209,11 @@ func (border *border) GeneratePageBlocks(ctx DrawContext) ([]*Block, DrawContext
}
if border.borderWidthLeft != 0 {
x1 := startX + 1
x2 := startX + 1
offsetX1 := 1.0
offsetX2 := 1.0
x1 := startX + offsetX1
x2 := startX + offsetX2
if border.StyleLeft == CellBorderStyleDoubleLeft {
// Line Left
@ -252,6 +266,8 @@ func (border *border) GeneratePageBlocks(ctx DrawContext) ([]*Block, DrawContext
}
if border.borderWidthRight != 0 {
offsetY2 := 0.0
x1 := startX + border.width
x2 := startX + border.width
@ -280,6 +296,8 @@ func (border *border) GeneratePageBlocks(ctx DrawContext) ([]*Block, DrawContext
x1 = x1 + (doubleBorderAdjustment * border.borderWidthRight)
x2 = x2 + (doubleBorderAdjustment * border.borderWidthRight)
} else {
offsetY2 = 1
}
// Line Right
@ -292,7 +310,7 @@ func (border *border) GeneratePageBlocks(ctx DrawContext) ([]*Block, DrawContext
X1: x1,
Y1: startY + autoRightAdjustmentOnTop,
X2: x2,
Y2: (startY - border.height) - autoRightAdjustmentOnBottom,
Y2: (startY - border.height) - autoRightAdjustmentOnBottom + offsetY2,
LineStyle: border.LineStyle,
}
contentsRight, _, err := lineRight.Draw("")
@ -307,11 +325,14 @@ func (border *border) GeneratePageBlocks(ctx DrawContext) ([]*Block, DrawContext
if border.borderWidthBottom != 0 {
// Line Bottom
offsetFull := 0.0
y1 := startY - border.height
y2 := startY - border.height
if border.StyleBottom == CellBorderStyleDoubleBottom {
offsetFull = 1
lineBottom := draw.Line{
LineWidth: border.borderWidthBottom,
Opacity: 1.0,
@ -320,7 +341,7 @@ func (border *border) GeneratePageBlocks(ctx DrawContext) ([]*Block, DrawContext
LineEndingStyle2: draw.LineEndingStyleNone,
X1: (startX + border.width) - autoBottomAdjustmentOnRight,
Y1: y1 + (doubleBorderAdjustment * border.borderWidthBottom),
X2: startX + autoBottomAdjustmentOnLeft + 1, // +1 for corner adjustment
X2: startX + autoBottomAdjustmentOnLeft + offsetFull,
Y2: y2 + (doubleBorderAdjustment * border.borderWidthBottom),
LineStyle: border.LineStyle,
}

23
pdf/creator/creator_test.go
View File

@ -959,7 +959,6 @@ func TestBorderedTable1(t *testing.T) {
cell1.SetContent(p)
cell1.SetBorder(CellBorderStyleDoubleBox, 1) // border will be on left
cell1.SetBorderLineStyle(draw.LineStyleDashed)
cell1.SetBackgroundColor(ColorGreen)
table.SkipCells(1)
@ -1008,11 +1007,7 @@ func TestBorderedTable2(t *testing.T) {
cell2.SetBorder(CellBorderStyleBox, 1) // border will be around
cell2.SetBorderLineStyle(draw.LineStyleSolid)
cell3 := table.NewCell()
p = NewParagraph("C")
cell3.SetContent(p)
cell3.SetBorder(CellBorderStyleBottom, 1) // border will be on bottom
cell3.SetBorderLineStyle(draw.LineStyleSolid)
table.SkipCells(1)
cell4 := table.NewCell()
p = NewParagraph("D")
@ -1020,11 +1015,7 @@ func TestBorderedTable2(t *testing.T) {
cell4.SetBorder(CellBorderStyleBox, 1) // border will be around
cell4.SetBorderLineStyle(draw.LineStyleSolid)
cell5 := table.NewCell()
p = NewParagraph("E")
cell5.SetContent(p)
cell5.SetBorder(CellBorderStyleBox, 1) // border will be around
cell5.SetBorderLineStyle(draw.LineStyleSolid)
table.SkipCells(1)
cell6 := table.NewCell()
p = NewParagraph("F")
@ -1048,16 +1039,6 @@ func TestBorderedTable2(t *testing.T) {
cell8.SetBorder(CellBorderStyleRight, 1) // border will be on right
cell8.SetBorderLineStyle(draw.LineStyleSolid)
// Move down 3 rows, 2 to the left.
table.SkipOver(3, -2)
cell9 := table.NewCell()
p = NewParagraph("I")
cell9.SetContent(p)
cell9.SetBackgroundColor(ColorRGBFrom8bit(255, 0, 0))
cell9.SetBorder(CellBorderStyleBottom, 1) // border will be on bottom
cell9.SetBorder(CellBorderStyleTop, 1) // border will be on top
cell9.SetBorderLineStyle(draw.LineStyleSolid)
c := New()
c.Draw(table)