diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-07 09:50:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-10-07 12:32:23 +0200 |
| commit | 64d0de92ab06e6550be7dd59ae887750166d15a9 (patch) | |
| tree | 0ac4130293e2a9a244791038d472160321bd979e /vcl/inc/impfont.hxx | |
| parent | 687bba75dadf94b06d0e5d2888e7d312ed668a53 (diff) | |
loplugin:mergeclasses
Change-Id: If8fabc79f4cbef6fc0d164bbe2f6136f1d1f00af
Diffstat (limited to 'vcl/inc/impfont.hxx')
| -rw-r--r-- | vcl/inc/impfont.hxx | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index 898e47dcdbfc..5ad974e56841 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -122,9 +122,8 @@ public: bool operator==( const ImplFontMetric& ) const; }; -// - ImplFontOptions - - -class ImplFontOptions +typedef struct _FcPattern FcPattern; +class FontConfigFontOptions { public: FontEmbeddedBitmap meEmbeddedBitmap; // whether the embedded bitmaps should be used @@ -132,21 +131,31 @@ public: FontAutoHint meAutoHint; // whether the font should be autohinted FontHinting meHinting; // whether the font should be hinted FontHintStyle meHintStyle; // type of font hinting to be used -public: - ImplFontOptions() : + + FontConfigFontOptions() : + meEmbeddedBitmap(EMBEDDEDBITMAP_DONTKNOW), + meAntiAlias(ANTIALIAS_DONTKNOW), + meAutoHint(AUTOHINT_DONTKNOW), + meHinting(HINTING_DONTKNOW), + meHintStyle(HINT_SLIGHT), + mpPattern(0) {} + FontConfigFontOptions(FcPattern* pPattern) : meEmbeddedBitmap(EMBEDDEDBITMAP_DONTKNOW), meAntiAlias(ANTIALIAS_DONTKNOW), meAutoHint(AUTOHINT_DONTKNOW), meHinting(HINTING_DONTKNOW), - meHintStyle(HINT_SLIGHT) {} - virtual ~ImplFontOptions() {} + meHintStyle(HINT_SLIGHT), + mpPattern(pPattern) {} + ~FontConfigFontOptions(); FontAutoHint GetUseAutoHint() const { return meAutoHint; } FontHintStyle GetHintStyle() const { return meHintStyle; } bool DontUseEmbeddedBitmaps() const { return meEmbeddedBitmap == EMBEDDEDBITMAP_FALSE; } bool DontUseAntiAlias() const { return meAntiAlias == ANTIALIAS_FALSE; } bool DontUseHinting() const { return (meHinting == HINTING_FALSE) || (GetHintStyle() == HINT_NONE); } - virtual void* GetPattern(void * /*pFace*/, bool /*bEmbolden*/, bool /*bVerticalMetrics*/) const { return NULL; } + void* GetPattern(void * /*pFace*/, bool /*bEmbolden*/) const; +private: + FcPattern* mpPattern; }; // - ImplFontCharMap - |