[Libreoffice-commits] core.git: framework/source

[Herbert Dürr]

 framework/source/services/backingwindow.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit b130133ad2e5b09ccd9a3ac15348fd8d39a8fef8
Author: Herbert Dürr <hdu at apache.org>
Date:   Wed Dec 19 08:12:31 2012 +0000

    Resolves: #i121503# fix resize/paint race in the backing window
    
    (cherry picked from commit 9d578cebcd9d1e1c16c04cbefc5de2ab511ea335)
    
    Conflicts:
    	framework/source/services/backingwindow.cxx
    
    Change-Id: Ic5e590465e19b02b6a9b426072818cea5bb3f912

diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index 5e2ca26..652b6c6 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -661,6 +661,8 @@ void BackingWindow::layoutButton(
 
 void BackingWindow::Paint( const Rectangle& )
 {
+    Resize();
+
     Wallpaper aBack( svtools::ColorConfig().GetColorValue(::svtools::APPBACKGROUND).nColor );
     Region aClip( Rectangle( Point( 0, 0 ), GetOutputSizePixel() ) );
     Rectangle aBmpRect(maControlRect);
@@ -849,6 +851,9 @@ void BackingWindow::Resize()
     nYPos += nB2Delta - nDiff;
     maOpenButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos, nYPos ), Size( mnTextColumnWidth[0], maButtonImageSize.Height() ) );
     maTemplateButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos + mnColumnWidth[0], nYPos ), Size( mnTextColumnWidth[1], maButtonImageSize.Height() ) );
+
+    if( !IsInPaint())
+        Invalidate();
 }
 
 IMPL_LINK_NOARG(BackingWindow, ToolboxHdl)