git.maemo.org Git - oespirit1/blob - gtkhtml/gtkhtml_170_text_selection_with_proper_doubleclick.diff

   1 diff -ru gtkhtml-3.24.4/gtkhtml/gtkhtml.c gtkhtml-3.9.1.new/gtkhtml/gtkhtml.c
   2 diff -ru gtkhtml-3.24.4/gtkhtml/gtkhtml.c gtkhtml-3.9.1.new/gtkhtml/gtkhtml.c
   3 diff -ru gtkhtml-3.24.4/gtkhtml/gtkhtml.c gtkhtml-3.9.1.new/gtkhtml/gtkhtml.c
   4 diff -ru gtkhtml-3.24.4/gtkhtml/gtkhtml.c gtkhtml-3.9.1.new/gtkhtml/gtkhtml.c
   5 --- gtkhtml-3.24.4/gtkhtml/gtkhtml.c    2007-01-22 10:35:40.000000000 +0200
   6 --- gtkhtml-3.24.4/gtkhtml/gtkhtml.c    2007-01-22 10:35:40.000000000 +0200
   7 --- gtkhtml-3.24.4/gtkhtml/gtkhtml.c    2007-01-22 10:35:40.000000000 +0200
   8 --- gtkhtml-3.24.4/gtkhtml/gtkhtml.c    2007-01-22 10:35:40.000000000 +0200
   9 +++ gtkhtml-3.24.4/gtkhtml/gtkhtml.c    2007-01-22 10:52:26.000000000 +0200
  10 +++ gtkhtml-3.24.4/gtkhtml/gtkhtml.c    2007-01-22 10:52:26.000000000 +0200
  11 +++ gtkhtml-3.24.4/gtkhtml/gtkhtml.c    2007-01-22 10:52:26.000000000 +0200
  12 +++ gtkhtml-3.24.4/gtkhtml/gtkhtml.c    2007-01-22 10:52:26.000000000 +0200
  13 @@ -1598,6 +1598,11 @@
  14         GdkWindow *window = widget->window;
  15         HTMLEngine *engine;
  16         gint x, y;
  17 +       guint mouse_double_click_threshold = MOUSE_DBLCLK_THRESHOLD ;
  18 +       GtkSettings *gtk_settings = gtk_widget_get_settings (widget) ;
  19 +
  20 +       if (NULL != gtk_settings)
  21 +               g_object_get (G_OBJECT (gtk_settings), "gtk-double-click-distance", &mouse_double_click_threshold, NULL) ;
  22
  23         g_return_val_if_fail (widget != NULL, 0);
  24         g_return_val_if_fail (GTK_IS_HTML (widget), 0);
  25 @@ -1619,8 +1624,8 @@
  26         if (GTK_HTML (widget)->simple_dblclick) {
  27             GtkHTML *html = GTK_HTML (widget);
  28
  29 -           if (abs(x - html->selection_x1) <= MOUSE_DBLCLK_THRESHOLD &&
  30 -               abs(y - html->selection_y1) <= MOUSE_DBLCLK_THRESHOLD)
  31 +           if (abs(x - html->selection_x1) <= mouse_double_click_threshold &&
  32 +               abs(y - html->selection_y1) <= mouse_double_click_threshold)
  33                 return TRUE;
  34
  35             html->simple_dblclick = FALSE;