[balsa/wip/gtk4: 276/351] Revert #d500a67f7da036c75d1326b86c29874128799de5



commit 4aceec81c45d0e1f1ccd10990964d19a03aaa40e
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Wed Apr 11 23:43:04 2018 -0400

    Revert #d500a67f7da036c75d1326b86c29874128799de5
    
    Commit be0726c130ed073c3179175ba6579632d78662b6 is a far, far better fix
    for that unwanted scrolling.

 src/balsa-mime-widget-text.c |   19 +++----------------
 1 files changed, 3 insertions(+), 16 deletions(-)
---
diff --git a/src/balsa-mime-widget-text.c b/src/balsa-mime-widget-text.c
index 9f394be..4a68617 100644
--- a/src/balsa-mime-widget-text.c
+++ b/src/balsa-mime-widget-text.c
@@ -330,8 +330,6 @@ balsa_mime_widget_new_text(BalsaMessage * bm, LibBalsaMessageBody * mime_body,
                          G_CALLBACK(store_button_coords), NULL);
        g_signal_connect(mwt->gesture, "released",
                         G_CALLBACK(check_call_url), mwt);
-        gtk_event_controller_set_propagation_phase(GTK_EVENT_CONTROLLER(mwt->gesture),
-                                                   GTK_PHASE_CAPTURE);
 
         mwt->controller = gtk_event_controller_motion_new(widget);
         g_signal_connect(mwt->controller, "motion",
@@ -779,15 +777,13 @@ check_call_url(GtkGestureMultiPress *multi_press,
 {
     BalsaMimeWidgetText *mwt = user_data;
     GtkGesture *gesture;
-    GdkEventSequence *sequence;
     const GdkEvent *event;
     GdkModifierType state;
 
     gesture = GTK_GESTURE(multi_press);
-    sequence = gtk_gesture_get_last_updated_sequence(gesture);
-    event = gtk_gesture_get_last_event(gesture, sequence);
+    event = gtk_gesture_get_last_event(gesture, gtk_gesture_get_last_updated_sequence(gesture));
 
-    if (!gdk_event_get_state(event, &state)) {
+    if (event == NULL || !gdk_event_get_state(event, &state)) {
         return;
     }
 
@@ -797,17 +793,8 @@ check_call_url(GtkGestureMultiPress *multi_press,
         message_url_t *url;
 
         url = find_url(mwt, (gint) x, (gint) y);
-        if (url != NULL) {
+        if (url != NULL)
             handle_url(url->url);
-            /*
-             * Don't let GtkTextView handle the click, because it grabs
-             * the focus, and then GtkContainer tries to scroll to the
-             * focus child, which moves the text under the pointer in a
-             * confusing way.
-             */
-            gtk_gesture_set_sequence_state(gesture, sequence,
-                                           GTK_EVENT_SEQUENCE_CLAIMED);
-        }
     }
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]