[Libreoffice-commits] core.git: vcl/unx

Caolán McNamara caolanm at redhat.com
Wed Mar 18 05:06:51 PDT 2015


 vcl/unx/gtk/window/gtksalframe.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b7ab0dae22554f8c737cb62b64f4537f37db0b8a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 18 11:57:57 2015 +0000

    we set maGeometry in advance of gtk_window_resize
    
    so signalConfigure considers that the new size is the
    "same" as the current one, which is a bit dubious IMO
    
    Change-Id: Idbfd32f23664e251da8a9cd29b4041960957c6be

diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 956ae93..5a78215 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -2336,6 +2336,9 @@ void GtkSalFrame::SetScreen( unsigned int nNewScreen, int eType, Rectangle *pSiz
         if( !(m_nStyle & SAL_FRAME_STYLE_SIZEABLE) )
             gtk_window_set_resizable( GTK_WINDOW(m_pWindow), TRUE );
         gtk_window_resize( GTK_WINDOW( m_pWindow ), maGeometry.nWidth, maGeometry.nHeight );
+        //I wonder if we should instead leave maGeometry alone and rely on
+        //configure-event to trigger signalConfigure and set it there
+        AllocateFrame();
     }
 
     gtk_window_move( GTK_WINDOW( m_pWindow ), maGeometry.nX, maGeometry.nY );


More information about the Libreoffice-commits mailing list