[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source

[Jan Holesovsky]

 vcl/source/control/fixed.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d0b03ab8c5e33b3b4d8127650e24aa550b13fa9f
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu Jun 18 10:25:31 2015 +0200

    rendercontext: Fix rendering of double-buffered fixed line.
    
    Change-Id: I809beb7187530cc30aca5dce8b2d4fb244554c55

diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 92ff28c..57741fb 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -515,7 +515,10 @@ const Color& FixedLine::GetCanonicalTextColor( const StyleSettings& _rStyle ) co
 
 void FixedLine::ImplDraw(vcl::RenderContext& rRenderContext, bool bLayout)
 {
-    Size aOutSize = rRenderContext.GetOutputSizePixel();
+    // we need to measure according to the window, not according to the
+    // RenderContext we paint to
+    Size aOutSize = GetOutputSizePixel();
+
     OUString aText = GetText();
     WinBits nWinStyle = GetStyle();
     MetricVector* pVector = bLayout ? &mpControlData->mpLayoutData->m_aUnicodeBoundRects : NULL;