[maemo-commits] [maemo-commits] r9699 - in projects/haf/trunk/gtkhtml: . debian upstream/patches

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2007-02-06 18:56:12 +0200 (Tue, 06 Feb 2007)
New Revision: 9699

Added:
   projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_proper_adjustment_values.diff
Modified:
   projects/haf/trunk/gtkhtml/ChangeLog
   projects/haf/trunk/gtkhtml/debian/changelog
   projects/haf/trunk/gtkhtml/debian/rules
Log:
  * During button_press_event, we must record the starting (x,y) of the pan using
    gdk_window_get_pointer + gtk_adjustment_get_value from the two adjustments
  * We must compare the absolute value of the "total" pan, not the value itself
  * gtk_html_private_calc_scrollbars allows page_size > upper - lower ... fixed
  * Fixed NB#50763


Modified: projects/haf/trunk/gtkhtml/ChangeLog
===================================================================
--- projects/haf/trunk/gtkhtml/ChangeLog	2007-02-06 16:56:12 UTC (rev 9698)
+++ projects/haf/trunk/gtkhtml/ChangeLog	2007-02-06 16:56:12 UTC (rev 9699)
@@ -1,3 +1,10 @@
+2007-02-06  Gabriel Schulhof <gabriel.schulhof at nokia.com>
+	* During button_press_event, we must record the starting (x,y) of the pan using
+	  gdk_window_get_pointer + gtk_adjustment_get_value from the two adjustments
+	* We must compare the absolute value of the "total" pan, not the value itself
+	* gtk_html_private_calc_scrollbars allows page_size > upper - lower ... fixed
+	* Fixed NB#50763
+
 2007-01-29  Gabriel Schulhof <gabriel.schulhof at nokia.com>
 
 	* When grabbing the page by a link for panning purposes, don't follow the link

Modified: projects/haf/trunk/gtkhtml/debian/changelog
===================================================================
--- projects/haf/trunk/gtkhtml/debian/changelog	2007-02-06 16:56:12 UTC (rev 9698)
+++ projects/haf/trunk/gtkhtml/debian/changelog	2007-02-06 16:56:12 UTC (rev 9699)
@@ -1,3 +1,13 @@
+gtkhtml (3.9.1-2osso16) unstable; urgency=low
+
+  * During button_press_event, we must record the starting (x,y) of the pan using
+    gdk_window_get_pointer + gtk_adjustment_get_value from the two adjustments
+  * We must compare the absolute value of the "total" pan, not the value itself
+  * gtk_html_private_calc_scrollbars allows page_size > upper - lower ... fixed
+  * Fixed NB#50763
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Tue,  6 Feb 2007 18:39:38 +0200
+
 gtkhtml (3.9.1-2osso15) unstable; urgency=low
 
   * When grabbing the page by a link for panning purposes, don't follow the link

Modified: projects/haf/trunk/gtkhtml/debian/rules
===================================================================
--- projects/haf/trunk/gtkhtml/debian/rules	2007-02-06 16:56:12 UTC (rev 9698)
+++ projects/haf/trunk/gtkhtml/debian/rules	2007-02-06 16:56:12 UTC (rev 9699)
@@ -60,6 +60,7 @@
 	patch -p0 < upstream/patches/gtkhtml_better_spacing.diff
 	patch -p0 < upstream/patches/gtkhtml_text_selection_with_proper_doubleclick.diff
 	patch -p0 < upstream/patches/gtkhtml_dont_click_link_when_panning.diff
+	patch -p0 < upstream/patches/gtkhtml_proper_adjustment_values.diff
 	cd $(SOURCE_DIR) && ./autogen.sh
 
 

Added: projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_proper_adjustment_values.diff
===================================================================
--- projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_proper_adjustment_values.diff	2007-02-06 16:56:12 UTC (rev 9698)
+++ projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_proper_adjustment_values.diff	2007-02-06 16:56:12 UTC (rev 9699)
@@ -0,0 +1,24 @@
+diff -ru gtkhtml-3.9.1/src/gtkhtml.c gtkhtml-3.9.1.mod/src/gtkhtml.c
+--- gtkhtml-3.9.1/src/gtkhtml.c	2007-02-06 17:08:09.000000000 +0200
++++ gtkhtml-3.9.1.mod/src/gtkhtml.c	2007-02-06 18:31:54.000000000 +0200
+@@ -3941,8 +3941,11 @@
+ 
+ 	/* printf ("calc scrollbars\n"); */
+ 
+-	height = html_engine_get_doc_height (html->engine);
+ 	width = html_engine_get_doc_width (html->engine);
++	height = html_engine_get_doc_height (html->engine);
++
++	width = MAX (width, html->engine->width) ;
++	height = MAX (height, html->engine->height) ;
+ 
+ 	layout = GTK_LAYOUT (html);
+ 	hadj = layout->hadjustment;
+@@ -3972,7 +3975,6 @@
+ 		if (changed_x)
+ 			*changed_x = TRUE;
+ 	}
+-
+ }
+ 
+