]> Pileus Git - ~andy/gtk/commitdiff
menubutton: set DROPDOWN_MENU hint on the menu toplevel
authorCosimo Cecchi <cosimoc@gnome.org>
Mon, 17 Sep 2012 13:50:03 +0000 (09:50 -0400)
committerCosimo Cecchi <cosimoc@gnome.org>
Mon, 17 Sep 2012 13:50:03 +0000 (09:50 -0400)
Restore the behavior introduced in
598163e52684019e4975c3d4ca728a54b00c2f74, which regressed in commit
5a3442bf9c470736c8846534607be5825c22410b.

gtk/gtkmenubutton.c

index b5f7547957d14834e05bd92ebe721183876533b9..0edd78b7ca25ca20406a915eec42f119b7a52c63 100644 (file)
@@ -249,6 +249,7 @@ menu_position_up_down_func (GtkMenu       *menu,
 {
   GtkMenuButtonPrivate *priv = menu_button->priv;
   GtkWidget *widget = GTK_WIDGET (menu_button);
+  GtkWidget *toplevel;
   GtkRequisition menu_req;
   GtkTextDirection direction;
   GdkRectangle monitor;
@@ -258,6 +259,16 @@ menu_position_up_down_func (GtkMenu       *menu,
   GtkAllocation allocation, arrow_allocation;
   GtkAlign align;
 
+  /* In the common case the menu button is showing a dropdown menu, set the
+   * corresponding type hint on the toplevel, so the WM can omit the top side
+   * of the shadows.
+   */
+  if (priv->arrow_type == GTK_ARROW_DOWN)
+    {
+      toplevel = gtk_widget_get_toplevel (GTK_WIDGET (priv->popup));
+      gtk_window_set_type_hint (GTK_WINDOW (toplevel), GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU);
+    }
+
   gtk_widget_get_preferred_size (GTK_WIDGET (priv->popup),
                                  &menu_req, NULL);