Commit 4e67511f authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

Don't do the popup-on-click handling for menubars. (#159931, Søren

2004-11-29  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Don't
	do the popup-on-click handling for menubars.  (#159931,
	Søren Sandmann)

	* gtk/gtkmenuitem.c (gtk_real_menu_item_select): Don't
	handle popup delay if the submenu is already mapped.
parent eec3339f
2004-11-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Don't
do the popup-on-click handling for menubars. (#159931,
Søren Sandmann)
* gtk/gtkmenuitem.c (gtk_real_menu_item_select): Don't
handle popup delay if the submenu is already mapped.
Mon Nov 29 16:56:33 2004 Manish Singh <yosh@gimp.org>
* gtk/gtkcellview.h: remove gtk_cell_view_set_cell_data() declaration.
......@@ -8,7 +17,7 @@ Mon Nov 29 16:56:33 2004 Manish Singh <yosh@gimp.org>
* gtk/gtkfilechooserdefault.c (trap_activate_cb): Don't handle
Enter if we are in SELECT_FOLDER or CREATE_FOLDER actions. This
lets us navigate thei file system more easily.
lets us navigate the file system more easily.
(gtk_file_chooser_default_should_respond): If we are in
SELECT_FOLDER or CREATE_FOLDER modes, return TRUE if something is
selected.
......
2004-11-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Don't
do the popup-on-click handling for menubars. (#159931,
Søren Sandmann)
* gtk/gtkmenuitem.c (gtk_real_menu_item_select): Don't
handle popup delay if the submenu is already mapped.
Mon Nov 29 16:56:33 2004 Manish Singh <yosh@gimp.org>
* gtk/gtkcellview.h: remove gtk_cell_view_set_cell_data() declaration.
......@@ -8,7 +17,7 @@ Mon Nov 29 16:56:33 2004 Manish Singh <yosh@gimp.org>
* gtk/gtkfilechooserdefault.c (trap_activate_cb): Don't handle
Enter if we are in SELECT_FOLDER or CREATE_FOLDER actions. This
lets us navigate thei file system more easily.
lets us navigate the file system more easily.
(gtk_file_chooser_default_should_respond): If we are in
SELECT_FOLDER or CREATE_FOLDER modes, return TRUE if something is
selected.
......
2004-11-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Don't
do the popup-on-click handling for menubars. (#159931,
Søren Sandmann)
* gtk/gtkmenuitem.c (gtk_real_menu_item_select): Don't
handle popup delay if the submenu is already mapped.
Mon Nov 29 16:56:33 2004 Manish Singh <yosh@gimp.org>
* gtk/gtkcellview.h: remove gtk_cell_view_set_cell_data() declaration.
......@@ -8,7 +17,7 @@ Mon Nov 29 16:56:33 2004 Manish Singh <yosh@gimp.org>
* gtk/gtkfilechooserdefault.c (trap_activate_cb): Don't handle
Enter if we are in SELECT_FOLDER or CREATE_FOLDER actions. This
lets us navigate thei file system more easily.
lets us navigate the file system more easily.
(gtk_file_chooser_default_should_respond): If we are in
SELECT_FOLDER or CREATE_FOLDER modes, return TRUE if something is
selected.
......
2004-11-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Don't
do the popup-on-click handling for menubars. (#159931,
Søren Sandmann)
* gtk/gtkmenuitem.c (gtk_real_menu_item_select): Don't
handle popup delay if the submenu is already mapped.
Mon Nov 29 16:56:33 2004 Manish Singh <yosh@gimp.org>
* gtk/gtkcellview.h: remove gtk_cell_view_set_cell_data() declaration.
......@@ -8,7 +17,7 @@ Mon Nov 29 16:56:33 2004 Manish Singh <yosh@gimp.org>
* gtk/gtkfilechooserdefault.c (trap_activate_cb): Don't handle
Enter if we are in SELECT_FOLDER or CREATE_FOLDER actions. This
lets us navigate thei file system more easily.
lets us navigate the file system more easily.
(gtk_file_chooser_default_should_respond): If we are in
SELECT_FOLDER or CREATE_FOLDER modes, return TRUE if something is
selected.
......
......@@ -838,13 +838,15 @@ gtk_real_menu_item_select (GtkItem *item)
menu_item = GTK_MENU_ITEM (item);
if (menu_item->submenu)
if (menu_item->submenu &&
!GTK_WIDGET_MAPPED (menu_item->submenu))
{
gint popup_delay;
if (menu_item->timer)
{
g_source_remove (menu_item->timer);
menu_item->timer = 0;
popup_delay = 0;
}
else
......
......@@ -508,10 +508,15 @@ gtk_menu_shell_button_release (GtkWidget *widget,
_gtk_menu_item_is_selectable (menu_item))
{
if (GTK_MENU_ITEM (menu_item)->submenu == NULL)
gtk_menu_shell_activate_item (menu_shell, menu_item, TRUE);
else
gtk_menu_item_select (GTK_MENU_ITEM (menu_item));
return TRUE;
{
gtk_menu_shell_activate_item (menu_shell, menu_item, TRUE);
return TRUE;
}
else if (GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement != GTK_TOP_BOTTOM)
{
gtk_menu_item_select (GTK_MENU_ITEM (menu_item));
return TRUE;
}
}
else if (menu_item &&
!_gtk_menu_item_is_selectable (menu_item) &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment