AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-18 09:00:34 +00:00
Code Issues Projects Releases Wiki Activity

Another attempt at fixing menu positioning corner cases

Browse Source 
The code for moving the menu into monitor / workarea was duplicated,
once for the push-in scenario and once for without. The problem with
the second case is that we've stored the menu position before adjusting
it. That made us remember an out-of-monitor position that then later
triggered _another_ copy of this code in the size-request implementation.

Unify this to only have one copy of code, and only store the menu
position after adjusting it to be inside the monitor. This fixes both
statusicon menus that get popped up from the panel, outside the workarea,
to not have scroll arrows, and the gedit language menu which was not
placed in the monitor at all after the initial workarea commit.

As a side-effect of this change, we now make large scrolling menus
occupy the full height of the workarea. Before this change, we were
keeping either the top or bottom edge put while shrinking the menu
to fit in the monitor.

https://bugzilla.gnome.org/show_bug.cgi?id=667249
This commit is contained in:
Matthias Clasen 2012-01-05 23:21:30 -05:00
parent 00e84f1cdb
commit c74ac08143
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gtk/gtkmenu.c
View File

@ -4783,23 +4783,22 @@ gtk_menu_position (GtkMenu *menu,
scroll_offset = 0; scroll_offset = 0;
if (priv->initially_pushed_in) if (y + requisition.height > monitor.y + monitor.height)
{ {
if (y + requisition.height > monitor.y + monitor.height) if (priv->initially_pushed_in)
{ scroll_offset += (monitor.y + monitor.height) - requisition.height - y;
scroll_offset -= y + requisition.height - (monitor.y + monitor.height); y = (monitor.y + monitor.height) - requisition.height;
y = (monitor.y + monitor.height) - requisition.height;
}
if (y < monitor.y)
{
scroll_offset += monitor.y - y;
y = monitor.y;
}
x = CLAMP (x, monitor.x, MAX (monitor.x, monitor.x + monitor.width - requisition.width));
} }
if (y < monitor.y)
{
if (priv->initially_pushed_in)
scroll_offset += monitor.y - y;
y = monitor.y;
}
x = CLAMP (x, monitor.x, MAX (monitor.x, monitor.x + monitor.width - requisition.width));
if (GTK_MENU_SHELL (menu)->priv->active) if (GTK_MENU_SHELL (menu)->priv->active)
{ {
priv->have_position = TRUE; priv->have_position = TRUE;