summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Sauer <ensonic@users.sf.net>2014-05-25 21:35:14 +0200
committerMatthias Clasen <mclasen@redhat.com>2014-06-28 11:49:54 -0400
commitf0478c3dfdb14c7ad474ed1d2ac989f8e4ecf3c8 (patch)
tree21b108afe8b359616d7c8544131f4b88217f387e
parentc389fc64f7aa7bcb007efaa8269a24512cb4d56e (diff)
downloadgtk+-f0478c3dfdb14c7ad474ed1d2ac989f8e4ecf3c8.tar.gz
scrolledwindow: fix scrolling with shared adjustment
The GtkPolicyType set on the scrollbar is just about the presentation. What matters for scrolling is the adjustment. https://bugzilla.gnome.org/show_bug.cgi?id=730730
-rw-r--r--gtk/gtkscrolledwindow.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index f9d9e29b6a..ef92aaa3d8 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -2349,8 +2349,7 @@ gtk_scrolled_window_scroll_event (GtkWidget *widget,
if (gdk_event_get_scroll_deltas ((GdkEvent *) event, &delta_x, &delta_y))
{
- if (delta_x != 0.0 &&
- gtk_widget_get_visible (priv->hscrollbar))
+ if (delta_x != 0.0)
{
GtkAdjustment *adj;
gdouble new_value;
@@ -2371,8 +2370,7 @@ gtk_scrolled_window_scroll_event (GtkWidget *widget,
handled = TRUE;
}
- if (delta_y != 0.0 &&
- gtk_widget_get_visible (priv->vscrollbar))
+ if (delta_y != 0.0)
{
GtkAdjustment *adj;
gdouble new_value;
@@ -2402,7 +2400,7 @@ gtk_scrolled_window_scroll_event (GtkWidget *widget,
else
range = priv->hscrollbar;
- if (range && gtk_widget_get_visible (range))
+ if (range)
{
GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (range));
gdouble new_value;