AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

scrolledwindow: Simplify _gtk_scrolled_window_set_adjustment_value()

Browse Source 
The two boolean arguments always received the same values, so wipe these
out. Likewise, the boolean return value is unused and sort of meaningless.
This commit is contained in:
Carlos Garnacho 2014-10-12 14:01:03 +02:00
parent 1ae5c2a138
commit c184bd4675
1 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
gtk/gtkscrolledwindow.c
View File

@ -270,11 +270,9 @@ static void gtk_scrolled_window_unmap (GtkWidget *wid
static void gtk_scrolled_window_grab_notify (GtkWidget *widget, static void gtk_scrolled_window_grab_notify (GtkWidget *widget,
gboolean was_grabbed); gboolean was_grabbed);
static gboolean _gtk_scrolled_window_set_adjustment_value (GtkScrolledWindow *scrolled_window, static void _gtk_scrolled_window_set_adjustment_value (GtkScrolledWindow *scrolled_window,
GtkAdjustment *adjustment, GtkAdjustment *adjustment,
gdouble value, gdouble value);
gboolean allow_overshooting,
gboolean snap_to_border);
static void gtk_scrolled_window_cancel_deceleration (GtkScrolledWindow *scrolled_window); static void gtk_scrolled_window_cancel_deceleration (GtkScrolledWindow *scrolled_window);
@ -695,16 +693,16 @@ scrolled_window_drag_update_cb (GtkScrolledWindow *scrolled_window,
if (hadjustment && may_hscroll (scrolled_window)) if (hadjustment && may_hscroll (scrolled_window))
{ {
dx = priv->drag_start_x - offset_x; dx = priv->drag_start_x - offset_x;
_gtk_scrolled_window_set_adjustment_value (scrolled_window, hadjustment, _gtk_scrolled_window_set_adjustment_value (scrolled_window,
dx, TRUE, FALSE); hadjustment, dx);
} }
vadjustment = gtk_range_get_adjustment (GTK_RANGE (priv->vscrollbar)); vadjustment = gtk_range_get_adjustment (GTK_RANGE (priv->vscrollbar));
if (vadjustment && may_vscroll (scrolled_window)) if (vadjustment && may_vscroll (scrolled_window))
{ {
dy = priv->drag_start_y - offset_y; dy = priv->drag_start_y - offset_y;
_gtk_scrolled_window_set_adjustment_value (scrolled_window, vadjustment, _gtk_scrolled_window_set_adjustment_value (scrolled_window,
dy, TRUE, FALSE); vadjustment, dy);
} }
gtk_scrolled_window_invalidate_overshoot (scrolled_window); gtk_scrolled_window_invalidate_overshoot (scrolled_window);
@ -2484,45 +2482,27 @@ gtk_scrolled_window_scroll_event (GtkWidget *widget,
return handled; return handled;
} }
static gboolean static void
_gtk_scrolled_window_set_adjustment_value (GtkScrolledWindow *scrolled_window, _gtk_scrolled_window_set_adjustment_value (GtkScrolledWindow *scrolled_window,
GtkAdjustment *adjustment, GtkAdjustment *adjustment,
gdouble value, gdouble value)
gboolean allow_overshooting,
gboolean snap_to_border)
{ {
GtkScrolledWindowPrivate *priv = scrolled_window->priv; GtkScrolledWindowPrivate *priv = scrolled_window->priv;
gdouble lower, upper, *prev_value; gdouble lower, upper, *prev_value;
lower = gtk_adjustment_get_lower (adjustment); lower = gtk_adjustment_get_lower (adjustment) - MAX_OVERSHOOT_DISTANCE;
upper = gtk_adjustment_get_upper (adjustment) - upper = gtk_adjustment_get_upper (adjustment) -
gtk_adjustment_get_page_size (adjustment); gtk_adjustment_get_page_size (adjustment) + MAX_OVERSHOOT_DISTANCE;
if (adjustment == gtk_range_get_adjustment (GTK_RANGE (priv->hscrollbar))) if (adjustment == gtk_range_get_adjustment (GTK_RANGE (priv->hscrollbar)))
prev_value = &priv->unclamped_hadj_value; prev_value = &priv->unclamped_hadj_value;
else if (adjustment == gtk_range_get_adjustment (GTK_RANGE (priv->vscrollbar))) else if (adjustment == gtk_range_get_adjustment (GTK_RANGE (priv->vscrollbar)))
prev_value = &priv->unclamped_vadj_value; prev_value = &priv->unclamped_vadj_value;
else else
return FALSE; return;
if (snap_to_border)
{
if (*prev_value < 0 && value > 0)
value = 0;
else if (*prev_value > upper && value < upper)
value = upper;
}
if (allow_overshooting)
{
lower -= MAX_OVERSHOOT_DISTANCE;
upper += MAX_OVERSHOOT_DISTANCE;
}
*prev_value = CLAMP (value, lower, upper); *prev_value = CLAMP (value, lower, upper);
gtk_adjustment_set_value (adjustment, value); gtk_adjustment_set_value (adjustment, value);
return (*prev_value != value);
} }
static gboolean static gboolean