summaryrefslogtreecommitdiff
path: root/vcl/unx/generic
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2019-11-20 15:37:11 +0100
committerLuboš Luňák <l.lunak@collabora.com>2019-11-27 09:55:18 +0100
commitd9879200ca3c0167b982ffecfa927bfac46b94c6 (patch)
tree3974b0c552e9da6dbf39bb044a79dd450add69d1 /vcl/unx/generic
parent6a0f8d88053bd7d33bc7d2032fb682f5579d10d0 (diff)
handle properly true 32bit bitmaps in some places
I.e. those created with vcl::BackendCapabilities::mbSupportsBitmap32 set. But there are quite possibly many more places that do not expect that the Bitmap itself would contain alpha. Change-Id: I83db37b3d346f42565f96b9bbf81c71b97b6bf8b
Diffstat (limited to 'vcl/unx/generic')
-rw-r--r--vcl/unx/generic/window/salframe.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 8ac555009541..8b8f029b1897 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -261,6 +261,7 @@ static void CreateNetWmAppIcon( sal_uInt16 nIcon, NetWmIconData& netwm_icon )
if( aIcon.IsEmpty())
continue;
+ vcl::bitmap::convertBitmap32To24Plus8(aIcon, aIcon);
Bitmap icon = aIcon.GetBitmap();
AlphaMask mask;
switch( aIcon.GetTransparentType())