diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-02-06 14:27:25 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-02-08 15:47:56 +0100 |
| commit | 106e7acab6e31e1e0cee40716335f2b758d6186b (patch) | |
| tree | 859de9fe7ce84b694ae279986ada97eb61320a37 | |
| parent | 9d7baded9f315096f247af15a23fd899fc4facc3 (diff) | |
tdf#115941 use same font statusbar does for form navigator bar
now that we have it the same height as a statusbar
Change-Id: I0d5ee3f8dc57e94be5d45581bc4382e3448353c3
Reviewed-on: https://gerrit.libreoffice.org/67462
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 9a923e1ce53753bb8538054fd1658a67ca0ff354)
Reviewed-on: https://gerrit.libreoffice.org/67487
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
| -rw-r--r-- | svx/source/fmcomp/gridctrl.cxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 997250cf8ea9..ea37f509f0af 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -434,14 +434,9 @@ sal_uInt16 DbGridControl::NavigationBar::ArrangeControls() sal_uInt16 nX = 1; sal_uInt16 nY = 0; - // Is the font of this edit larger than the field? - if (m_aAbsolute->GetTextHeight() > nH) { - vcl::Font aApplFont (m_aAbsolute->GetFont()); - const Size pointAbsoluteSize(m_aAbsolute->PixelToLogic( Size( 0, nH - 2 ), MapMode(MapUnit::MapPoint) )); - aApplFont.SetFontSize( pointAbsoluteSize ); + vcl::Font aApplFont(GetSettings().GetStyleSettings().GetToolFont()); m_aAbsolute->SetControlFont( aApplFont ); - aApplFont.SetTransparent( true ); m_aRecordText->SetControlFont( aApplFont ); m_aRecordOf->SetControlFont( aApplFont ); @@ -817,7 +812,7 @@ void DbGridControl::NavigationBar::StateChanged(StateChangedType nType) Fraction aZoom = GetZoom(); // not all of these controls need to know the new zoom, but to be sure ... - vcl::Font aFont(GetSettings().GetStyleSettings().GetFieldFont()); + vcl::Font aFont(GetSettings().GetStyleSettings().GetToolFont()); if (IsControlFont()) aFont.Merge(GetControlFont()); @@ -1115,7 +1110,7 @@ void DbGridControl::ImplInitWindow( const InitWindowFacet _eInitWhat ) { if ( m_bNavigationBar ) { - vcl::Font aFont = m_aBar->GetSettings().GetStyleSettings().GetFieldFont(); + vcl::Font aFont = m_aBar->GetSettings().GetStyleSettings().GetToolFont(); if ( IsControlFont() ) m_aBar->SetControlFont( GetControlFont() ); else |