diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-10-04 10:35:34 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-10-04 12:42:27 +0200 |
| commit | 952a678634461f741ee4ef2082d591a162a7f71c (patch) | |
| tree | 2f00c8dea15320a2800351ed9b91a91341e70e36 /vcl/source | |
| parent | 93d2d55b1df6bc850d6beecbabf1fb602abe9809 (diff) | |
Related: tdf#141633 similiarly support match combo/listbox font sizes
to the desired zoomed font size in the table control
Change-Id: Iaf3b004544fdb0311b6c67baad612ba648e8c546
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123043
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/app/salvtables.cxx | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 855012c327ab..58e1cba83ad6 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -6226,6 +6226,12 @@ void SalInstanceComboBoxWithoutEdit::copy_entry_clipboard() { assert(false); } void SalInstanceComboBoxWithoutEdit::paste_entry_clipboard() { assert(false); } +void SalInstanceComboBoxWithoutEdit::set_font(const vcl::Font& rFont) +{ + m_xComboBox->SetControlFont(rFont); + m_xComboBox->Invalidate(); +} + void SalInstanceComboBoxWithoutEdit::set_entry_font(const vcl::Font&) { assert(false); } vcl::Font SalInstanceComboBoxWithoutEdit::get_entry_font() @@ -6387,12 +6393,20 @@ bool SalInstanceComboBoxWithEdit::get_entry_selection_bounds(int& rStartPos, int return rSelection.Len(); } -void SalInstanceComboBoxWithEdit::set_entry_font(const vcl::Font& rFont) +void SalInstanceComboBoxWithEdit::set_font(const vcl::Font& rFont) { - m_xComboBox->SetControlFont(rFont); // tdf#134601 set it as control font to take effect properly + m_xComboBox->SetControlFont(rFont); m_xComboBox->Invalidate(); } +void SalInstanceComboBoxWithEdit::set_entry_font(const vcl::Font& rFont) +{ + Edit* pEdit = m_xComboBox->GetSubEdit(); + assert(pEdit); + pEdit->SetControlFont(rFont); // tdf#134601 set it as control font to take effect properly + pEdit->Invalidate(); +} + vcl::Font SalInstanceComboBoxWithEdit::get_entry_font() { Edit* pEdit = m_xComboBox->GetSubEdit(); @@ -6521,12 +6535,9 @@ public: rEntry.SetAutocompleteHdl(Link<Edit&, void>()); } - virtual void set_entry_font(const vcl::Font& rFont) override - { - Edit& rEntry = m_pEntry->getEntry(); - rEntry.SetControlFont(rFont); - rEntry.Invalidate(); - } + virtual void set_font(const vcl::Font&) override { assert(false && "not implemented"); } + + virtual void set_entry_font(const vcl::Font& rFont) override { m_pEntry->set_font(rFont); } virtual vcl::Font get_entry_font() override { |