diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-03 10:13:00 +1100 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-04 03:17:26 +0000 |
commit | 697d445ed0c7b60e463243db89af32e2145b475b (patch) | |
tree | 5a74d57cdc97f82bc78a686dee345a229a082a72 /canvas/source/cairo/cairo_canvasfont.cxx | |
parent | 91a7580e03d5b47c6e2513afce85ddee45e730b6 (diff) |
vcl: take into account the font width is the average font width
I'm changing the Font class function names:
- SetSize -> SetFontSize
- GetSize -> GetFontSize
- SetHeight -> SetFontHeight
- GetHeight -> GetFontHeight
- SetWidth -> SetAverageFontWidth
- GetWidth -> GetAverageFontWidth
That's because it really makes no sense to say that there is a
single constant font width because obviously proportional fonts
don't have one - the best we can do is an average font width,
which is what folks like Microsoft sort of do already. On a fixed
font, the average is still accurate, for obvious reasons :-)
I'm also not a fan of GetSize/SetSize as I find it a might too
generic.
Change-Id: Ib80a604ba62d6883fd6cbc7994da763976be5c70
Reviewed-on: https://gerrit.libreoffice.org/22069
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'canvas/source/cairo/cairo_canvasfont.cxx')
-rw-r--r-- | canvas/source/cairo/cairo_canvasfont.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/canvas/source/cairo/cairo_canvasfont.cxx b/canvas/source/cairo/cairo_canvasfont.cxx index 505ebd2acf01..8aca75baa26a 100644 --- a/canvas/source/cairo/cairo_canvasfont.cxx +++ b/canvas/source/cairo/cairo_canvasfont.cxx @@ -68,7 +68,7 @@ namespace cairocanvas const bool bOldMapState( pOutDev->IsMapModeEnabled() ); pOutDev->EnableMapMode(false); - const Size aSize = pOutDev->GetFontMetric( *maFont ).GetSize(); + const Size aSize = pOutDev->GetFontMetric( *maFont ).GetFontSize(); const double fDividend( rFontMatrix.m10 + rFontMatrix.m11 ); double fStretch = (rFontMatrix.m00 + rFontMatrix.m01); @@ -78,7 +78,7 @@ namespace cairocanvas const long nNewWidth = ::basegfx::fround( aSize.Width() * fStretch ); - maFont->SetWidth( nNewWidth ); + maFont->SetAverageFontWidth( nNewWidth ); pOutDev->EnableMapMode(bOldMapState); } |