summaryrefslogtreecommitdiff
path: root/vcl/unx
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 /vcl/unx
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 'vcl/unx')
-rw-r--r--vcl/unx/generic/app/i18n_status.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx
index ef1c3f9c71ec..eda878510b6f 100644
--- a/vcl/unx/generic/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -145,7 +145,7 @@ void XIMStatusWindow::layout()
{
m_aWindowSize.Width() = m_aStatusText->GetTextWidth( m_aStatusText->GetText() )+8;
Font aFont( m_aStatusText->GetFont() );
- m_aWindowSize.Height() = aFont.GetHeight()+10;
+ m_aWindowSize.Height() = aFont.GetFontHeight()+10;
m_aWindowSize = LogicToPixel( m_aWindowSize );
Size aControlSize( m_aWindowSize );
@@ -371,7 +371,7 @@ IIIMPStatusWindow::IIIMPStatusWindow( SalFrame* pParent, bool bOn ) :
void IIIMPStatusWindow::layout()
{
Font aFont( m_aStatusBtn->GetFont() );
- Size aSize( 15*aFont.GetHeight(), aFont.GetHeight()+14 );
+ Size aSize( 15*aFont.GetFontHeight(), aFont.GetFontHeight()+14 );
aSize = m_aStatusBtn->LogicToPixel( aSize );
m_aStatusBtn->SetPosSizePixel( Point( 0, 0 ), aSize );