From 697d445ed0c7b60e463243db89af32e2145b475b Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Wed, 3 Feb 2016 10:13:00 +1100 Subject: 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 Reviewed-by: Chris Sherlock --- svx/source/styles/CommonStylePreviewRenderer.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'svx/source/styles') diff --git a/svx/source/styles/CommonStylePreviewRenderer.cxx b/svx/source/styles/CommonStylePreviewRenderer.cxx index b67864354468..49f884abf470 100644 --- a/svx/source/styles/CommonStylePreviewRenderer.cxx +++ b/svx/source/styles/CommonStylePreviewRenderer.cxx @@ -146,7 +146,7 @@ bool CommonStylePreviewRenderer::recalculate() const SvxFontHeightItem* pFontHeightItem = static_cast(pItem); Size aFontSize(0, pFontHeightItem->GetHeight()); maPixelSize = Size(mrOutputDev.LogicToPixel(aFontSize, mrShell.GetMapUnit())); - pFont->SetSize(maPixelSize); + pFont->SetFontSize(maPixelSize); vcl::Font aOldFont(mrOutputDev.GetFont()); @@ -158,7 +158,7 @@ bool CommonStylePreviewRenderer::recalculate() double ratio = double(mnMaxHeight) / aTextRect.Bottom(); maPixelSize.Width() *= ratio; maPixelSize.Height() *= ratio; - pFont->SetSize(maPixelSize); + pFont->SetFontSize(maPixelSize); } mrOutputDev.SetFont(aOldFont); } @@ -202,7 +202,7 @@ bool CommonStylePreviewRenderer::render(const Rectangle& aRectangle, RenderAlign if (maFontColor != COL_AUTO) mrOutputDev.SetTextColor(maFontColor); - Size aPixelSize((m_pFont) ? maPixelSize : mrOutputDev.GetFont().GetSize()); + Size aPixelSize((m_pFont) ? maPixelSize : mrOutputDev.GetFont().GetFontSize()); Point aFontDrawPosition = aRectangle.TopLeft(); if (eRenderAlign == RenderAlign::CENTER) -- cgit