2005-08-22 Tommi Komulainen <tommi.komulainen@nokia.com>

* hildon-widgets/hildon-grid.c (hildon_grid_set_num_columns): Never
	allow area_rows to be 0 (ie. before widget is visible), otherwise the
	initial jump_scrollbar_to_focused() scrolls wrong.  N#17152

diff --git a/ChangeLog b/ChangeLog
index f07321d..ca965f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-08-22  Tommi Komulainen  <tommi.komulainen@nokia.com>
 
+       * hildon-widgets/hildon-grid.c (hildon_grid_set_num_columns): Never
+       allow area_rows to be 0 (ie. before widget is visible), otherwise the
+       initial jump_scrollbar_to_focused() scrolls wrong.  N#17152
+
+2005-08-22  Tommi Komulainen  <tommi.komulainen@nokia.com>
+
        * hildon-widgets/hildon-calendar-popup.c (hildon_calendar_popup_init):
        Do not override the week-start property of GtkCalendar according to
        the hildon-libs PO file, it is automatically determined from locale

diff --git a/hildon-widgets/hildon-grid.c b/hildon-widgets/hildon-grid.c
index c474da2..be506b2 100644 (file)
--- a/hildon-widgets/hildon-grid.c
+++ b/hildon-widgets/hildon-grid.c
@@ -441,7 +441,7 @@ hildon_grid_set_num_columns(HildonGrid * grid, gint columns)
         priv->num_columns = DEFAULT_N_COLUMNS;
     
     /* Update estimated row-count for jump_scrollbar... */
-    priv->area_rows = priv->area_height / priv->num_columns;
+    priv->area_rows = MAX(priv->area_height / priv->num_columns, 1);
 
     /* Size could have changed. Scroll view so there's something to show. */
     adjust_scrollbar_height(grid);