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

Caolán McNamara caolanm at redhat.com
Tue Jun 30 04:17:18 PDT 2015


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

New commits:
commit 9ce8f73550e327ecffeed3f4f8697f8b1f2548ed
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 30 12:16:20 2015 +0100

    gtk3: re-enable when in backdrop and receive delete signal
    
    Change-Id: I845a3eda41263a07e1e69eb6ff37ff5ab2576905

diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index f6ef61a..9f8e35d 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -4020,6 +4020,14 @@ gboolean GtkSalFrame::signalDelete( GtkWidget*, GdkEvent*, gpointer frame )
 {
     GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame);
 
+#if GTK_CHECK_VERSION(3,0,0)
+    //If we went into the backdrop we disabled the toplevel window, if we
+    //receive a delete here, re-enable so we can process it
+    bool bBackDrop = (gtk_widget_get_state_flags(GTK_WIDGET(pThis->m_pWindow)) & GTK_STATE_FLAG_BACKDROP);
+    if (bBackDrop)
+        pThis->GetWindow()->Enable();
+#endif
+
     pThis->CallCallback( SALEVENT_CLOSE, NULL );
 
     return true;


More information about the Libreoffice-commits mailing list