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 /chart2 | |
| 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 'chart2')
| -rw-r--r-- | chart2/source/view/main/3DChartObjects.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/view/main/DummyXShape.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chart2/source/view/main/3DChartObjects.cxx b/chart2/source/view/main/3DChartObjects.cxx index 74856d55b216..737ebf4066c3 100644 --- a/chart2/source/view/main/3DChartObjects.cxx +++ b/chart2/source/view/main/3DChartObjects.cxx @@ -83,7 +83,7 @@ const TextCacheItem& TextCache::getText(OUString const & rText, bool bIs3dText) aFont = vcl::Font("Brillante St",Size(0,0)); else aFont = pDevice->GetFont(); - aFont.SetSize(Size(0, 96)); + aFont.SetFontSize(Size(0, 96)); aFont.SetColor(COL_GREEN); // RGB_COLORDATA(0xf0, 0xf0, 0xf0)); pDevice->SetFont(aFont); pDevice->Erase(); diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx index 955ea05c4e9e..99bb50820ddb 100644 --- a/chart2/source/view/main/DummyXShape.cxx +++ b/chart2/source/view/main/DummyXShape.cxx @@ -767,7 +767,7 @@ struct FontAttribSetter else if(rPropName == "CharHeight") { float fHeight = rProp.second.get<float>(); - mrFont.SetSize(Size(0,(fHeight*127+36)/72)); //taken from the MCW implementation + mrFont.SetFontSize(Size(0,(fHeight*127+36)/72)); //taken from the MCW implementation } else if(rPropName == "CharUnderline") { @@ -784,7 +784,7 @@ struct FontAttribSetter { float fWidth = rProp.second.get<float>(); FontWidth eFontWidth = VCLUnoHelper::ConvertFontWidth(fWidth); - mrFont.SetWidth(eFontWidth); + mrFont.SetAverageFontWidth(eFontWidth); } } private: |