git.maemo.org Git - oespirit1/blob - gtk+/files/gtk+2.0-2.12.12/range-no-redraw.patch

   1 5f084ea0849d5967a3c22821542ecaaa8accb398
   2 diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
   3 index bd95351..64e0e59 100644
   4 --- gtk/gtkrange.c
   5 +++ gtk/gtkrange.c
   6 @@ -109,6 +109,8 @@ struct _GtkRangeLayout
   7    GtkSensitivityType upper_sensitivity;
   8
   9    gdouble fill_level;
  10 +
  11 +  guint motion_idle_id;
  12  };
  13
  14
  15 @@ -205,6 +207,8 @@ static gboolean      gtk_range_real_change_value        (GtkRange      *range,
  16  static void          gtk_range_update_value             (GtkRange      *range);
  17  static gboolean      gtk_range_key_press                (GtkWidget     *range,
  18                                                          GdkEventKey   *event);
  19 +static void          gtk_range_add_motion_idle          (GtkRange *range);
  20 +static void          gtk_range_remove_motion_idle       (GtkRange *range);
  21
  22
  23  static guint signals[LAST_SIGNAL];
  24 @@ -1167,6 +1171,7 @@ gtk_range_destroy (GtkObject *object)
  25
  26    gtk_range_remove_step_timer (range);
  27    gtk_range_remove_update_timer (range);
  28 +  gtk_range_remove_motion_idle (range);
  29
  30    if (range->adjustment)
  31      {
  32 @@ -1276,6 +1281,7 @@ gtk_range_unrealize (GtkWidget *widget)
  33
  34    gtk_range_remove_step_timer (range);
  35    gtk_range_remove_update_timer (range);
  36 +  gtk_range_remove_motion_idle (range);
  37
  38    gdk_window_set_user_data (range->event_window, NULL);
  39    gdk_window_destroy (range->event_window);
  40 @@ -2165,7 +2171,7 @@ gtk_range_motion_notify (GtkWidget      *widget,
  41      gtk_widget_queue_draw (widget);
  42
  43    if (range->layout->grab_location == MOUSE_SLIDER)
  44 -    update_slider_position (range, x, y);
  45 +    gtk_range_add_motion_idle (range);
  46
  47    /* We handled the event if the mouse was in the range_rect */
  48    return range->layout->mouse_location != MOUSE_OUTSIDE;
  49 @@ -3335,9 +3341,10 @@ initial_timeout (gpointer data)
  50    g_object_get (settings, "gtk-timeout-repeat", &timeout, NULL);
  51
  52    range = GTK_RANGE (data);
  53 -  range->timer->timeout_id = gdk_threads_add_timeout (timeout * SCROLL_DELAY_FACTOR,
  54 -                                            second_timeout,
  55 -                                            range);
  56 +  range->timer->timeout_id =
  57 +    gdk_threads_add_timeout (timeout * SCROLL_DELAY_FACTOR,
  58 +                             second_timeout,
  59 +                             range);
  60    /* remove self */
  61    return FALSE;
  62  }
  63 @@ -3357,9 +3364,8 @@ gtk_range_add_step_timer (GtkRange      *range,
  64
  65    range->timer = g_new (GtkRangeStepTimer, 1);
  66
  67 -  range->timer->timeout_id = gdk_threads_add_timeout (timeout,
  68 -                                            initial_timeout,
  69 -                                            range);
  70 +  range->timer->timeout_id =
  71 +    gdk_threads_add_timeout (timeout, initial_timeout, range);
  72    range->timer->step = step;
  73
  74    gtk_range_scroll (range, range->timer->step);
  75 @@ -3397,9 +3403,8 @@ gtk_range_reset_update_timer (GtkRange *range)
  76  {
  77    gtk_range_remove_update_timer (range);
  78
  79 -  range->update_timeout_id = gdk_threads_add_timeout (UPDATE_DELAY,
  80 -                                            update_timeout,
  81 -                                            range);
  82 +  range->update_timeout_id =
  83 +    gdk_threads_add_timeout (UPDATE_DELAY, update_timeout, range);
  84  }
  85
  86  static void
  87 @@ -3412,5 +3417,40 @@ gtk_range_remove_update_timer (GtkRange *range)
  88      }
  89  }
  90
  91 +static gboolean
  92 +motion_idle (gpointer data)
  93 +{
  94 +  GtkRange *range = data;
  95 +  GtkRangeLayout *layout = range->layout;
  96 +
  97 +  update_slider_position (range, layout->mouse_x, layout->mouse_y);
  98 +
  99 +  layout->motion_idle_id = 0;
 100 +
 101 +  return FALSE;
 102 +}
 103 +
 104 +static void
 105 +gtk_range_add_motion_idle (GtkRange *range)
 106 +{
 107 +  if (!range->layout->motion_idle_id)
 108 +    {
 109 +      range->layout->motion_idle_id =
 110 +        gdk_threads_add_idle_full (GDK_PRIORITY_REDRAW,
 111 +                                   motion_idle, range,
 112 +                                   NULL);
 113 +    }
 114 +}
 115 +
 116 +static void
 117 +gtk_range_remove_motion_idle (GtkRange *range)
 118 +{
 119 +  if (range->layout->motion_idle_id != 0)
 120 +    {
 121 +      g_source_remove (range->layout->motion_idle_id);
 122 +      range->layout->motion_idle_id = 0;
 123 +    }
 124 +}
 125 +
 126  #define __GTK_RANGE_C__
 127  #include "gtkaliasdef.c"