Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix converting wxBitmap to wxImage on wxGTK2

Browse Source 
wxBitmap can have both a mask and alpha channel so resulting wxImage
also can have both.
This commit is contained in:
Artur Wieczorek
2021-01-12 23:35:19 +01:00
parent 030664c148
commit b1467ae608
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gtk/bitmap.cpp
View File

@@ -883,8 +883,8 @@ wxImage wxBitmap::ConvertToImage() const
if (pixmap_invert != NULL) if (pixmap_invert != NULL)
g_object_unref(pixmap_invert); g_object_unref(pixmap_invert);
} }
// convert mask, unless there is already alpha // convert mask, even there is already alpha. Image can have both.
if (GetMask() && !image.HasAlpha()) if ( GetMask() )
{ {
// we hard code the mask colour for now but we could also make an // we hard code the mask colour for now but we could also make an
// effort (and waste time) to choose a colour not present in the // effort (and waste time) to choose a colour not present in the