--- /dev/null
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Fri, 18 Nov 2022 15:02:22 +0100
+Subject: gdksurface: Do not consider GDK_TOUCH_END/CANCEL as popup-dismiss
+ worthy
+
+GDK_TOUCH_END deserves the same treatment than GDK_BUTTON_RELEASE, since it's
+subject to the same circumstances (popping up a menu on long press would be
+immediately dismissed on release if we handled them there). Ideally, we would
+want to match releases that we obtained a press for while grabbed, but as
+the popup is also dismissed on GDK_BUTTON_PRESS/GDK_TOUCH_BEGIN, there's no
+use for this tracking.
+
+And GDK_TOUCH_CANCEL sounds weird as a reason to dismiss popups, just like
+crossing events would.
+
+(cherry-picked from commit 2ff4c77c5500110e2b387a8764ab19a92045ff4e)
+
+Related: https://gitlab.gnome.org/GNOME/mutter/-/issues/2512
+Origin: upstream, 4.8.3, commit:cc5ba83ebae31b20d8ac53fe1a32685b252a100d
+---
+ gdk/gdksurface.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c
+index d4251ed..63d55b2 100644
+--- a/gdk/gdksurface.c
++++ b/gdk/gdksurface.c
+@@ -2800,10 +2800,10 @@ check_autohide (GdkEvent *event)
+ // grabs, it will be delivered to the same place as the
+ // press, and will cause the auto dismissal to be triggered.
+ case GDK_BUTTON_RELEASE:
+-#endif
+- case GDK_TOUCH_BEGIN:
+ case GDK_TOUCH_END:
+ case GDK_TOUCH_CANCEL:
++#endif
++ case GDK_TOUCH_BEGIN:
+ case GDK_TOUCHPAD_SWIPE:
+ case GDK_TOUCHPAD_PINCH:
+ display = gdk_event_get_display (event);
--- /dev/null
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Fri, 18 Nov 2022 13:57:02 +0100
+Subject: gtktext: Claim gesture more selectively
+
+Even though button 1 (or touch down) presses do most often have
+an effect in one way or another (starting drag, moving focus,
+starting selection, ...), there is one situation that they do
+immediately nothing: When clicking on the entry does not move
+the text caret around. Dragging might start a selection, but
+the entry did not do anything just yet, and an immediate
+button/touch release should remain at "did nothing".
+
+And that is precisely the hint that the Wayland IM context's click
+gesture takes, clicks that do not scroll nor move the caret around,
+having the GtkText not claim the gesture in that situation makes
+the IM gesture able to do its thing without in-fighting.
+
+This is typically not a problem when the GtkText is embedded in
+another GtkEditable implementation (e.g. GtkEntry), since the
+IM gesture is inactive and capturing from the parent widget, so
+gets a pass that it otherwise doesn't get when both gestures are
+in the same widget. This makes it work regardless of GtkText not
+being a child of a composite widget, like NautilusQueryEditor
+and AdwRowEntry.
+
+(cherry-picked from commit 09b982f0264e42bda3e8471bb25abec5ee742ecc)
+
+Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/5351
+Origin: upstream, 4.8.3, commit:3b940b12f64c78346cbea8a2fafde24690ecd9fe
+---
+ gtk/gtktext.c | 18 +++++++++++++++---
+ 1 file changed, 15 insertions(+), 3 deletions(-)
+
+diff --git a/gtk/gtktext.c b/gtk/gtktext.c
+index ba3e223..8631dbb 100644
+--- a/gtk/gtktext.c
++++ b/gtk/gtktext.c
+@@ -2753,8 +2753,6 @@ gtk_text_click_gesture_pressed (GtkGestureClick *gesture,
+ GdkDevice *source;
+ guint state;
+
+- gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_CLAIMED);
+-
+ sel_start = priv->selection_bound;
+ sel_end = priv->current_pos;
+ have_selection = sel_start != sel_end;
+@@ -2789,6 +2787,8 @@ gtk_text_click_gesture_pressed (GtkGestureClick *gesture,
+ gtk_text_selection_bubble_popup_unset (self);
+ else
+ gtk_text_selection_bubble_popup_set (self);
++
++ gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_CLAIMED);
+ }
+ else if (extend_selection)
+ {
+@@ -2800,6 +2800,8 @@ gtk_text_click_gesture_pressed (GtkGestureClick *gesture,
+
+ /* all done, so skip the extend_to_left stuff later */
+ extend_selection = FALSE;
++
++ gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_CLAIMED);
+ }
+ else
+ {
+@@ -2807,6 +2809,7 @@ gtk_text_click_gesture_pressed (GtkGestureClick *gesture,
+ priv->in_drag = TRUE;
+ priv->drag_start_x = x;
+ priv->drag_start_y = y;
++ gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_CLAIMED);
+ }
+ }
+ else
+@@ -2815,7 +2818,13 @@ gtk_text_click_gesture_pressed (GtkGestureClick *gesture,
+
+ if (!extend_selection)
+ {
+- gtk_text_set_selection_bounds (self, tmp_pos, tmp_pos);
++ if (priv->current_pos != tmp_pos ||
++ priv->selection_bound != tmp_pos)
++ {
++ gtk_text_set_selection_bounds (self, tmp_pos, tmp_pos);
++ gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_CLAIMED);
++ }
++
+ priv->handle_place_time = g_get_monotonic_time ();
+ }
+ else
+@@ -2825,6 +2834,7 @@ gtk_text_click_gesture_pressed (GtkGestureClick *gesture,
+ sel_start = sel_end = priv->current_pos;
+
+ gtk_text_set_positions (self, tmp_pos, tmp_pos);
++ gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_CLAIMED);
+ }
+ }
+
+@@ -2833,11 +2843,13 @@ gtk_text_click_gesture_pressed (GtkGestureClick *gesture,
+ case 2:
+ priv->select_words = TRUE;
+ gtk_text_select_word (self);
++ gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_CLAIMED);
+ break;
+
+ case 3:
+ priv->select_lines = TRUE;
+ gtk_text_select_line (self);
++ gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_CLAIMED);
+ break;
+
+ default:
projects / gtk4.git / commitdiff