[gtk+] Revert "scrolledwindow: fix scrolling with shared adjustment"
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Revert "scrolledwindow: fix scrolling with shared adjustment"
- Date: Sun, 29 Jun 2014 02:41:08 +0000 (UTC)
commit 4067d0623fa4ea550c99ab790c1239620bad5fda
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Jun 28 22:29:57 2014 -0400
Revert "scrolledwindow: fix scrolling with shared adjustment"
This reverts commit f0478c3dfdb14c7ad474ed1d2ac989f8e4ecf3c8.
Didn't mean to push this.
gtk/gtkscrolledwindow.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index ef92aaa..f9d9e29 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -2349,7 +2349,8 @@ gtk_scrolled_window_scroll_event (GtkWidget *widget,
if (gdk_event_get_scroll_deltas ((GdkEvent *) event, &delta_x, &delta_y))
{
- if (delta_x != 0.0)
+ if (delta_x != 0.0 &&
+ gtk_widget_get_visible (priv->hscrollbar))
{
GtkAdjustment *adj;
gdouble new_value;
@@ -2370,7 +2371,8 @@ gtk_scrolled_window_scroll_event (GtkWidget *widget,
handled = TRUE;
}
- if (delta_y != 0.0)
+ if (delta_y != 0.0 &&
+ gtk_widget_get_visible (priv->vscrollbar))
{
GtkAdjustment *adj;
gdouble new_value;
@@ -2400,7 +2402,7 @@ gtk_scrolled_window_scroll_event (GtkWidget *widget,
else
range = priv->hscrollbar;
- if (range)
+ if (range && gtk_widget_get_visible (range))
{
GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (range));
gdouble new_value;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]