svtools/source/control/ctrlbox.cxx | 5 ++++- vcl/jsdialog/jsdialogbuilder.cxx | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-)
New commits: commit 11dbab9221c5340cf742324fe961a6956a5a68ce Author: Szymon Kłos <[email protected]> AuthorDate: Thu Aug 24 10:54:28 2023 +0200 Commit: Szymon Kłos <[email protected]> CommitDate: Mon Aug 28 16:26:22 2023 +0200 jsdialog: make font previews background transparent Change-Id: I9dc75ab91f591191be7a354274a0783b0fd093b0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156029 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Reviewed-by: Szymon Kłos <[email protected]> diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 7cba59c1cc13..6fab9eb6a0f8 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -777,7 +777,10 @@ OutputDevice& FontNameBox::CachePreview(size_t nIndex, Point* pTopLeft) { if (nPage >= gFontPreviewVirDevs.size()) { - gFontPreviewVirDevs.emplace_back(m_xComboBox->create_render_virtual_device()); + if (comphelper::LibreOfficeKit::isActive()) + gFontPreviewVirDevs.emplace_back(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT, DeviceFormat::DEFAULT)); + else + gFontPreviewVirDevs.emplace_back(m_xComboBox->create_render_virtual_device()); VirtualDevice& rDevice = *gFontPreviewVirDevs.back(); rDevice.SetOutputSizePixel(Size(gUserItemSz.Width(), gUserItemSz.Height() * gPreviewsPerDevice)); weld::SetPointFont(rDevice, m_xComboBox->get_font()); diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx index 8b36068d48a0..945918f78b12 100644 --- a/vcl/jsdialog/jsdialogbuilder.cxx +++ b/vcl/jsdialog/jsdialogbuilder.cxx @@ -1683,7 +1683,7 @@ bool JSComboBox::changed_by_direct_pick() const { return true; } void JSComboBox::render_entry(int pos) { - ScopedVclPtrInstance<VirtualDevice> pDevice; + ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::DEFAULT, DeviceFormat::DEFAULT); Size aRenderSize = signal_custom_get_size(*pDevice); pDevice->SetOutputSize(aRenderSize);
