forked from p30928647/excelize
Fix #411, change font size to float type
This commit is contained in:
parent
cff16fa811
commit
3997dee1f5
|
@ -1981,7 +1981,7 @@ func (f *File) setFont(formatStyle *formatStyle) *xlsxFont {
|
|||
fnt := xlsxFont{
|
||||
B: formatStyle.Font.Bold,
|
||||
I: formatStyle.Font.Italic,
|
||||
Sz: &attrValInt{Val: formatStyle.Font.Size},
|
||||
Sz: &attrValFloat{Val: formatStyle.Font.Size},
|
||||
Color: &xlsxColor{RGB: getPaletteColor(formatStyle.Font.Color)},
|
||||
Name: &attrValString{Val: formatStyle.Font.Family},
|
||||
Family: &attrValInt{Val: 2},
|
||||
|
|
|
@ -209,7 +209,7 @@ type aRPr struct {
|
|||
SmtID uint64 `xml:"smtId,attr,omitempty"`
|
||||
Spc int `xml:"spc,attr"`
|
||||
Strike string `xml:"strike,attr,omitempty"`
|
||||
Sz int `xml:"sz,attr,omitempty"`
|
||||
Sz float64 `xml:"sz,attr,omitempty"`
|
||||
U string `xml:"u,attr,omitempty"`
|
||||
SolidFill *aSolidFill `xml:"a:solidFill"`
|
||||
Latin *aLatin `xml:"a:latin"`
|
||||
|
|
|
@ -96,7 +96,7 @@ type xlsxFont struct {
|
|||
Condense bool `xml:"condense,omitempty"`
|
||||
Extend bool `xml:"extend,omitempty"`
|
||||
Color *xlsxColor `xml:"color"`
|
||||
Sz *attrValInt `xml:"sz"`
|
||||
Sz *attrValFloat `xml:"sz"`
|
||||
U *attrValString `xml:"u"`
|
||||
Scheme *attrValString `xml:"scheme"`
|
||||
}
|
||||
|
@ -315,12 +315,12 @@ type xlsxStyleColors struct {
|
|||
|
||||
// formatFont directly maps the styles settings of the fonts.
|
||||
type formatFont struct {
|
||||
Bold bool `json:"bold"`
|
||||
Italic bool `json:"italic"`
|
||||
Underline string `json:"underline"`
|
||||
Family string `json:"family"`
|
||||
Size int `json:"size"`
|
||||
Color string `json:"color"`
|
||||
Bold bool `json:"bold"`
|
||||
Italic bool `json:"italic"`
|
||||
Underline string `json:"underline"`
|
||||
Family string `json:"family"`
|
||||
Size float64 `json:"size"`
|
||||
Color string `json:"color"`
|
||||
}
|
||||
|
||||
// formatStyle directly maps the styles settings of the cells.
|
||||
|
|
Loading…
Reference in New Issue