Commit 96882ebc authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Applied patch from Thomas Leonard to make stepper click to scroll take

Fri Feb 22 20:28:18 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkrange.c: Applied patch from Thomas Leonard to make
        stepper click to scroll take effect immediately, rather than after
        a delay (#67649).

        * gtk/gtkrange.c: Remove right-click == step in trough since it
        isn't a useful binding and it's a large area to hit accidentally.
        (Leave it on the steppers since its more useful there and less
        likely to do accidentally.)
parent 70ace6c0
Fri Feb 22 20:28:18 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrange.c: Applied patch from Thomas Leonard to make
stepper click to scroll take effect immediately, rather than after
a delay (#67649).
* gtk/gtkrange.c: Remove right-click == step in trough since it
isn't a useful binding and it's a large area to hit accidentally.
(Leave it on the steppers since its more useful there and less
likely to do accidentally.)
2002-02-23 Pablo Saratxaga <pablo@mandrakesoft.com> 2002-02-23 Pablo Saratxaga <pablo@mandrakesoft.com>
* configure.in (ALL_LINGUAS): Add "cy" to the language list. * configure.in (ALL_LINGUAS): Add "cy" to the language list.
......
Fri Feb 22 20:28:18 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrange.c: Applied patch from Thomas Leonard to make
stepper click to scroll take effect immediately, rather than after
a delay (#67649).
* gtk/gtkrange.c: Remove right-click == step in trough since it
isn't a useful binding and it's a large area to hit accidentally.
(Leave it on the steppers since its more useful there and less
likely to do accidentally.)
2002-02-23 Pablo Saratxaga <pablo@mandrakesoft.com> 2002-02-23 Pablo Saratxaga <pablo@mandrakesoft.com>
* configure.in (ALL_LINGUAS): Add "cy" to the language list. * configure.in (ALL_LINGUAS): Add "cy" to the language list.
......
Fri Feb 22 20:28:18 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrange.c: Applied patch from Thomas Leonard to make
stepper click to scroll take effect immediately, rather than after
a delay (#67649).
* gtk/gtkrange.c: Remove right-click == step in trough since it
isn't a useful binding and it's a large area to hit accidentally.
(Leave it on the steppers since its more useful there and less
likely to do accidentally.)
2002-02-23 Pablo Saratxaga <pablo@mandrakesoft.com> 2002-02-23 Pablo Saratxaga <pablo@mandrakesoft.com>
* configure.in (ALL_LINGUAS): Add "cy" to the language list. * configure.in (ALL_LINGUAS): Add "cy" to the language list.
......
Fri Feb 22 20:28:18 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrange.c: Applied patch from Thomas Leonard to make
stepper click to scroll take effect immediately, rather than after
a delay (#67649).
* gtk/gtkrange.c: Remove right-click == step in trough since it
isn't a useful binding and it's a large area to hit accidentally.
(Leave it on the steppers since its more useful there and less
likely to do accidentally.)
2002-02-23 Pablo Saratxaga <pablo@mandrakesoft.com> 2002-02-23 Pablo Saratxaga <pablo@mandrakesoft.com>
* configure.in (ALL_LINGUAS): Add "cy" to the language list. * configure.in (ALL_LINGUAS): Add "cy" to the language list.
......
Fri Feb 22 20:28:18 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrange.c: Applied patch from Thomas Leonard to make
stepper click to scroll take effect immediately, rather than after
a delay (#67649).
* gtk/gtkrange.c: Remove right-click == step in trough since it
isn't a useful binding and it's a large area to hit accidentally.
(Leave it on the steppers since its more useful there and less
likely to do accidentally.)
2002-02-23 Pablo Saratxaga <pablo@mandrakesoft.com> 2002-02-23 Pablo Saratxaga <pablo@mandrakesoft.com>
* configure.in (ALL_LINGUAS): Add "cy" to the language list. * configure.in (ALL_LINGUAS): Add "cy" to the language list.
......
Fri Feb 22 20:28:18 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrange.c: Applied patch from Thomas Leonard to make
stepper click to scroll take effect immediately, rather than after
a delay (#67649).
* gtk/gtkrange.c: Remove right-click == step in trough since it
isn't a useful binding and it's a large area to hit accidentally.
(Leave it on the steppers since its more useful there and less
likely to do accidentally.)
2002-02-23 Pablo Saratxaga <pablo@mandrakesoft.com> 2002-02-23 Pablo Saratxaga <pablo@mandrakesoft.com>
* configure.in (ALL_LINGUAS): Add "cy" to the language list. * configure.in (ALL_LINGUAS): Add "cy" to the language list.
......
Fri Feb 22 20:28:18 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrange.c: Applied patch from Thomas Leonard to make
stepper click to scroll take effect immediately, rather than after
a delay (#67649).
* gtk/gtkrange.c: Remove right-click == step in trough since it
isn't a useful binding and it's a large area to hit accidentally.
(Leave it on the steppers since its more useful there and less
likely to do accidentally.)
2002-02-23 Pablo Saratxaga <pablo@mandrakesoft.com> 2002-02-23 Pablo Saratxaga <pablo@mandrakesoft.com>
* configure.in (ALL_LINGUAS): Add "cy" to the language list. * configure.in (ALL_LINGUAS): Add "cy" to the language list.
......
...@@ -1040,22 +1040,16 @@ range_get_scroll_for_grab (GtkRange *range) ...@@ -1040,22 +1040,16 @@ range_get_scroll_for_grab (GtkRange *range)
case 3: case 3:
return GTK_SCROLL_END; return GTK_SCROLL_END;
break; break;
} }
break; break;
/* In the trough */ /* In the trough */
case MOUSE_TROUGH: case MOUSE_TROUGH:
{ {
if (range->trough_click_forward) if (range->trough_click_forward)
{ return GTK_SCROLL_PAGE_FORWARD;
return range->layout->grab_button == 3
? GTK_SCROLL_STEP_FORWARD : GTK_SCROLL_PAGE_FORWARD;
}
else else
{ return GTK_SCROLL_PAGE_BACKWARD;
return range->layout->grab_button == 3
? GTK_SCROLL_STEP_BACKWARD : GTK_SCROLL_PAGE_BACKWARD;
}
} }
break; break;
...@@ -1116,10 +1110,9 @@ gtk_range_button_press (GtkWidget *widget, ...@@ -1116,10 +1110,9 @@ gtk_range_button_press (GtkWidget *widget,
gtk_widget_queue_draw (widget); gtk_widget_queue_draw (widget);
if (range->layout->mouse_location == MOUSE_TROUGH && if (range->layout->mouse_location == MOUSE_TROUGH &&
(event->button == 1 || event->button == 3)) event->button == 1)
{ {
/* button 1 steps by step increment, as with button 1 on a stepper, /* button 1 steps by page increment, as with button 2 on a stepper
* button 3 steps by page increment, as with button 2 on a stepper
*/ */
GtkScrollType scroll; GtkScrollType scroll;
gdouble click_value; gdouble click_value;
...@@ -1256,25 +1249,13 @@ gtk_range_button_release (GtkWidget *widget, ...@@ -1256,25 +1249,13 @@ gtk_range_button_release (GtkWidget *widget,
if (range->layout->grab_button == event->button) if (range->layout->grab_button == event->button)
{ {
GtkScrollType scroll;
MouseLocation grab_location; MouseLocation grab_location;
grab_location = range->layout->grab_location; grab_location = range->layout->grab_location;
scroll = range_get_scroll_for_grab (range);
range_grab_remove (range); range_grab_remove (range);
gtk_range_remove_step_timer (range); gtk_range_remove_step_timer (range);
/* We only do the move if we're still on top of the button at
* release
*/
if (grab_location == range->layout->mouse_location &&
scroll != GTK_SCROLL_NONE)
{
gtk_range_scroll (range, scroll);
}
if (grab_location == MOUSE_SLIDER) if (grab_location == MOUSE_SLIDER)
update_slider_position (range, event->x, event->y); update_slider_position (range, event->x, event->y);
...@@ -2265,6 +2246,8 @@ gtk_range_add_step_timer (GtkRange *range, ...@@ -2265,6 +2246,8 @@ gtk_range_add_step_timer (GtkRange *range,
initial_timeout, initial_timeout,
range); range);
range->timer->step = step; range->timer->step = step;
gtk_range_scroll (range, range->timer->step);
} }
static void static void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment