summaryrefslogtreecommitdiff
path: root/include/vcl/metric.hxx
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2016-02-03 10:13:00 +1100
committerChris Sherlock <chris.sherlock79@gmail.com>2016-02-04 03:17:26 +0000
commit697d445ed0c7b60e463243db89af32e2145b475b (patch)
tree5a74d57cdc97f82bc78a686dee345a229a082a72 /include/vcl/metric.hxx
parent91a7580e03d5b47c6e2513afce85ddee45e730b6 (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 'include/vcl/metric.hxx')
-rw-r--r--include/vcl/metric.hxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index a263fdadd36b..3d9677507704 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -82,7 +82,7 @@ inline std::basic_ostream<charT, traits> & operator <<(
{
stream << "{"
<< "name=" << "\"" << rMetric.GetFamilyName() << "\""
- << ",size=(" << rMetric.GetSize().Width() << "," << rMetric.GetSize().Height() << ")"
+ << ",size=(" << rMetric.GetFontSize().Width() << "," << rMetric.GetFontSize().Height() << ")"
<< ",ascent=" << rMetric.GetAscent()
<< ",descent=" << rMetric.GetDescent()
<< ",intLeading=" << rMetric.GetInternalLeading()