callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

menus: Select the first item for touch devices

Browse Source 
This was done through gtk-touchscreen-mode. Now it is handled
dynamically on the current event source device.
This commit is contained in:
Carlos Garnacho
2011-12-12 18:21:40 +01:00
committed by Matthias Clasen
parent 47f9435e99
commit c49fc433de
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkmenu.c
View File

@ -1480,7 +1480,7 @@ gtk_menu_popup_for_device (GtkMenu *menu,
GtkMenuShell *menu_shell; GtkMenuShell *menu_shell;
gboolean grab_keyboard; gboolean grab_keyboard;
GtkWidget *parent_toplevel; GtkWidget *parent_toplevel;
GdkDevice *keyboard, *pointer; GdkDevice *keyboard, *pointer, *source_device = NULL;
g_return_if_fail (GTK_IS_MENU (menu)); g_return_if_fail (GTK_IS_MENU (menu));
g_return_if_fail (device == NULL || GDK_IS_DEVICE (device)); g_return_if_fail (device == NULL || GDK_IS_DEVICE (device));
@ -1617,6 +1617,7 @@ gtk_menu_popup_for_device (GtkMenu *menu,
(current_event->type != GDK_ENTER_NOTIFY)) (current_event->type != GDK_ENTER_NOTIFY))
menu_shell->priv->ignore_enter = TRUE; menu_shell->priv->ignore_enter = TRUE;
source_device = gdk_event_get_source_device (current_event);
gdk_event_free (current_event); gdk_event_free (current_event);
} }
else else
@ -1686,17 +1687,9 @@ gtk_menu_popup_for_device (GtkMenu *menu,
gtk_menu_scroll_to (menu, priv->scroll_offset); gtk_menu_scroll_to (menu, priv->scroll_offset);
/* if no item is selected, select the first one */ /* if no item is selected, select the first one */
if (!menu_shell->priv->active_menu_item) if (!menu_shell->priv->active_menu_item &&
{ source_device && gdk_device_get_source (source_device) == GDK_SOURCE_TOUCHSCREEN)
gboolean touchscreen_mode;
g_object_get (gtk_widget_get_settings (GTK_WIDGET (menu)),
"gtk-touchscreen-mode", &touchscreen_mode,
NULL);
if (touchscreen_mode)
gtk_menu_shell_select_first (menu_shell, TRUE); gtk_menu_shell_select_first (menu_shell, TRUE);
}
/* Once everything is set up correctly, map the toplevel */ /* Once everything is set up correctly, map the toplevel */
gtk_widget_show (priv->toplevel); gtk_widget_show (priv->toplevel);