Commit f1bfdda3 authored by Matthias Clasen's avatar Matthias Clasen

Only push the menu in if the position function said so

parent a553cb50
......@@ -4796,10 +4796,9 @@ gtk_menu_position (GtkMenu *menu,
scroll_offset += monitor.y - y;
y = monitor.y;
}
}
/* FIXME: should this be done in the various position_funcs ? */
x = CLAMP (x, monitor.x, MAX (monitor.x, monitor.x + monitor.width - requisition.width));
x = CLAMP (x, monitor.x, MAX (monitor.x, monitor.x + monitor.width - requisition.width));
}
if (GTK_MENU_SHELL (menu)->priv->active)
{
......@@ -4808,16 +4807,6 @@ gtk_menu_position (GtkMenu *menu,
priv->position_y = y;
}
if (y + requisition.height > monitor.y + monitor.height)
requisition.height = (monitor.y + monitor.height) - y;
if (y < monitor.y)
{
scroll_offset += monitor.y - y;
requisition.height -= monitor.y - y;
y = monitor.y;
}
if (scroll_offset > 0)
{
GtkBorder arrow_border;
......
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