callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove an unneeded variable

Browse Source
This commit is contained in:
Matthias Clasen
2011-12-23 00:38:59 +00:00
parent 547baf0e5f
commit 53ce519b1f
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gtkmenu.c
View File

@ -4613,7 +4613,6 @@ gtk_menu_position (GtkMenu *menu,
GtkRequisition requisition; GtkRequisition requisition;
gint x, y; gint x, y;
gint scroll_offset; gint scroll_offset;
gint menu_height;
GdkScreen *screen; GdkScreen *screen;
GdkScreen *pointer_screen; GdkScreen *pointer_screen;
GdkRectangle monitor; GdkRectangle monitor;
@ -4786,12 +4785,10 @@ gtk_menu_position (GtkMenu *menu,
if (priv->initially_pushed_in) if (priv->initially_pushed_in)
{ {
menu_height = requisition.height; if (y + requisition.height > monitor.y + monitor.height)
if (y + menu_height > monitor.y + monitor.height)
{ {
scroll_offset -= y + menu_height - (monitor.y + monitor.height); scroll_offset -= y + requisition.height - (monitor.y + monitor.height);
y = (monitor.y + monitor.height) - menu_height; y = (monitor.y + monitor.height) - requisition.height;
} }
if (y < monitor.y) if (y < monitor.y)