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 /toolkit | |
| 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 'toolkit')
| -rw-r--r-- | toolkit/source/helper/vclunohelper.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx index 9c0f76f2002a..0e8f618a9925 100644 --- a/toolkit/source/helper/vclunohelper.cxx +++ b/toolkit/source/helper/vclunohelper.cxx @@ -365,8 +365,8 @@ css::awt::FontDescriptor VCLUnoHelper::CreateFontDescriptor( const vcl::Font& rF css::awt::FontDescriptor aFD; aFD.Name = rFont.GetFamilyName(); aFD.StyleName = rFont.GetStyleName(); - aFD.Height = (sal_Int16)rFont.GetSize().Height(); - aFD.Width = (sal_Int16)rFont.GetSize().Width(); + aFD.Height = (sal_Int16)rFont.GetFontSize().Height(); + aFD.Width = (sal_Int16)rFont.GetFontSize().Width(); aFD.Family = sal::static_int_cast< sal_Int16 >(rFont.GetFamilyType()); aFD.CharSet = rFont.GetCharSet(); aFD.Pitch = sal::static_int_cast< sal_Int16 >(rFont.GetPitch()); @@ -390,7 +390,7 @@ vcl::Font VCLUnoHelper::CreateFont( const css::awt::FontDescriptor& rDescr, cons if ( !rDescr.StyleName.isEmpty() ) aFont.SetStyleName( rDescr.StyleName ); if ( rDescr.Height ) - aFont.SetSize( Size( rDescr.Width, rDescr.Height ) ); + aFont.SetFontSize( Size( rDescr.Width, rDescr.Height ) ); if ( (FontFamily)rDescr.Family != FAMILY_DONTKNOW ) aFont.SetFamily( (FontFamily)rDescr.Family ); if ( (rtl_TextEncoding)rDescr.CharSet != RTL_TEXTENCODING_DONTKNOW ) |