X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-scrollable.c;h=268f304cc4a1be663f55a68c540affc44e285a32;hp=3c92c3cfc024c25ba6ac22adb350da175689a139;hb=HEAD;hpb=a6429d4d5c26c422406f633d7ed70f760200e11a

diff --git a/src/widgets/modest-scrollable.c b/src/widgets/modest-scrollable.c
index 3c92c3c..268f304 100644
--- a/src/widgets/modest-scrollable.c
+++ b/src/widgets/modest-scrollable.c
@@ -293,6 +293,11 @@ modest_scrollable_scroll (ModestScrollable *scrollable,
 		h_pos = h_adj->value + h_adj->step_increment * horizontal;
 		if (horizontal > 0) {
 			h_pos += h_adj->page_size;
+			if (h_pos > h_adj->upper - h_adj->page_size) {
+				h_pos = h_adj->upper - h_adj->page_size;
+			} else if (h_pos < 0) {
+				h_pos = 0;
+			}
 		}
 	}
 
@@ -305,6 +310,11 @@ modest_scrollable_scroll (ModestScrollable *scrollable,
 		v_pos = v_adj->value + v_adj->step_increment * vertical;
 		if (vertical > 0) {
 			v_pos += v_adj->page_size;
+			if (v_pos > v_adj->upper - v_adj->page_size) {
+				v_pos = v_adj->upper - v_adj->page_size;
+			} else if (v_pos < 0) {
+				v_pos = 0;
+			}
 		}
 	}