[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/source

[Caolán McNamara (via logerrit)]

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

New commits:
commit b66b80485d855767a78e688e9e989ca0b104e0d8
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:00:11 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/+/98458
    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 930590fb7dc7..ccfe3ac7d542 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -5897,6 +5897,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();
 }