From: Alejandro Piñeiro <apinheiro@igalia.com>
Date: Mon, 25 May 2009 17:11:57 +0000 (+0200)
Subject: Fix minor issues on hildon-pannable-area.c
X-Git-Tag: 2.1.76-1~10
X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=0452d404a4fb945940e38922907575c2edf30241;p=hildon

Fix minor issues on hildon-pannable-area.c

* src/hildon-pannable-area.c
(hildon_pannable_area_init): set scroll_delay_counter and scrollbar_fade_delay
to 0
(hildon_pannable_area_initial_effect): avoid to compute horizontal and
vertical scrollbar visibility, and use the data on private section instead,
remove the initial_hint check
(hildon_pannable_area_expose_event): add the initial_hint check here
---

diff --git a/ChangeLog b/ChangeLog
index 28f1005..d8dd554 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,16 @@
 2009-05-25  Alejandro Pinheiro <apinheiro@igalia.com>
 
 	* src/hildon-pannable-area.c
+	(hildon_pannable_area_init): set scroll_delay_counter and scrollbar_fade_delay
+	to 0
+	(hildon_pannable_area_initial_effect): avoid to compute horizontal and
+	vertical scrollbar visibility, and use the data on private section instead,
+	remove the initial_hint check
+	(hildon_pannable_area_expose_event): add the initial_hint check here
+
+2009-05-25  Alejandro Pinheiro <apinheiro@igalia.com>
+
+	* src/hildon-pannable-area.c
 	(hildon_pannable_area_initial_effect): set to FALSE initial_effect
 	if the fadeout effect was used
 	(hildon_pannable_area_expose_event): check if it is required to
diff --git a/hildon/hildon-pannable-area.c b/hildon/hildon-pannable-area.c
index 10bd3a3..c451b61 100644
--- a/hildon/hildon-pannable-area.c
+++ b/hildon/hildon-pannable-area.c
@@ -647,7 +647,8 @@ hildon_pannable_area_init (HildonPannableArea * area)
   priv->scroll_indicator_timeout = 0;
   priv->motion_event_scroll_timeout = 0;
   priv->scroll_indicator_event_interrupt = 0;
-  priv->scroll_delay_counter = priv->scrollbar_fade_delay;
+  priv->scroll_delay_counter = 0;
+  priv->scrollbar_fade_delay = 0;
   priv->scroll_to_x = -1;
   priv->scroll_to_y = -1;
   priv->first_drag = TRUE;
@@ -1469,24 +1470,15 @@ static void
 hildon_pannable_area_initial_effect (GtkWidget * widget)
 {
   HildonPannableAreaPrivate *priv = HILDON_PANNABLE_AREA (widget)->priv;
-  gboolean hscroll_visible, vscroll_visible;
-
-  if (priv->initial_hint) {
 
-    vscroll_visible = (priv->vadjust->upper - priv->vadjust->lower >
-                       priv->vadjust->page_size);
-    hscroll_visible = (priv->hadjust->upper - priv->hadjust->lower >
-                       priv->hadjust->page_size);
+  if (priv->vscroll_visible || priv->hscroll_visible) {
 
-    if (priv->vscroll_visible || priv->hscroll_visible) {
-
-      priv->scroll_indicator_event_interrupt = 0;
-      priv->scroll_delay_counter = priv->scrollbar_fade_delay;
+    priv->scroll_indicator_event_interrupt = 0;
+    priv->scroll_delay_counter = priv->scrollbar_fade_delay;
 
-      hildon_pannable_area_launch_fade_timeout (HILDON_PANNABLE_AREA (widget), 1.0);
+    hildon_pannable_area_launch_fade_timeout (HILDON_PANNABLE_AREA (widget), 1.0);
 
-      priv->initial_effect = FALSE;
-    }
+    priv->initial_effect = FALSE;
   }
 }
 
@@ -1616,8 +1608,7 @@ hildon_pannable_area_expose_event (GtkWidget * widget,
   GdkColor scroll_color = widget->style->fg[GTK_STATE_INSENSITIVE];
 #endif
 
-  if (G_UNLIKELY (priv->initial_effect)) {
-
+  if (G_UNLIKELY ((priv->initial_hint) && (priv->initial_effect))) {
     hildon_pannable_area_initial_effect (widget);
   }