diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-09-06 13:46:28 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-09-06 18:46:06 +0200 |
| commit | c177c305fc839e7a64d228ec56209d133588572b (patch) | |
| tree | e0281793695a4f2e95b6a6d9614ded20a95eb8d7 /vcl/win/gdi/salgdi.cxx | |
| parent | 2c704832567d0948595ebe1b239314890a01da4e (diff) | |
tdf#119302 WIN better font scale handling
Moves the scale factor into the LogicalFontInstance and uses the
Glyphs font fallback level to use the correct font and scale.
Probably the glyphs should be using a rtl::Reference to the
LogcalFontInstance instead of the fallback level. I don't know if
glyphs are evicted from the cache, if the fallback changes. There
is now an assert and all places will use 1.0 as the default
scaling factor, so LO should at least not crash.
Change-Id: I9dd4fc3a5b5924fc379b48a7f71c9eed26b4779d
Reviewed-on: https://gerrit.libreoffice.org/60091
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/win/gdi/salgdi.cxx')
| -rw-r--r-- | vcl/win/gdi/salgdi.cxx | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/vcl/win/gdi/salgdi.cxx b/vcl/win/gdi/salgdi.cxx index 78961ddaa8ba..46155bbef3dc 100644 --- a/vcl/win/gdi/salgdi.cxx +++ b/vcl/win/gdi/salgdi.cxx @@ -608,7 +608,6 @@ WinSalGraphics::WinSalGraphics(WinSalGraphics::Type eType, bool bScreen, HWND hW mbWindow(eType == WinSalGraphics::WINDOW), mbScreen(bScreen), mhWnd(hWnd), - mfCurrentFontScale(1.0), mhRegion(nullptr), mhDefPen(nullptr), mhDefBrush(nullptr), @@ -626,7 +625,6 @@ WinSalGraphics::WinSalGraphics(WinSalGraphics::Type eType, bool bScreen, HWND hW { mhFonts[ i ] = nullptr; mpWinFontEntry[ i ] = nullptr; - mfFontScale[ i ] = 1.0; } } |