[Libreoffice-commits] .: 3 commits - canvas/source vcl/inc vcl/unx

[Radek Doulík]

 canvas/source/cairo/cairo_spritecanvashelper.cxx |    4 ++--
 vcl/inc/unx/gtk/gtkdata.hxx                      |    1 -
 vcl/unx/gtk/window/gtkframe.cxx                  |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 99222151485297266936bb3a8a8cd4162cb25f70
Author: Radek Doulik <rodo at novell.com>
Date:   Thu Jun 23 13:35:01 2011 +0200

    make sure we send resize event to fullscreen windows
    
     - this fixes regression of i#86302 fix. it happens when screen is resized
       (by xrandr for example) and the fullscreen windows are not notified
       about their size change, because they don't have sizeable style set

diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index ac71570..c5c2ae8 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -3069,7 +3069,7 @@ gboolean GtkSalFrame::signalConfigure( GtkWidget*, GdkEventConfigure* pEvent, gp
      * - which is not good since the window manager will now size the window back to this
      * wrong size at some point.
      */
-    if( (pThis->m_nStyle & (SAL_FRAME_STYLE_SIZEABLE | SAL_FRAME_STYLE_PLUG)) == SAL_FRAME_STYLE_SIZEABLE )
+    if( pThis->m_bFullscreen || (pThis->m_nStyle & (SAL_FRAME_STYLE_SIZEABLE | SAL_FRAME_STYLE_PLUG)) == SAL_FRAME_STYLE_SIZEABLE )
     {
         if( pEvent->width != (int)pThis->maGeometry.nWidth || pEvent->height != (int)pThis->maGeometry.nHeight )
         {
commit eb1f0c94dfab3aa8afebda8e4a18664e5ac08fa5
Author: Radek Doulik <rodo at novell.com>
Date:   Wed Jun 22 15:42:50 2011 +0200

    fix condition for compositing surface refresh
    
      - fixes problems on slideshow window shrinking

diff --git a/canvas/source/cairo/cairo_spritecanvashelper.cxx b/canvas/source/cairo/cairo_spritecanvashelper.cxx
index ff0118f..730f7a1 100644
--- a/canvas/source/cairo/cairo_spritecanvashelper.cxx
+++ b/canvas/source/cairo/cairo_spritecanvashelper.cxx
@@ -524,8 +524,8 @@ namespace cairocanvas
 
     ::cairo::SurfaceSharedPtr SpriteCanvasHelper::getCompositingSurface( const ::basegfx::B2ISize& rNeededSize )
     {
-        if( rNeededSize.getX() < maCompositingSurfaceSize.getX() ||
-            rNeededSize.getY() < maCompositingSurfaceSize.getY() )
+        if( rNeededSize.getX() > maCompositingSurfaceSize.getX() ||
+            rNeededSize.getY() > maCompositingSurfaceSize.getY() )
         {
             // need to give buffer more size
             mpCompositingSurface.reset();
commit a9a080247bd0f50fc2b7d6de4627cd6ef29d7817
Author: Radek Doulik <rodo at novell.com>
Date:   Tue Jun 21 13:25:16 2011 +0200

    fix crash when changing screen resolution
    
     - m_aXineramaScreenIndexMap in GtkSalDisplay was shadowing
       the same field in SalDisplay, which led to crash in saldisp.cxx
       code in SalDisplay::addXineramaScreenUnique

diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 0ec802d..95348f4 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -93,7 +93,6 @@ class GtkSalDisplay : public SalDisplay
     GdkDisplay*						m_pGdkDisplay;
     GdkCursor                      *m_aCursors[ POINTER_COUNT ];
     bool                            m_bStartupCompleted;
-    std::vector< int >              m_aXineramaScreenIndexMap;
 
     GdkCursor* getFromXBM( const unsigned char *pBitmap, const unsigned char *pMask,
                            int nWidth, int nHeight, int nXHot, int nYHot );