Fixed focus behavior of view canvas

Fixes bug #2899305.  Don't just automatically steal focus when entering
canvas.  Require a click to get focus back.

diff --git a/src/view.c b/src/view.c
index 84b36a1f8167c8a2a1c8d675d13eb32a549a00bc..ca917342242d9e1ee532edbfbb3290ec197b5b9e 100644 (file)
--- a/src/view.c
+++ b/src/view.c
@@ -3263,8 +3263,6 @@ static gboolean
 enter_notify_event_cb (glView            *view,
                        GdkEventCrossing  *event)
 {
-        gtk_widget_grab_focus(GTK_WIDGET (view->canvas));
-
         return FALSE;
 }
 
@@ -3456,6 +3454,8 @@ button_press_event_cb (glView            *view,
         glViewObject       *view_object;
         glViewObjectHandle  handle;
 
+        gtk_widget_grab_focus(GTK_WIDGET (view->canvas));
+
         bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view->canvas));
 
        cr = gdk_cairo_create (bin_window);