menuitem: don't use content allocation to resize the GdkWindow
This is a fallout from the gadget conversion.
This commit is contained in:
@ -406,11 +406,6 @@ gtk_menu_item_allocate (GtkCssGadget *gadget,
|
|||||||
gdk_rectangle_union (out_clip, &arrow_clip, out_clip);
|
gdk_rectangle_union (out_clip, &arrow_clip, out_clip);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (gtk_widget_get_realized (widget))
|
|
||||||
gdk_window_move_resize (priv->event_window,
|
|
||||||
allocation->x, allocation->y,
|
|
||||||
allocation->width, allocation->height);
|
|
||||||
|
|
||||||
if (priv->submenu)
|
if (priv->submenu)
|
||||||
gtk_menu_reposition (GTK_MENU (priv->submenu));
|
gtk_menu_reposition (GTK_MENU (priv->submenu));
|
||||||
}
|
}
|
||||||
@ -425,6 +420,11 @@ gtk_menu_item_size_allocate (GtkWidget *widget,
|
|||||||
|
|
||||||
gtk_widget_set_allocation (widget, allocation);
|
gtk_widget_set_allocation (widget, allocation);
|
||||||
|
|
||||||
|
if (gtk_widget_get_realized (widget))
|
||||||
|
gdk_window_move_resize (priv->event_window,
|
||||||
|
allocation->x, allocation->y,
|
||||||
|
allocation->width, allocation->height);
|
||||||
|
|
||||||
gtk_css_gadget_allocate (priv->gadget,
|
gtk_css_gadget_allocate (priv->gadget,
|
||||||
allocation,
|
allocation,
|
||||||
gtk_widget_get_allocated_baseline (widget),
|
gtk_widget_get_allocated_baseline (widget),
|
||||||
|
|||||||
Reference in New Issue
Block a user