Disable tooltips in touchscreen mode.

2007-08-07  Kristian Rietveld  <kris@imendio.com>

	* gtk/gtktooltip.c (_gtk_tooltip_handle_event): Disable tooltips
	in touchscreen mode.

svn path=/trunk/; revision=18586

diff --git a/ChangeLog b/ChangeLog
index 0412b662bf37f84440985c7c020ecf03785248a8..fb0709a3d203f17bed02eeb1011c0823dae6683c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-07  Kristian Rietveld  <kris@imendio.com>
+
+       * gtk/gtktooltip.c (_gtk_tooltip_handle_event): Disable tooltips
+       in touchscreen mode.
+
 2007-07-31  Richard Hult  <richard@imendio.com>
 
        * gdk/quartz/gdkwindow-quartz.c: (gdk_window_get_geometry):

diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 666ab786899c14d53b4bf8555a3a2ffc33073da4..cc44d5d50ae7f4ec4e4a5c0282356bf041a0d809 100644 (file)
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -1078,9 +1078,20 @@ _gtk_tooltip_handle_event (GdkEvent *event)
 {
   gint x, y;
   gboolean return_value = FALSE;
+  gboolean touchscreen;
   GtkWidget *has_tooltip_widget = NULL;
+  GdkScreen *screen;
   GdkDisplay *display;
   GtkTooltip *current_tooltip;
+  GtkSettings *settings;
+
+  /* Disable tooltips in touchscreen mode */
+  screen = gdk_drawable_get_screen (event->any.window);
+  settings = gtk_settings_get_for_screen (screen);
+  g_object_get (settings, "gtk-touchscreen-mode", &touchscreen, NULL);
+
+  if (touchscreen)
+    return;
 
   has_tooltip_widget = find_topmost_widget_coords_from_event (event, &x, &y);
   display = gdk_drawable_get_display (event->any.window);