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 --- svtools/source/control/tabbar.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'svtools/source/control/tabbar.cxx') diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 307987955451..2fa74ceddc7e 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -638,9 +638,9 @@ void TabBar::ImplInitSettings( bool bFont, bool bBackground ) while (GetTextHeight() > (GetOutputSizePixel().Height() - 1)) { vcl::Font aFont = GetFont(); - if (aFont.GetHeight() <= 6) + if (aFont.GetFontHeight() <= 6) break; - aFont.SetHeight(aFont.GetHeight() - 1); + aFont.SetFontHeight(aFont.GetFontHeight() - 1); SetFont(aFont); } } @@ -723,7 +723,7 @@ bool TabBar::ImplCalcWidth() } // Padding is dependent on font height - bigger font = bigger padding - long nFontWidth = aFont.GetHeight(); + long nFontWidth = aFont.GetFontHeight(); nNewWidth += nFontWidth * 2; if (pItem->mnWidth != nNewWidth) -- cgit