diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2018-04-16 22:30:50 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2018-04-17 12:11:24 +0200 |
| commit | 335036f0d05bdfde49cacf245863c686d07a2d5f (patch) | |
| tree | 3bc83952ec911fd4e2d26a33164c2cf1f9a356c6 /vcl/inc/win/salgdi.h | |
| parent | cdbb14cedb7d07aec0dda47fbb5ab65a02fb0cf6 (diff) | |
tdf#116812: Revert "The mfFontScale[n] is always 1.0"
This reverts commit 1b7e788eb3bf9cbe56ed5cc4a3fa7fa5e70ac40a
and followup commit 843c6d6eec95b99e867c28ab27860215d5d72b37.
Change-Id: I42d1ab76778466db356f0597c90e1afc2dc9997d
Reviewed-on: https://gerrit.libreoffice.org/53013
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Diffstat (limited to 'vcl/inc/win/salgdi.h')
| -rw-r--r-- | vcl/inc/win/salgdi.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index b1edef997d85..23531842dde3 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -166,6 +166,8 @@ private: HFONT mhFonts[ MAX_FALLBACK ]; // Font + Fallbacks const WinFontFace* mpWinFontData[ MAX_FALLBACK ]; // pointer to the most recent font face WinFontInstance* mpWinFontEntry[ MAX_FALLBACK ]; // pointer to the most recent font instance + float mfFontScale[ MAX_FALLBACK ]; // allows metrics emulation of huge font sizes + float mfCurrentFontScale; HRGN mhRegion; // vcl::Region Handle HPEN mhDefPen; // DefaultPen HBRUSH mhDefBrush; // DefaultBrush @@ -205,7 +207,7 @@ public: HWND gethWnd(); - HFONT ImplDoSetFont( FontSelectPattern const * i_pFont, HFONT& o_rOldFont ); + HFONT ImplDoSetFont( FontSelectPattern const * i_pFont, float& o_rFontScale, HFONT& o_rOldFont ); public: explicit WinSalGraphics(WinSalGraphics::Type eType, bool bScreen, HWND hWnd, |