diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 700ec5f36b..ffcc815387 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -2030,8 +2030,6 @@ gtk_menu_popdown (GtkMenu *menu) menu_shell->priv->active = FALSE; menu_shell->priv->ignore_enter = FALSE; - priv->have_position = FALSE; - gtk_menu_stop_scrolling (menu); gtk_menu_stop_navigating_submenu (menu); @@ -2765,32 +2763,6 @@ static void gtk_menu_measure (GtkWidget *widget, single_height += arrow_border.top + arrow_border.bottom; min_height = MIN (min_height, single_height); - if (priv->have_position) - { - GdkDisplay *display; - GdkMonitor *monitor; - GdkRectangle workarea; - GtkBorder border; - - display = gtk_widget_get_display (priv->toplevel); - monitor = gdk_display_get_monitor (display, priv->monitor_num); - gdk_monitor_get_workarea (monitor, &workarea); - - if (priv->position_y + min_height > workarea.y + workarea.height) - min_height = workarea.y + workarea.height - priv->position_y; - - if (priv->position_y + nat_height > workarea.y + workarea.height) - nat_height = workarea.y + workarea.height - priv->position_y; - - _gtk_window_get_shadow_width (GTK_WINDOW (priv->toplevel), &border); - - if (priv->position_y + border.top < workarea.y) - { - min_height -= workarea.y - (priv->position_y + border.top); - nat_height -= workarea.y - (priv->position_y + border.top); - } - } - *minimum = min_height; *natural = nat_height; diff --git a/gtk/gtkmenuprivate.h b/gtk/gtkmenuprivate.h index 5a24b4a465..7507cb7886 100644 --- a/gtk/gtkmenuprivate.h +++ b/gtk/gtkmenuprivate.h @@ -88,7 +88,6 @@ struct _GtkMenuPrivate guint upper_arrow_prelight : 1; guint lower_arrow_prelight : 1; - guint have_position : 1; guint have_layout : 1; guint seen_item_enter : 1; guint ignore_button_release : 1;