From 6e2a7571e8ee4960f54610ba790394202c4d7aed Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 3 Oct 2019 19:45:20 +0100 Subject: tdf#127529 vertical text not drawn in slideshow canvas MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit because the canvas text drawing impl falls back to using an OutputDevice view of the canvas to use the vcl text drawing apis to achieve vertical text To get an OutputDevice view of the canvas there is a specific VirtualDevice ctor available to create a VirtualDevice that, unlike the normal case, doesn't have its own specific backing buffer, but instead draws to the underlying target provided via the SystemGraphicsData arg The svp/gtk impl missed that understanding and provided an ordinary VirtualDevice with its own backing buffer, not a VirtualDevice that would draw to the expected target surface of the canvas. So the vertical text was drawn to a different surface than the intended one, and was just discarded. The cairo use in the canvas long precedes the use of cairo in vcl itself. Seeing as text is now rendered with cairo in all cases where the canvas uses cairo its probably now pointless for canvas to have its own text rendering path. Change-Id: Ie3b0a43ca2b746cbfe25e2d0415315b3d5403cd2 Reviewed-on: https://gerrit.libreoffice.org/80162 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- vcl/qt5/Qt5SvpSurface.cxx | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'vcl/qt5/Qt5SvpSurface.cxx') diff --git a/vcl/qt5/Qt5SvpSurface.cxx b/vcl/qt5/Qt5SvpSurface.cxx index 3e300755a992..21e0ca03b5b2 100644 --- a/vcl/qt5/Qt5SvpSurface.cxx +++ b/vcl/qt5/Qt5SvpSurface.cxx @@ -19,6 +19,18 @@ #include #include +namespace +{ +Size get_surface_size(cairo_surface_t* surface) +{ + cairo_t* cr = cairo_create(surface); + double x1, x2, y1, y2; + cairo_clip_extents(cr, &x1, &y1, &x2, &y2); + cairo_destroy(cr); + return Size(x2 - x1, y2 - y1); +} +} + namespace cairo { Qt5SvpSurface::Qt5SvpSurface(const CairoSurfaceSharedPtr& pSurface) @@ -65,8 +77,13 @@ void Qt5SvpSurface::flush() const VclPtr Qt5SvpSurface::createVirtualDevice() const { - //TODO allow creating a VirtualDevice to draw to the current surface - return VclPtrInstance(DeviceFormat::DEFAULT); + SystemGraphicsData aSystemGraphicsData; + + aSystemGraphicsData.nSize = sizeof(SystemGraphicsData); + aSystemGraphicsData.pSurface = m_pSurface.get(); + + return VclPtr::Create(aSystemGraphicsData, get_surface_size(m_pSurface.get()), + DeviceFormat::DEFAULT); } } // namespace cairo -- cgit