From: Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
Date: Tue, 31 Oct 2006 16:01:25 +0000 (+0000)
Subject: 2006-10-31 Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
X-Git-Tag: 2.1.66-1~1069
X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=bfdaa98b48b12c17fbc66b25eb3a3d3546e01f0e;p=hildon

2006-10-31 Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>

* hildon-widgets/hildon-scroll-area.c:
	* hildon-widgets/hildon-scroll-area.h: When using a GtkTextView inside
	the HildonScrollArea try to "compensete" the cursor position
	scrolling. Fixes NB#20219.
---

diff --git a/ChangeLog b/ChangeLog
index 24d18a1..01ffc2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-31  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
+
+	* hildon-widgets/hildon-scroll-area.c:
+	* hildon-widgets/hildon-scroll-area.h: When using a GtkTextView inside
+	the HildonScrollArea try to "compensete" the cursor position
+	scrolling. Fixes NB#20219.
+
 2006-10-30  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
 
 	* hildon-widgets/hildon-font-selection-dialog.c: Making the preview
diff --git a/hildon-widgets/hildon-scroll-area.c b/hildon-widgets/hildon-scroll-area.c
index 2957d4a..37751b5 100644
--- a/hildon-widgets/hildon-scroll-area.c
+++ b/hildon-widgets/hildon-scroll-area.c
@@ -72,6 +72,8 @@ static void hildon_scroll_area_fixed_allocate (GtkWidget *widget,
 					       GtkAllocation *allocation,
 					       HildonScrollArea *sc);
 
+static int calculate_size (GtkWidget *widget);
+
 /**
  * hildon_scroll_area_new:
  * @sw: #GtkWidget - #GtkScrolledWindow
@@ -150,16 +152,45 @@ static void hildon_scroll_area_fixed_allocate (GtkWidget *widget,
 			       MIN (sc->outadj->page_size, allocation->height));
 }
 
+
+static int calculate_size (GtkWidget *widget)
+{
+  int size = 0;
+
+  if (GTK_IS_TEXT_VIEW (widget))
+    return 0;
+
+  if (GTK_IS_CONTAINER (widget)) {
+    GList *children = gtk_container_get_children (GTK_CONTAINER (widget));
+    while (children != NULL) {
+      GtkWidget *wid = GTK_WIDGET (children->data);
+      gint sz = calculate_size (wid);
+      if ((GTK_WIDGET_VISIBLE (wid))) {
+        size += sz;
+      }
+
+      children = g_list_next (children);
+    }
+  } else { 
+    size = widget->allocation.height;
+  }
+
+  return size;
+}
+
 static void hildon_scroll_area_child_requisition (GtkWidget *widget,
 						  GtkRequisition *req,
 						  HildonScrollArea *sc)
 {
   /* Limit height to fixed height */
   gint new_req = MAX (req->height, sc->fixed->allocation.height);
+  new_req = MIN (sc->outadj->page_size - adjust_factor, new_req);
+  gint adjust_factor = calculate_size (sc->swouter) * 0.7;
+  adjust_factor = MAX (0, adjust_factor - sc->outadj->value);
+
   gtk_widget_set_size_request (sc->fixed, -1, req->height);
   /* Request inner scrolled window at most page size */
-  gtk_widget_set_size_request (sc->swinner, -1,
-			       MIN (sc->outadj->page_size, new_req));
+  gtk_widget_set_size_request (sc->swinner, -1, new_req);
 }
 
 static void hildon_scroll_area_outer_value_changed (GtkAdjustment *adjustment,
diff --git a/hildon-widgets/hildon-scroll-area.h b/hildon-widgets/hildon-scroll-area.h
index 7866b54..ce1c725 100644
--- a/hildon-widgets/hildon-scroll-area.h
+++ b/hildon-widgets/hildon-scroll-area.h
@@ -31,7 +31,7 @@
 #ifndef __HILDON_SCROLL_AREA_H__
 #define __HILDON_SCROLL_AREA_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
     GtkWidget * hildon_scroll_area_new(GtkWidget * sw, GtkWidget * child);