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

[Jan Holesovsky]

 vcl/source/window/menu.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit c10f209a3d1ff541c38f3182f2a5c77a835637df
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu Jun 18 09:59:23 2015 +0200

    rendercontext: Fix rendering of double-buffered menubar.
    
    Change-Id: Iea74564ef0ae2188ae29f106c4416df1fe827b42

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 34c485d..d2b5716 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1822,7 +1822,9 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext,
         aTopLeft.Y() += ImplGetSVData()->maNWFData.mnMenuFormatBorderY;
     }
 
-    Size aOutSz = rRenderContext.GetOutputSizePixel();
+    // for the computations, use size of the underlying window, not of RenderContext
+    Size aOutSz = pWindow->GetOutputSizePixel();
+
     size_t nCount = pItemList->size();
     if (bLayout)
         mpLayoutData->m_aVisibleItemBoundRects.clear();