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

[Szymon Kłos (via logerrit)]

 svtools/source/control/ctrlbox.cxx |    5 ++++-
 vcl/jsdialog/jsdialogbuilder.cxx   |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit f232b5945151e911db1e37c64e38ca1ed2c95854
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Thu Aug 24 10:54:28 2023 +0200
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Tue Aug 29 15:15:29 2023 +0200

    jsdialog: make font previews background transparent
    
    Change-Id: I9dc75ab91f591191be7a354274a0783b0fd093b0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156029
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156244
    Tested-by: Jenkins

diff --git a/svtools/source/control/ctrlbox.cxx 
b/svtools/source/control/ctrlbox.cxx
index b33051f7c911..f07041f4a423 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::WITH_ALPHA));
+            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 997cf90d45bf..2e0fc28e544b 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1663,7 +1663,7 @@ bool JSComboBox::changed_by_direct_pick() const { return 
true; }
 
 void JSComboBox::render_entry(int pos)
 {
-    ScopedVclPtrInstance<VirtualDevice> pDevice;
+    ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::WITH_ALPHA);
     Size aRenderSize = signal_custom_get_size(*pDevice);
     pDevice->SetOutputSize(aRenderSize);