|
 |
1f3e801 |
From 63d5cc018d268a8d269cb2353ddaeb68fc74d64c Mon Sep 17 00:00:00 2001
|
|
|
1f3e801 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
1f3e801 |
Date: Mon, 30 Nov 2015 10:22:46 +0000
|
|
|
1f3e801 |
Subject: [PATCH] gtk3: implement SAL_INVERT_50 rectangle case
|
|
|
1f3e801 |
|
|
|
1f3e801 |
missing stipple effect around slides in layout panel
|
|
|
1f3e801 |
|
|
|
1f3e801 |
(cherry picked from commit a80dea3e77c2a8465cdd309c5f740fb8102dd826)
|
|
|
1f3e801 |
(cherry picked from commit 442d064188a2d50406e485d033accfffe4bd54e9)
|
|
|
1f3e801 |
|
|
|
1f3e801 |
Change-Id: I8a55c6bda1e742e105ba22e4566658099ea16f46
|
|
|
1f3e801 |
---
|
|
|
1f3e801 |
vcl/headless/svpgdi.cxx | 73 +++++++++++++++++++++++++++++++++++++++++++++++--
|
|
|
1f3e801 |
1 file changed, 71 insertions(+), 2 deletions(-)
|
|
|
1f3e801 |
|
|
|
1f3e801 |
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
|
|
|
1f3e801 |
index 06030d9..0afce7e 100644
|
|
|
1f3e801 |
--- a/vcl/headless/svpgdi.cxx
|
|
|
1f3e801 |
+++ b/vcl/headless/svpgdi.cxx
|
|
|
1f3e801 |
@@ -913,9 +913,76 @@ SalColor SvpSalGraphics::getPixel( long nX, long nY )
|
|
|
1f3e801 |
return aColor.toInt32();
|
|
|
1f3e801 |
}
|
|
|
1f3e801 |
|
|
|
1f3e801 |
-void SvpSalGraphics::invert( long nX, long nY, long nWidth, long nHeight, SalInvert /*nFlags*/ )
|
|
|
1f3e801 |
+namespace
|
|
|
1f3e801 |
{
|
|
|
1f3e801 |
- // FIXME: handle SAL_INVERT_50 and SAL_INVERT_TRACKFRAME
|
|
|
1f3e801 |
+ cairo_pattern_t * create_stipple()
|
|
|
1f3e801 |
+ {
|
|
|
1f3e801 |
+ static unsigned char data[16] = { 0xFF, 0xFF, 0x00, 0x00,
|
|
|
1f3e801 |
+ 0xFF, 0xFF, 0x00, 0x00,
|
|
|
1f3e801 |
+ 0x00, 0x00, 0xFF, 0xFF,
|
|
|
1f3e801 |
+ 0x00, 0x00, 0xFF, 0xFF };
|
|
|
1f3e801 |
+ cairo_surface_t* surface = cairo_image_surface_create_for_data(data, CAIRO_FORMAT_A8, 4, 4, 4);
|
|
|
1f3e801 |
+ cairo_pattern_t* pattern = cairo_pattern_create_for_surface(surface);
|
|
|
1f3e801 |
+ cairo_surface_destroy(surface);
|
|
|
1f3e801 |
+ cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REPEAT);
|
|
|
1f3e801 |
+ cairo_pattern_set_filter(pattern, CAIRO_FILTER_NEAREST);
|
|
|
1f3e801 |
+ return pattern;
|
|
|
1f3e801 |
+ }
|
|
|
1f3e801 |
+}
|
|
|
1f3e801 |
+
|
|
|
1f3e801 |
+void SvpSalGraphics::invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags )
|
|
|
1f3e801 |
+{
|
|
|
1f3e801 |
+#if ENABLE_CAIRO_CANVAS
|
|
|
1f3e801 |
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
|
|
|
1f3e801 |
+ // FIXME: handle SAL_INVERT_TRACKFRAME
|
|
|
1f3e801 |
+ if ( nFlags & SAL_INVERT_TRACKFRAME )
|
|
|
1f3e801 |
+ {
|
|
|
1f3e801 |
+ SAL_WARN("vcl.gdi", "SvpSalGraphics::invert, unhandled SAL_INVERT_TRACKFRAME");
|
|
|
1f3e801 |
+ }
|
|
|
1f3e801 |
+ else if ( nFlags & SAL_INVERT_50 )
|
|
|
1f3e801 |
+ {
|
|
|
1f3e801 |
+ if (cairo_t* cr = createCairoContext(m_aDevice))
|
|
|
1f3e801 |
+ {
|
|
|
1f3e801 |
+ if (!m_aDevice->isTopDown())
|
|
|
1f3e801 |
+ {
|
|
|
1f3e801 |
+ cairo_scale(cr, 1, -1.0);
|
|
|
1f3e801 |
+ cairo_translate(cr, 0.0, -m_aDevice->getSize().getY());
|
|
|
1f3e801 |
+ }
|
|
|
1f3e801 |
+
|
|
|
1f3e801 |
+ clipRegion(cr);
|
|
|
1f3e801 |
+
|
|
|
1f3e801 |
+ cairo_pattern_t *pattern = create_stipple();
|
|
|
1f3e801 |
+
|
|
|
1f3e801 |
+ cairo_rectangle_int_t extents;
|
|
|
1f3e801 |
+ basebmp::IBitmapDeviceDamageTrackerSharedPtr xDamageTracker(m_aDevice->getDamageTracker());
|
|
|
1f3e801 |
+
|
|
|
1f3e801 |
+ cairo_rectangle(cr, nX, nY, nWidth, nHeight);
|
|
|
1f3e801 |
+
|
|
|
1f3e801 |
+ if (xDamageTracker)
|
|
|
1f3e801 |
+ extents = getFillDamage(cr);
|
|
|
1f3e801 |
+
|
|
|
1f3e801 |
+ cairo_clip(cr);
|
|
|
1f3e801 |
+
|
|
|
1f3e801 |
+ cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
|
|
|
1f3e801 |
+ cairo_set_operator(cr, CAIRO_OPERATOR_DIFFERENCE);
|
|
|
1f3e801 |
+ cairo_mask(cr, pattern);
|
|
|
1f3e801 |
+ cairo_pattern_destroy(pattern);
|
|
|
1f3e801 |
+
|
|
|
1f3e801 |
+ cairo_surface_flush(cairo_get_target(cr));
|
|
|
1f3e801 |
+ cairo_destroy(cr); // unref
|
|
|
1f3e801 |
+
|
|
|
1f3e801 |
+ return;
|
|
|
1f3e801 |
+ }
|
|
|
1f3e801 |
+ else
|
|
|
1f3e801 |
+ SAL_WARN("vcl.gdi", "SvpSalGraphics::invert unhandled XOR (?)");
|
|
|
1f3e801 |
+ }
|
|
|
1f3e801 |
+ else
|
|
|
1f3e801 |
+ {
|
|
|
1f3e801 |
+ SAL_WARN("vcl.gdi", "SvpSalGraphics::invert, unhandled SAL_INVERT_TRACKFRAME");
|
|
|
1f3e801 |
+ }
|
|
|
1f3e801 |
+#endif
|
|
|
1f3e801 |
+#endif
|
|
|
1f3e801 |
+
|
|
|
1f3e801 |
basegfx::B2DPolygon aRect = basegfx::tools::createPolygonFromRect( basegfx::B2DRectangle( nX, nY, nX+nWidth, nY+nHeight ) );
|
|
|
1f3e801 |
basegfx::B2DPolyPolygon aPolyPoly( aRect );
|
|
|
1f3e801 |
basegfx::B2IBox aDestRange( nX, nY, nX + nWidth, nY + nHeight );
|
|
|
1f3e801 |
@@ -928,6 +995,8 @@ void SvpSalGraphics::invert( long nX, long nY, long nWidth, long nHeight, SalInv
|
|
|
1f3e801 |
|
|
|
1f3e801 |
void SvpSalGraphics::invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert /*nFlags*/ )
|
|
|
1f3e801 |
{
|
|
|
1f3e801 |
+ SAL_WARN("vcl.gdi", "SvpSalGraphics::invert, unhandled points case");
|
|
|
1f3e801 |
+
|
|
|
1f3e801 |
// FIXME: handle SAL_INVERT_50 and SAL_INVERT_TRACKFRAME
|
|
|
1f3e801 |
basegfx::B2DPolygon aPoly;
|
|
|
1f3e801 |
aPoly.append( basegfx::B2DPoint( pPtAry->mnX, pPtAry->mnY ), nPoints );
|
|
|
1f3e801 |
--
|
|
|
1f3e801 |
2.5.0
|
|
|
1f3e801 |
|