p30928647
/
excelize
1
0
Fork 1
Code Issues Pull Requests Projects Releases 23 Wiki Activity

Fix #411, change font size to float type

This commit is contained in:
xuri 2019-06-07 09:16:55 +08:00
parent cff16fa811
commit 3997dee1f5
No known key found for this signature in database
GPG Key ID: BA5E5BB1C948EDF7
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
styles.go Normal file → Executable file
View File

@ -1981,7 +1981,7 @@ func (f *File) setFont(formatStyle *formatStyle) *xlsxFont {
fnt := xlsxFont{ fnt := xlsxFont{
B: formatStyle.Font.Bold, B: formatStyle.Font.Bold,
I: formatStyle.Font.Italic, I: formatStyle.Font.Italic,
Sz: &attrValInt{Val: formatStyle.Font.Size}, Sz: &attrValFloat{Val: formatStyle.Font.Size},
Color: &xlsxColor{RGB: getPaletteColor(formatStyle.Font.Color)}, Color: &xlsxColor{RGB: getPaletteColor(formatStyle.Font.Color)},
Name: &attrValString{Val: formatStyle.Font.Family}, Name: &attrValString{Val: formatStyle.Font.Family},
Family: &attrValInt{Val: 2}, Family: &attrValInt{Val: 2},

2
xmlChart.go Normal file → Executable file
View File

@ -209,7 +209,7 @@ type aRPr struct {
SmtID uint64 `xml:"smtId,attr,omitempty"` SmtID uint64 `xml:"smtId,attr,omitempty"`
Spc int `xml:"spc,attr"` Spc int `xml:"spc,attr"`
Strike string `xml:"strike,attr,omitempty"` Strike string `xml:"strike,attr,omitempty"`
Sz int `xml:"sz,attr,omitempty"` Sz float64 `xml:"sz,attr,omitempty"`
U string `xml:"u,attr,omitempty"` U string `xml:"u,attr,omitempty"`
SolidFill *aSolidFill `xml:"a:solidFill"` SolidFill *aSolidFill `xml:"a:solidFill"`
Latin *aLatin `xml:"a:latin"` Latin *aLatin `xml:"a:latin"`

4
xmlStyles.go Normal file → Executable file
View File

@ -96,7 +96,7 @@ type xlsxFont struct {
Condense bool `xml:"condense,omitempty"` Condense bool `xml:"condense,omitempty"`
Extend bool `xml:"extend,omitempty"` Extend bool `xml:"extend,omitempty"`
Color *xlsxColor `xml:"color"` Color *xlsxColor `xml:"color"`
Sz *attrValInt `xml:"sz"` Sz *attrValFloat `xml:"sz"`
U *attrValString `xml:"u"` U *attrValString `xml:"u"`
Scheme *attrValString `xml:"scheme"` Scheme *attrValString `xml:"scheme"`
} }
@ -319,7 +319,7 @@ type formatFont struct {
Italic bool `json:"italic"` Italic bool `json:"italic"`
Underline string `json:"underline"` Underline string `json:"underline"`
Family string `json:"family"` Family string `json:"family"`
Size int `json:"size"` Size float64 `json:"size"`
Color string `json:"color"` Color string `json:"color"`
} }