callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

text view: Always clear handles for mouse interaction

Browse Source 
There were some cases where we left a handle visible
during mouse interaction, which is a little weird.
This commit is contained in:
Matthias Clasen
2015-06-07 21:48:35 -04:00
parent 76836dcd81
commit 0a2b1b68fa
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gtktextview.c
View File

@ -5234,6 +5234,7 @@ gtk_text_view_multipress_gesture_pressed (GtkGestureMultiPress *gesture,
*/ */
GtkTextIter start, end; GtkTextIter start, end;
if (is_touchscreen)
handle_mode = GTK_TEXT_HANDLE_MODE_CURSOR; handle_mode = GTK_TEXT_HANDLE_MODE_CURSOR;
get_iter_from_gesture (text_view, priv->multipress_gesture, get_iter_from_gesture (text_view, priv->multipress_gesture,
&iter, NULL, NULL); &iter, NULL, NULL);
@ -5277,9 +5278,10 @@ gtk_text_view_multipress_gesture_pressed (GtkGestureMultiPress *gesture,
case 2: case 2:
case 3: case 3:
if (is_touchscreen) if (is_touchscreen)
break; {
handle_mode = GTK_TEXT_HANDLE_MODE_SELECTION; handle_mode = GTK_TEXT_HANDLE_MODE_SELECTION;
break;
}
gtk_text_view_end_selection_drag (text_view); gtk_text_view_end_selection_drag (text_view);
get_iter_from_gesture (text_view, priv->multipress_gesture, get_iter_from_gesture (text_view, priv->multipress_gesture,
@ -5292,12 +5294,9 @@ gtk_text_view_multipress_gesture_pressed (GtkGestureMultiPress *gesture,
break; break;
} }
if (is_touchscreen)
{
_gtk_text_view_ensure_text_handles (text_view); _gtk_text_view_ensure_text_handles (text_view);
gtk_text_view_update_handles (text_view, handle_mode); gtk_text_view_update_handles (text_view, handle_mode);
} }
}
if (n_press >= 3) if (n_press >= 3)
gtk_event_controller_reset (GTK_EVENT_CONTROLLER (gesture)); gtk_event_controller_reset (GTK_EVENT_CONTROLLER (gesture));