diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-06-22 11:47:29 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-07-12 10:54:13 +0200 |
| commit | eb9e447bb0fe49d931ceed85dc0e3f8222b945cb (patch) | |
| tree | 982ecff6b007bf2f8044926d1d5626d874145062 /vcl/unx | |
| parent | d9fb589b0c152fa69832df373995d160b4ef1468 (diff) | |
Resolves: tdf#108452 gtk3 xbm cursors invisible on black bg
Change-Id: I5c9b27862da6ac76ae38542f85a51f9aefdd013d
Reviewed-on: https://gerrit.libreoffice.org/39113
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 57272e5476d15d355018883c1cc9762d785d967c)
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkdata.cxx | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx index f911d384253e..b2c298bd81d5 100644 --- a/vcl/unx/gtk3/gtk3gtkdata.cxx +++ b/vcl/unx/gtk3/gtk3gtkdata.cxx @@ -170,13 +170,22 @@ GdkCursor* GtkSalDisplay::getFromXBM( const unsigned char *pBitmap, int nWidth, int nHeight, int nXHot, int nYHot ) { - int cairo_stride = cairo_format_stride_for_width(CAIRO_FORMAT_A1, nWidth); + cairo_surface_t *source = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, nWidth, nHeight); + cairo_t *cr = cairo_create(source); + cairo_set_source_rgba(cr, 1, 1, 1, 1); + cairo_paint(cr); + + const int cairo_stride = cairo_format_stride_for_width(CAIRO_FORMAT_A1, nWidth); unsigned char *pPaddedXBM = ensurePaddedForCairo(pBitmap, nWidth, nHeight, cairo_stride); - cairo_surface_t *source = cairo_image_surface_create_for_data( + cairo_surface_t *xbm = cairo_image_surface_create_for_data( pPaddedXBM, CAIRO_FORMAT_A1, nWidth, nHeight, cairo_stride); + cairo_set_source_rgba(cr, 0, 0, 0, 1); + cairo_mask_surface(cr, xbm, 0, 0); + cairo_surface_destroy(xbm); + cairo_destroy(cr); unsigned char *pPaddedMaskXBM = ensurePaddedForCairo(pMask, nWidth, nHeight, cairo_stride); cairo_surface_t *mask = cairo_image_surface_create_for_data( @@ -184,10 +193,12 @@ GdkCursor* GtkSalDisplay::getFromXBM( const unsigned char *pBitmap, CAIRO_FORMAT_A1, nWidth, nHeight, cairo_stride); - cairo_surface_t *s = cairo_surface_create_similar(source, CAIRO_CONTENT_ALPHA, nWidth, nHeight); - cairo_t *cr = cairo_create(s); + cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, nWidth, nHeight); + cr = cairo_create(s); cairo_set_source_surface(cr, source, 0, 0); cairo_mask_surface(cr, mask, 0, 0); + cairo_surface_destroy(mask); + cairo_surface_destroy(source); cairo_destroy(cr); #if GTK_CHECK_VERSION(3,10,0) @@ -199,8 +210,6 @@ GdkCursor* GtkSalDisplay::getFromXBM( const unsigned char *pBitmap, #endif cairo_surface_destroy(s); - cairo_surface_destroy(mask); - cairo_surface_destroy(source); if (pPaddedMaskXBM != pMask) delete [] pPaddedMaskXBM; |