AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

menu: Simplify function

Browse Source 
No need to do complicated math when we can just look at the allocation.
This commit is contained in:
Benjamin Otte 2019-04-25 01:27:58 +02:00 committed by Matthias Clasen
parent e702a33432
commit d971c4e69d
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gtk/gtkmenu.c
View File

@ -3521,32 +3521,21 @@ compute_child_offset (GtkMenu *menu,
gint *height)
{
GtkMenuPrivate *priv = menu->priv;
gint item_top_attach;
gint child_offset = 0;
gint i;
get_effective_child_attach (menu_item, &item_top_attach);
/* there is a possibility that we get called before _size_request,
* so check the height table for safety.
*/
if (!priv->heights || priv->heights_length < gtk_menu_get_n_rows (menu))
return FALSE;
/* when we have a row with only invisible children, its height will
* be zero, so there's no need to check WIDGET_VISIBLE here
*/
for (i = 0; i < item_top_attach; i++)
child_offset += priv->heights[i];
GtkAllocation allocation;
gtk_widget_get_allocation (menu_item, &allocation);
if (allocation.width > 0)
{
if (offset)
*offset = child_offset;
*offset = allocation.y + priv->scroll_offset;
if (height)
*height = priv->heights[item_top_attach];
*height = allocation.height;
return TRUE;
}
return FALSE;
}
static void
gtk_menu_scroll_item_visible (GtkMenuShell *menu_shell,
GtkWidget *menu_item)