gtk/gtkoptionmenu.c make option menus work when some of the menuitems are

Sun Nov  1 21:00:06 GMT 1998  Austin Donnelly  <austin@greenend.org.uk>

	* gtk/gtkoptionmenu.c
	* gtk/gtkmenushell.c: make option menus work when some of the
	menuitems are hidden - previously, option menu would popup too
	high.
This commit is contained in:
GMT 1998 Austin Donnelly 1998-11-01 21:10:44 +00:00 committed by Austin Donnelly
parent 5492003cff
commit b9a51f3530
9 changed files with 58 additions and 3 deletions

View File

@ -1,3 +1,10 @@
Sun Nov 1 21:00:06 GMT 1998 Austin Donnelly <austin@greenend.org.uk>
* gtk/gtkoptionmenu.c
* gtk/gtkmenushell.c: make option menus work when some of the
menuitems are hidden - previously, option menu would popup too
high.
1998-10-31 Raja R Harinath <harinath@cs.umn.edu>
* gtk/gtkfeatures.h.in: Remove `#pragma }'.

View File

@ -1,3 +1,10 @@
Sun Nov 1 21:00:06 GMT 1998 Austin Donnelly <austin@greenend.org.uk>
* gtk/gtkoptionmenu.c
* gtk/gtkmenushell.c: make option menus work when some of the
menuitems are hidden - previously, option menu would popup too
high.
1998-10-31 Raja R Harinath <harinath@cs.umn.edu>
* gtk/gtkfeatures.h.in: Remove `#pragma }'.

View File

@ -1,3 +1,10 @@
Sun Nov 1 21:00:06 GMT 1998 Austin Donnelly <austin@greenend.org.uk>
* gtk/gtkoptionmenu.c
* gtk/gtkmenushell.c: make option menus work when some of the
menuitems are hidden - previously, option menu would popup too
high.
1998-10-31 Raja R Harinath <harinath@cs.umn.edu>
* gtk/gtkfeatures.h.in: Remove `#pragma }'.

View File

@ -1,3 +1,10 @@
Sun Nov 1 21:00:06 GMT 1998 Austin Donnelly <austin@greenend.org.uk>
* gtk/gtkoptionmenu.c
* gtk/gtkmenushell.c: make option menus work when some of the
menuitems are hidden - previously, option menu would popup too
high.
1998-10-31 Raja R Harinath <harinath@cs.umn.edu>
* gtk/gtkfeatures.h.in: Remove `#pragma }'.

View File

@ -1,3 +1,10 @@
Sun Nov 1 21:00:06 GMT 1998 Austin Donnelly <austin@greenend.org.uk>
* gtk/gtkoptionmenu.c
* gtk/gtkmenushell.c: make option menus work when some of the
menuitems are hidden - previously, option menu would popup too
high.
1998-10-31 Raja R Harinath <harinath@cs.umn.edu>
* gtk/gtkfeatures.h.in: Remove `#pragma }'.

View File

@ -1,3 +1,10 @@
Sun Nov 1 21:00:06 GMT 1998 Austin Donnelly <austin@greenend.org.uk>
* gtk/gtkoptionmenu.c
* gtk/gtkmenushell.c: make option menus work when some of the
menuitems are hidden - previously, option menu would popup too
high.
1998-10-31 Raja R Harinath <harinath@cs.umn.edu>
* gtk/gtkfeatures.h.in: Remove `#pragma }'.

View File

@ -1,3 +1,10 @@
Sun Nov 1 21:00:06 GMT 1998 Austin Donnelly <austin@greenend.org.uk>
* gtk/gtkoptionmenu.c
* gtk/gtkmenushell.c: make option menus work when some of the
menuitems are hidden - previously, option menu would popup too
high.
1998-10-31 Raja R Harinath <harinath@cs.umn.edu>
* gtk/gtkfeatures.h.in: Remove `#pragma }'.

View File

@ -868,7 +868,9 @@ gtk_menu_shell_move_selected (GtkMenuShell *menu_shell,
{
node = node->next;
while (node != start_node &&
(!node || !GTK_WIDGET_SENSITIVE (node->data)))
(!node ||
!GTK_WIDGET_SENSITIVE (node->data) ||
!GTK_WIDGET_VISIBLE (node->data) ))
{
if (!node)
node = menu_shell->children;
@ -880,7 +882,9 @@ gtk_menu_shell_move_selected (GtkMenuShell *menu_shell,
{
node = node->prev;
while (node != start_node &&
(!node || !GTK_WIDGET_SENSITIVE (node->data)))
(!node ||
!GTK_WIDGET_SENSITIVE (node->data) ||
!GTK_WIDGET_VISIBLE (node->data) ))
{
if (!node)
node = g_list_last (menu_shell->children);

View File

@ -637,7 +637,9 @@ gtk_option_menu_position (GtkMenu *menu,
if (active == child)
break;
menu_ypos -= child->allocation.height;
if (GTK_WIDGET_VISIBLE (child))
menu_ypos -= child->allocation.height;
children = children->next;
}