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

[Caolán McNamara]

 vcl/unx/gtk/window/gtksalframe.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 2b62e2ea02ca7bee6688b0dacd51fa75fdd42a2c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 1 20:58:14 2015 +0100

    gtk3: disable using notification that we are in the backdrop
    
    Change-Id: I65a60acd956768f6a023c83053700803e5a8f1f2
    (cherry picked from commit ff4b8d39e649ed56770b28550158b5148432ee48)

diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 7d25640..c225426 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -1036,7 +1036,7 @@ void GtkSalFrame::InitCommon()
     g_signal_connect( G_OBJECT(m_pWindow), "button-release-event", G_CALLBACK(signalButton), this );
 #if GTK_CHECK_VERSION(3,0,0)
     g_signal_connect( G_OBJECT(m_pWindow), "draw", G_CALLBACK(signalDraw), this );
-    g_signal_connect( G_OBJECT(m_pWindow), "state-flags-changed", G_CALLBACK(signalFlagsChanged), this );
+//    g_signal_connect( G_OBJECT(m_pWindow), "state-flags-changed", G_CALLBACK(signalFlagsChanged), this );
 #if GTK_CHECK_VERSION(3,14,0)
     GtkGesture *pSwipe = gtk_gesture_swipe_new(m_pWindow);
     g_signal_connect(pSwipe, "swipe", G_CALLBACK(gestureSwipe), this);
@@ -3443,6 +3443,9 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer
 #if GTK_CHECK_VERSION(3,0,0)
 void GtkSalFrame::signalFlagsChanged( GtkWidget* ,  GtkStateFlags state, gpointer frame )
 {
+    //TO-DO: This isn't as helpful as I'd like it to be. The color selector puts the main
+    //windows into the backdrop, disabling everything, and the floating navigator window
+    //is also problematic.
     GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame);
 
     bool bOldBackDrop = state & GTK_STATE_FLAG_BACKDROP;