[gtk+/wip/matthiasc/touch-selection] entry: Hide popover when touching elsewhere

[Matthias Clasen <matthiasc src gnome org>]

commit ea315c6d0a1b1cd564df754e4ac112198f6eea19
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Jun 7 20:41:16 2015 -0400

    entry: Hide popover when touching elsewhere

 gtk/gtkentry.c |   33 +++++++++++++++++++--------------
 1 files changed, 19 insertions(+), 14 deletions(-)
---
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index de4ec31..14328ac 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -4506,24 +4506,29 @@ gtk_entry_multipress_gesture_pressed (GtkGestureMultiPress *gesture,
                   priv->drag_start_y = y;
                }
             }
-          else if (!extend_selection)
-            {
-              gtk_editable_set_position (editable, tmp_pos);
-            }
           else
             {
-              gtk_entry_reset_im_context (entry);
-
-              if (!have_selection) /* select from the current position to the clicked position */
-                sel_start = sel_end = priv->current_pos;
+              gtk_entry_selection_bubble_popup_unset (entry);
 
-              if (tmp_pos > sel_start && tmp_pos < sel_end)
+              if (!extend_selection)
                 {
-                  /* Truncate current selection, but keep it as big as possible */
-                  if (tmp_pos - sel_start > sel_end - tmp_pos)
-                            gtk_entry_set_positions (entry, sel_start, tmp_pos);
-                  else
-                            gtk_entry_set_positions (entry, tmp_pos, sel_end);
+                  gtk_editable_set_position (editable, tmp_pos);
+                }
+              else
+                {
+                  gtk_entry_reset_im_context (entry);
+
+                  if (!have_selection) /* select from the current position to the clicked position */
+                    sel_start = sel_end = priv->current_pos;
+
+                  if (tmp_pos > sel_start && tmp_pos < sel_end)
+                    {
+                      /* Truncate current selection, but keep it as big as possible */
+                      if (tmp_pos - sel_start > sel_end - tmp_pos)
+                        gtk_entry_set_positions (entry, sel_start, tmp_pos);
+                      else
+                        gtk_entry_set_positions (entry, tmp_pos, sel_end);
+                    }
                 }
             }