diff options
| author | Martin Hosken <martin_hosken@sil.org> | 2015-02-09 16:49:12 +0700 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-12 10:38:42 +0000 |
| commit | 0ed14401925d16932ed98bc418d395adac047b39 (patch) | |
| tree | 46259d71fae49fb10a006a48e8be9ed3e4eac125 /vcl/inc | |
| parent | 605494fd99ae8e54611899729783d1163cf9a5ba (diff) | |
Resolves: tdf#89252 Fix bold, regular font spacing bug for Graphite fonts
Change-Id: I31a09fa753ed15e302e5407ce8a0c46f3b13e099
Reviewed-on: https://gerrit.libreoffice.org/14380
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/graphite_layout.hxx | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx index f8abb791c4ae..7ccbe150e588 100644 --- a/vcl/inc/graphite_layout.hxx +++ b/vcl/inc/graphite_layout.hxx @@ -52,7 +52,8 @@ namespace grutils { class GrFeatureParser; } class GraphiteFaceWrapper { public: - typedef std::map<int, gr_font*> GrFontMap; + typedef std::pair<int, int> GrFontMapKey; + typedef std::map<GrFontMapKey, gr_font*> GrFontMap; GraphiteFaceWrapper(gr_face * pFace) : m_pFace(pFace) {} ~GraphiteFaceWrapper() { @@ -63,18 +64,21 @@ public: gr_face_destroy(m_pFace); } const gr_face * face() const { return m_pFace; } - gr_font * font(int ppm) const + gr_font * font(int ppm, bool isBold, bool isItalic) const { - GrFontMap::const_iterator i = m_fonts.find(ppm); + int styleKey = int(isBold) | (int(isItalic) << 1); + GrFontMap::const_iterator i = m_fonts.find(GrFontMapKey(ppm, styleKey)); if (i != m_fonts.end()) return i->second; return NULL; }; - void addFont(int ppm, gr_font * pFont) + void addFont(int ppm, gr_font * pFont, bool isBold, bool isItalic) { - if (m_fonts[ppm]) - gr_font_destroy(m_fonts[ppm]); - m_fonts[ppm] = pFont; + int styleKey = int(isBold) | (int(isItalic) << 1); + GrFontMapKey key(ppm, styleKey); + if (m_fonts[key]) + gr_font_destroy(m_fonts[key]); + m_fonts[key] = pFont; } private: gr_face * m_pFace; |