[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/app/salvtables.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 41b5b34b439c451ac5dc4479eef6573a465eb00f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Jul 10 12:05:30 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jul 10 15:14:02 2020 +0200

    tdf#134601 set entry font as combobox control font to take effect
    
    Change-Id: I8cac0ebcd99fbfcd800074cc0d9acd924659753a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98494
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index e69afccb08cd..901d7c9b8d1e 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -6067,6 +6067,7 @@ void SalInstanceComboBoxWithEdit::set_entry_font(const vcl::Font& rFont)
     Edit* pEdit = m_xComboBox->GetSubEdit();
     assert(pEdit);
     pEdit->SetPointFont(*pEdit, rFont);
+    m_xComboBox->SetControlFont(rFont); // tdf#134601 set it as control font to take effect properly
     pEdit->Invalidate();
 }