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/directx | |
| 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/directx')
| -rw-r--r-- | canvas/source/directx/dx_textlayout_drawhelper.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx index cd5f5e903668..8de5f73afeee 100644 --- a/canvas/source/directx/dx_textlayout_drawhelper.cxx +++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx @@ -130,7 +130,7 @@ namespace dxcanvas // adjust to stretched font if(!::rtl::math::approxEqual(rFontMatrix.m00, rFontMatrix.m11)) { - const Size aSize = xVirtualDevice->GetFontMetric( aFont ).GetSize(); + const Size aSize = xVirtualDevice->GetFontMetric( aFont ).GetFontSize(); const double fDividend( rFontMatrix.m10 + rFontMatrix.m11 ); double fStretch = (rFontMatrix.m00 + rFontMatrix.m01); @@ -139,7 +139,7 @@ namespace dxcanvas const sal_Int32 nNewWidth = ::basegfx::fround( aSize.Width() * fStretch ); - aFont.SetWidth( nNewWidth ); + aFont.SetAverageFontWidth( nNewWidth ); } // set font @@ -259,7 +259,7 @@ namespace dxcanvas // adjust to stretched font if(!::rtl::math::approxEqual(rFontMatrix.m00, rFontMatrix.m11)) { - const Size aSize = xVirtualDevice->GetFontMetric( aFont ).GetSize(); + const Size aSize = xVirtualDevice->GetFontMetric( aFont ).GetFontSize(); const double fDividend( rFontMatrix.m10 + rFontMatrix.m11 ); double fStretch = (rFontMatrix.m00 + rFontMatrix.m01); @@ -268,7 +268,7 @@ namespace dxcanvas const sal_Int32 nNewWidth = ::basegfx::fround( aSize.Width() * fStretch ); - aFont.SetWidth( nNewWidth ); + aFont.SetAverageFontWidth( nNewWidth ); } // set font |