[maemo-commits] [maemo-commits] r11897 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: tko
Date: 2007-05-28 15:35:19 +0300 (Mon, 28 May 2007)
New Revision: 11897

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkmenu.c
Log:
GtkMenu: use delay factor to avoid scroll by item scrolling too fast

2007-05-28  Tommi Komulainen  <tommi.komulainen at nokia.com>

	* gtk/gtkmenu.c: add SCROLL_DELAY_FACTOR
	(gtk_menu_scroll_timeout_initial): in touchscreen use the delay factor
	to slow scroll by item down to reasonable speed
	(gtk_menu_start_scrolling): use gtk-timeout-initial rather than
	gtk-timeout-repeat to not start scrolling so quickly


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-05-28 12:15:30 UTC (rev 11896)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-05-28 12:35:19 UTC (rev 11897)
@@ -1,3 +1,11 @@
+2007-05-28  Tommi Komulainen  <tommi.komulainen at nokia.com>
+
+	* gtk/gtkmenu.c: add SCROLL_DELAY_FACTOR
+	(gtk_menu_scroll_timeout_initial): in touchscreen use the delay factor
+	to slow scroll by item down to reasonable speed
+	(gtk_menu_start_scrolling): use gtk-timeout-initial rather than
+	gtk-timeout-repeat to not start scrolling so quickly
+
 2007-05-28  Xan Lopez  <xan.lopez at nokia.com>
 	
 	Merge from upstream, Fixes: NB#53826

Modified: projects/haf/trunk/gtk+/gtk/gtkmenu.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkmenu.c	2007-05-28 12:15:30 UTC (rev 11896)
+++ projects/haf/trunk/gtk+/gtk/gtkmenu.c	2007-05-28 12:35:19 UTC (rev 11897)
@@ -55,6 +55,10 @@
 
 #define MENU_ITEM_CLASS(w)   GTK_MENU_ITEM_GET_CLASS (w)
 
+#ifdef MAEMO_CHANGES
+#define SCROLL_DELAY_FACTOR 5    /* Scroll repeat multiplier */
+#endif /* MAEMO_CHANGES */
+
 #define DEFAULT_POPUP_DELAY    225
 #define DEFAULT_POPDOWN_DELAY  1000
 
@@ -3484,6 +3488,11 @@
                 "gtk-timeout-repeat", &timeout,
                 "gtk-touchscreen-mode", &touchscreen_mode,
                 NULL);
+#ifdef MAEMO_CHANGES
+  /* as we scroll by item, use the multiplier or we'll go way too fast */
+  if (touchscreen_mode)
+    timeout *= SCROLL_DELAY_FACTOR;
+#endif /* MAEMO_CHANGES */
 
   gtk_menu_do_timeout_scroll (menu, touchscreen_mode);
 
@@ -3503,7 +3512,11 @@
   gboolean touchscreen_mode;
 
   g_object_get (gtk_widget_get_settings (GTK_WIDGET (menu)),
+#ifdef MAEMO_CHANGES
+                "gtk-timeout-initial", &timeout,
+#else  /* !MAEMO_CHANGES */
                 "gtk-timeout-repeat", &timeout,
+#endif /* !MAEMO_CHANGES */
                 "gtk-touchscreen-mode", &touchscreen_mode,
                 NULL);