Merge ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-touch-two-clicks-fix into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic

[Marco Trevisan (Treviño)]

[Didier Roche-Tolomelli (didrocks)]

Please ensure the bugs is SRU-formatted. LGTM otherwise.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 0ce4a7d..c6ad925 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ gnome-shell (3.28.3-0ubuntu0.18.04.3) UNRELEASED; urgency=medium
   * debian/ubuntu.css:
     - use defined color for menu separators (LP: #1739931)
     - set StEntry minimun height to work properly with Ubuntu font (LP: #1743058)
+  * debian/patches/st-button-Ignore-pointer-emulated-touch-events.patch:
+    - Don't emit two click events on touch under X11 (LP: #1745888)
 
  -- Marco Trevisan (Treviño) <[e-mail]>  Wed, 03 Oct 2018 00:50:42 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index ad2c4be..217740f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,4 +25,5 @@ popupMenu-Don-t-handle-key-presses-directly-if-there-are-.patch
 viewSelector-Cancel-search-on-overview-hidden.patch
 search-Cancel-search-provider-operations-on-clear.patch
 search-Ignore-search-provider-results-metas-if-search-is-.patch
+st-button-Ignore-pointer-emulated-touch-events.patch
 ubuntu/search-call-XUbuntuCancel-method-on-providers-when-no-dat.patch
diff --git a/debian/patches/st-button-Ignore-pointer-emulated-touch-events.patch b/debian/patches/st-button-Ignore-pointer-emulated-touch-events.patch
new file mode 100644
index 0000000..538bb17
--- /dev/null
+++ b/debian/patches/st-button-Ignore-pointer-emulated-touch-events.patch
@@ -0,0 +1,42 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Thu, 25 Oct 2018 06:35:25 +0200
+Subject: st-button: Ignore pointer emulated touch events
+
+In X11, pointer emulated touch events are replicated with normal PRESS, RELEASE
+pair events which are generated by the server. Thus for a single tap we get:
+ - TOUCH_BEGIN -> TOUCH_END, PRESS -> RELEASE
+
+This will cause st-button to send two "clicked" signals, instead of just one,
+breaking extensions (like dash-to-dock) that show buttons in the main stage
+which will be checked two times or that will receive the same signal two times.
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1745888
+Forwarded: yes, https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/272
+---
+ src/st/st-button.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/st/st-button.c b/src/st/st-button.c
+index 8f5c492..a3a7b24 100644
+--- a/src/st/st-button.c
++++ b/src/st/st-button.c
+@@ -248,14 +248,17 @@ st_button_touch_event (ClutterActor      *actor,
+   if (event->type == CLUTTER_TOUCH_BEGIN && !priv->press_sequence)
+     {
+       clutter_input_device_sequence_grab (device, sequence, actor);
+-      st_button_press (button, device, 0, sequence);
++      if (!clutter_event_is_pointer_emulated ((ClutterEvent*) event))
++        st_button_press (button, device, 0, sequence);
+       return CLUTTER_EVENT_STOP;
+     }
+   else if (event->type == CLUTTER_TOUCH_END &&
+            priv->device == device &&
+            priv->press_sequence == sequence)
+     {
+-      st_button_release (button, device, mask, 0, sequence);
++      if (!clutter_event_is_pointer_emulated ((ClutterEvent*) event))
++        st_button_release (button, device, mask, 0, sequence);
++
+       clutter_input_device_sequence_ungrab (device, sequence);
+       return CLUTTER_EVENT_STOP;
+     }