Kaydet (Commit) 106e7aca authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Miklos Vajna

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: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
(cherry picked from commit 9a923e1c)
Reviewed-on: https://gerrit.libreoffice.org/67487Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.com>
üst 9d7baded
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment