summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2015-06-07 21:52:35 -0400
committerMatthias Clasen <mclasen@redhat.com>2015-06-07 21:52:35 -0400
commit1a6080f3b9b4c99f93230d4609a0f7f5eded4e21 (patch)
treec385b4a29caa9bed1194bb95330ab57ad2b7fa40
parent9252c304c51b688b95bc472856bbe2407ddb210e (diff)
downloadgtk+-wip/matthiasc/touch-selection.tar.gz
entry: Always clear handles for mouse interactionwip/matthiasc/touch-selection
There were some cases where we left a handle visible during mouse interaction, which is a little weird.
-rw-r--r--gtk/gtkentry.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 756176f9d8..c617a92a77 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -4536,12 +4536,14 @@ gtk_entry_multipress_gesture_pressed (GtkGestureMultiPress *gesture,
case 2:
priv->select_words = TRUE;
gtk_entry_select_word (entry);
- mode = GTK_TEXT_HANDLE_MODE_SELECTION;
+ if (is_touchscreen)
+ mode = GTK_TEXT_HANDLE_MODE_SELECTION;
break;
case 3:
priv->select_lines = TRUE;
gtk_entry_select_line (entry);
- mode = GTK_TEXT_HANDLE_MODE_SELECTION;
+ if (is_touchscreen)
+ mode = GTK_TEXT_HANDLE_MODE_SELECTION;
break;
default:
break;
@@ -4572,8 +4574,7 @@ gtk_entry_multipress_gesture_pressed (GtkGestureMultiPress *gesture,
gtk_gesture_set_state (priv->drag_gesture,
GTK_EVENT_SEQUENCE_CLAIMED);
- if (is_touchscreen)
- gtk_entry_update_handles (entry, mode);
+ gtk_entry_update_handles (entry, mode);
}
if (n_press >= 3)