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

Caolán McNamara caolanm at redhat.com
Mon Mar 20 12:48:59 UTC 2017


 vcl/unx/gtk3/gtk3gtkframe.cxx |   39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

New commits:
commit 66067b845ba5c1de0d5acae3797c36b7d12ce7b6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 20 12:48:02 2017 +0000

    only toggle debugs on down, not also on up
    
    Change-Id: I6eb7dfd60ca855a9d4b939f4fd186e7037a1a3b4

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 543574f1e962..a06294b94940 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -388,24 +388,27 @@ void GtkSalFrame::doKeyCallback( guint state,
     vcl::DeletionListener aDel( this );
 
 #if 0
-    // shift-zero forces a re-draw and event is swallowed
-    if (keyval == GDK_KEY_0)
+    if (bDown)
     {
-        fprintf( stderr, "force widget_queue_draw\n");
-        gtk_widget_queue_draw(GTK_WIDGET(m_pFixedContainer));
-        return;
-    }
-    else if (keyval == GDK_KEY_1)
-    {
-        fprintf( stderr, "force repaint all\n");
-        TriggerPaintEvent();
-        return;
-    }
-    else if (keyval == GDK_KEY_2)
-    {
-        dumpframes = !dumpframes;
-        fprintf(stderr, "toggle dump frames to %d\n", dumpframes);
-        return;
+        // shift-zero forces a re-draw and event is swallowed
+        if (keyval == GDK_KEY_0)
+        {
+            fprintf( stderr, "force widget_queue_draw\n");
+            gtk_widget_queue_draw(GTK_WIDGET(m_pFixedContainer));
+            return;
+        }
+        else if (keyval == GDK_KEY_1)
+        {
+            fprintf( stderr, "force repaint all\n");
+            TriggerPaintEvent();
+            return;
+        }
+        else if (keyval == GDK_KEY_2)
+        {
+            dumpframes = !dumpframes;
+            fprintf(stderr, "toggle dump frames to %d\n", dumpframes);
+            return;
+        }
     }
 #endif
 
@@ -453,7 +456,7 @@ void GtkSalFrame::doKeyCallback( guint state,
 
     aEvent.mnCode   |= GetKeyModCode( state );
 
-    if( bDown )
+    if (bDown)
     {
         bool bHandled = CallCallbackExc( SalEvent::KeyInput, &aEvent );
         // #i46889# copy AlternateKeyCode handling from generic plugin


More information about the Libreoffice-commits mailing list