diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-07-04 18:00:52 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-07-05 16:42:39 +0200 |
| commit | a5f95804c1a730fb393c33b49e6fbe0f5a5e9eac (patch) | |
| tree | 44ceb650ccfa1e7e5178d8902ceb6f088acf47af /include | |
| parent | 72bb13af1808b27a293e09a3ead2aadd049e9ec1 (diff) | |
tdf#134479 allow disable font preview to work on existing font comboboxes
not just newly created one.
you can only restore back to a text-only view, not a text+(icon/whatever) view
Change-Id: Ic3becd7a942ee6b1dbabb57eebf1e25d1b626fdb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97991
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svtools/ctrlbox.hxx | 3 | ||||
| -rw-r--r-- | include/vcl/toolkit/combobox.hxx | 1 | ||||
| -rw-r--r-- | include/vcl/weld.hxx | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index 301a9c13047f..1c3185915b7d 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -353,7 +353,8 @@ public: void Fill( const FontList* pList ); - void EnableWYSIWYG(); + void EnableWYSIWYG(bool bEnable); + bool IsWYSIWYGEnabled() const { return mbWYSIWYG; } void connect_changed(const Link<weld::ComboBox&, void>& rLink) { m_xComboBox->connect_changed(rLink); } void connect_focus_in(const Link<weld::Widget&, void>& rLink) { m_xComboBox->connect_focus_in(rLink); } diff --git a/include/vcl/toolkit/combobox.hxx b/include/vcl/toolkit/combobox.hxx index a3c4e1cee5b3..611bce590add 100644 --- a/include/vcl/toolkit/combobox.hxx +++ b/include/vcl/toolkit/combobox.hxx @@ -102,6 +102,7 @@ public: void SetUserItemSize( const Size& rSz ); void EnableUserDraw( bool bUserDraw ); + bool IsUserDrawEnabled() const; void DrawEntry( const UserDrawEvent& rEvt ); void SetBorderStyle( WindowBorderStyle nBorderStyle ); diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index cad56785acb2..cae26c1ffccf 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -732,7 +732,7 @@ public: } void connect_custom_render(const Link<render_args, void>& rLink) { m_aRenderHdl = rLink; } // call set_custom_renderer after setting custom callbacks - virtual void set_custom_renderer() = 0; + virtual void set_custom_renderer(bool bOn) = 0; // create a virtual device compatible with the device passed in render_args wrt alpha virtual VclPtr<VirtualDevice> create_render_virtual_device() const = 0; // set a sub menu for a entry, only works with custom rendering |