diff options
author | Kurt <kurt.w.jung@gmail.com> | 2017-11-24 10:42:13 -0500 |
---|---|---|
committer | Kurt <kurt.w.jung@gmail.com> | 2017-11-24 10:42:13 -0500 |
commit | a3f28ba717a677e133f159e3fc1d42b249c2b511 (patch) | |
tree | 9e5ff9c0ff5ec004607b24b24b54e1a882e5b524 /fpdf.go | |
parent | 8251b8def6a5b73f826587308bcba926a17b6ea9 (diff) | |
parent | c6b082a6263bbfcfab0dcc4f4c4bb2c024c84f10 (diff) |
Merge branch 'wgliang-master'
Diffstat (limited to 'fpdf.go')
-rw-r--r-- | fpdf.go | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1931,19 +1931,19 @@ func (f *Fpdf) CellFormat(w, h float64, txtStr string, borderStr string, ln int, if len(txtStr) > 0 { var dx, dy float64 // Horizontal alignment - if strings.Index(alignStr, "R") != -1 { + if strings.Contains(alignStr, "R") { dx = w - f.cMargin - f.GetStringWidth(txtStr) - } else if strings.Index(alignStr, "C") != -1 { + } else if strings.Contains(alignStr, "C") { dx = (w - f.GetStringWidth(txtStr)) / 2 } else { dx = f.cMargin } // Vertical alignment - if strings.Index(alignStr, "T") != -1 { + if strings.Contains(alignStr, "T") { dy = (f.fontSize - h) / 2.0 - } else if strings.Index(alignStr, "B") != -1 { + } else if strings.Contains(alignStr, "B") { dy = (h - f.fontSize) / 2.0 - } else if strings.Index(alignStr, "A") != -1 { + } else if strings.Contains(alignStr, "A") { var descent float64 d := f.currentFont.Desc if d.Descent == 0 { |