r3688 - in trunk/src/target/OM-2007.2/libraries/libmokoui2: . doc/reference/tmpl libmokoui

chris at sita.openmoko.org chris at sita.openmoko.org
Wed Dec 19 12:00:13 CET 2007


Author: chris
Date: 2007-12-19 12:00:11 +0100 (Wed, 19 Dec 2007)
New Revision: 3688

Modified:
   trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
   trunk/src/target/OM-2007.2/libraries/libmokoui2/doc/reference/tmpl/moko-stock.sgml
   trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
Log:
        * libmokoui/moko-finger-scroll.c: (moko_finger_scroll_refresh),
        (moko_finger_scroll_dispose):
        Change scrollbar calculation code, as shown in bug #1073 (thanks to
        Renato Filho), make sure to remove *all* source functions on dispose


Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog	2007-12-19 10:09:40 UTC (rev 3687)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog	2007-12-19 11:00:11 UTC (rev 3688)
@@ -1,3 +1,10 @@
+2007-12-19  Chris Lord  <chris at openedhand.com>
+
+	* libmokoui/moko-finger-scroll.c: (moko_finger_scroll_refresh),
+	(moko_finger_scroll_dispose):
+	Change scrollbar calculation code, as shown in bug #1073 (thanks to
+	Renato Filho), make sure to remove *all* source functions on dispose
+
 2007-10-19  Chris Lord  <chris at openedhand.com>
 
 	* libmokoui/moko-finger-scroll.c:

Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/doc/reference/tmpl/moko-stock.sgml
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/doc/reference/tmpl/moko-stock.sgml	2007-12-19 10:09:40 UTC (rev 3687)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/doc/reference/tmpl/moko-stock.sgml	2007-12-19 11:00:11 UTC (rev 3688)
@@ -59,6 +59,13 @@
 
 
 
+<!-- ##### MACRO MOKO_STOCK_CALL_IGNORE ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO MOKO_STOCK_CALL_IN ##### -->
 <para>
 The "Incoming Call" item

Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c	2007-12-19 10:09:40 UTC (rev 3687)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c	2007-12-19 11:00:11 UTC (rev 3688)
@@ -284,21 +284,17 @@
 moko_finger_scroll_refresh (MokoFingerScroll *scroll)
 {
 	MokoFingerScrollPrivate *priv = FINGER_SCROLL_PRIVATE (scroll);
-	GtkAllocation *allocation = &GTK_WIDGET (scroll)->allocation;
 	GtkWidget *widget = GTK_BIN (priv->align)->child;
 	gboolean vscroll, hscroll;
-	GtkRequisition req;
-	guint border;
 	
 	if (!widget) return;
 	
 	/* Calculate if we need scroll indicators */
-	border = gtk_container_get_border_width (GTK_CONTAINER (scroll));
-	gtk_widget_size_request (widget, &req);
-	if (req.width + (border * 2) > allocation->width) hscroll = TRUE;
-	else hscroll = FALSE;
-	if (req.height + (border * 2) > allocation->height) vscroll = TRUE;
-	else vscroll = FALSE;
+	gtk_widget_size_request (widget, NULL);
+	hscroll = (priv->hadjust->upper - priv->hadjust->lower >
+		priv->hadjust->page_size) ? TRUE : FALSE;
+	vscroll = (priv->vadjust->upper - priv->vadjust->lower >
+		priv->vadjust->page_size) ? TRUE : FALSE;
 	
 	/* TODO: Read ltr settings to decide which corner gets scroll
 	 * indicators?
@@ -729,12 +725,9 @@
 static void
 moko_finger_scroll_dispose (GObject * object)
 {
-	MokoFingerScrollPrivate *priv = FINGER_SCROLL_PRIVATE (object);
+	/*MokoFingerScrollPrivate *priv = FINGER_SCROLL_PRIVATE (object);*/
 	
-	if (priv->idle_id) {
-		g_source_remove (priv->idle_id);
-		priv->idle_id = 0;
-	}
+	while (g_source_remove_by_user_data (object));
 	
 	if (G_OBJECT_CLASS (moko_finger_scroll_parent_class)->dispose)
 		G_OBJECT_CLASS (moko_finger_scroll_parent_class)->





More information about the commitlog mailing list