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 --- forms/source/richtext/richtextimplcontrol.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'forms') diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx index 8eb2ae6a9343..24c5b0492214 100644 --- a/forms/source/richtext/richtextimplcontrol.cxx +++ b/forms/source/richtext/richtextimplcontrol.cxx @@ -440,7 +440,7 @@ namespace frm m_pVScroll->SetVisibleSize( aViewportPlaygroundLogic.Height() ); // the default height of a text line .... - long nFontHeight = m_pEngine->GetStandardFont(0).GetSize().Height(); + long nFontHeight = m_pEngine->GetStandardFont(0).GetFontSize().Height(); // ... is the scroll size for the vertical scrollbar m_pVScroll->SetLineSize( nFontHeight ); // the viewport width, minus one line, is the page scroll size @@ -452,7 +452,7 @@ namespace frm { m_pHScroll->SetVisibleSize( aViewportPlaygroundLogic.Width() ); - long nFontWidth = m_pEngine->GetStandardFont(0).GetSize().Width(); + long nFontWidth = m_pEngine->GetStandardFont(0).GetFontSize().Width(); if ( !nFontWidth ) { m_pViewport->Push( PushFlags::FONT ); -- cgit