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

Bug 607322 - Double-click doesn't work if the item is selected in...

Browse Source 
Slight correction to fix for #596473.
This commit is contained in:
Kristian Rietveld 2010-01-18 22:18:25 +01:00 committed by Tristan Van Berkom
parent eed0dd0944
commit 9743d2e83c
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gtk/gtktreeview.c
View File

@ -2855,27 +2855,25 @@ gtk_tree_view_button_press (GtkWidget *widget,
/* Test if a double click happened on the same row. */ /* Test if a double click happened on the same row. */
if (event->button == 1 && event->type == GDK_BUTTON_PRESS) if (event->button == 1 && event->type == GDK_BUTTON_PRESS)
{ {
if (tree_view->priv->last_button_x != -1) int double_click_time, double_click_distance;
g_object_get (gtk_settings_get_default (),
"gtk-double-click-time", &double_click_time,
"gtk-double-click-distance", &double_click_distance,
NULL);
/* Same conditions as _gdk_event_button_generate */
if (tree_view->priv->last_button_x != -1 &&
(event->time < tree_view->priv->last_button_time + double_click_time) &&
(ABS (event->x - tree_view->priv->last_button_x) <= double_click_distance) &&
(ABS (event->y - tree_view->priv->last_button_y) <= double_click_distance))
{ {
int double_click_time, double_click_distance; /* We do no longer compare paths of this row and the
* row clicked previously. We use the double click
g_object_get (gtk_settings_get_default (), * distance to decide whether this is a valid click,
"gtk-double-click-time", &double_click_time, * allowing the mouse to slightly move over another row.
"gtk-double-click-distance", &double_click_distance, */
NULL); row_double_click = TRUE;
/* Same conditions as _gdk_event_button_generate */
if ((event->time < tree_view->priv->last_button_time + double_click_time) &&
(ABS (event->x - tree_view->priv->last_button_x) <= double_click_distance) &&
(ABS (event->y - tree_view->priv->last_button_y) <= double_click_distance))
{
/* We do no longer compare paths of this row and the
* row clicked previously. We use the double click
* distance to decide whether this is a valid click,
* allowing the mouse to slightly move over another row.
*/
row_double_click = TRUE;
}
tree_view->priv->last_button_time = 0; tree_view->priv->last_button_time = 0;
tree_view->priv->last_button_x = -1; tree_view->priv->last_button_x = -1;