X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkmenuitem.c;h=73c2545dcbd32243d399b27eb8f521e8f2e8754e;hb=cb27c4b08c278ac7e8a882b638dbf30acd1436cf;hp=d21b36302810dc1369b300137f9f33084b433a08;hpb=af00ca81e1787ce59e10cd21b8ee49a246256958;p=~andy%2Fgtk diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index d21b36302..73c2545dc 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ /* @@ -42,9 +40,10 @@ #include "gtkactivatable.h" #include "gtkwidgetprivate.h" #include "gtkintl.h" +#include "gtksettings.h" #include "gtktypebuiltins.h" #include "a11y/gtkmenuitemaccessible.h" - +#include "deprecated/gtktearoffmenuitem.h" /** * SECTION:gtkmenuitem @@ -98,7 +97,10 @@ enum { /* activatable properties */ PROP_ACTIVATABLE_RELATED_ACTION, - PROP_ACTIVATABLE_USE_ACTION_APPEARANCE + PROP_ACTIVATABLE_USE_ACTION_APPEARANCE, + + PROP_ACTION_NAME, + PROP_ACTION_TARGET }; @@ -180,6 +182,7 @@ static void gtk_menu_item_buildable_custom_finished(GtkBuildable *buildab const gchar *tagname, gpointer user_data); +static void gtk_menu_item_actionable_interface_init (GtkActionableInterface *iface); static void gtk_menu_item_activatable_interface_init (GtkActivatableIface *iface); static void gtk_menu_item_update (GtkActivatable *activatable, GtkAction *action, @@ -191,13 +194,6 @@ static void gtk_menu_item_set_related_action (GtkMenuItem *menu static void gtk_menu_item_set_use_action_appearance (GtkMenuItem *menu_item, gboolean use_appearance); -/* Declare deprecated function that need a declaration */ -#ifdef GTK_DISABLE_DEPRECATED -void gtk_menu_item_set_right_justified (GtkMenuItem *menu_item, - gboolean right_justified); -gboolean gtk_menu_item_get_right_justified (GtkMenuItem *menu_item); -#endif /* GTK_DISABLE_DEPRECATED */ - static guint menu_item_signals[LAST_SIGNAL] = { 0 }; static GtkBuildableIface *parent_buildable_iface; @@ -206,7 +202,58 @@ G_DEFINE_TYPE_WITH_CODE (GtkMenuItem, gtk_menu_item, GTK_TYPE_BIN, G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE, gtk_menu_item_buildable_interface_init) G_IMPLEMENT_INTERFACE (GTK_TYPE_ACTIVATABLE, - gtk_menu_item_activatable_interface_init)) + gtk_menu_item_activatable_interface_init) + G_IMPLEMENT_INTERFACE (GTK_TYPE_ACTIONABLE, + gtk_menu_item_actionable_interface_init)) + +static void +gtk_menu_item_set_action_name (GtkActionable *actionable, + const gchar *action_name) +{ + GtkMenuItem *menu_item = GTK_MENU_ITEM (actionable); + + if (!menu_item->priv->action_helper) + menu_item->priv->action_helper = gtk_action_helper_new (actionable); + + gtk_action_helper_set_action_name (menu_item->priv->action_helper, action_name); +} + +static void +gtk_menu_item_set_action_target_value (GtkActionable *actionable, + GVariant *action_target) +{ + GtkMenuItem *menu_item = GTK_MENU_ITEM (actionable); + + if (!menu_item->priv->action_helper) + menu_item->priv->action_helper = gtk_action_helper_new (actionable); + + gtk_action_helper_set_action_target_value (menu_item->priv->action_helper, action_target); +} + +static const gchar * +gtk_menu_item_get_action_name (GtkActionable *actionable) +{ + GtkMenuItem *menu_item = GTK_MENU_ITEM (actionable); + + return gtk_action_helper_get_action_name (menu_item->priv->action_helper); +} + +static GVariant * +gtk_menu_item_get_action_target_value (GtkActionable *actionable) +{ + GtkMenuItem *menu_item = GTK_MENU_ITEM (actionable); + + return gtk_action_helper_get_action_target_value (menu_item->priv->action_helper); +} + +static void +gtk_menu_item_actionable_interface_init (GtkActionableInterface *iface) +{ + iface->set_action_name = gtk_menu_item_set_action_name; + iface->get_action_name = gtk_menu_item_get_action_name; + iface->set_action_target_value = gtk_menu_item_set_action_target_value; + iface->get_action_target_value = gtk_menu_item_get_action_target_value; +} static void gtk_menu_item_class_init (GtkMenuItemClass *klass) @@ -405,6 +452,9 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass) g_object_class_override_property (gobject_class, PROP_ACTIVATABLE_RELATED_ACTION, "related-action"); g_object_class_override_property (gobject_class, PROP_ACTIVATABLE_USE_ACTION_APPEARANCE, "use-action-appearance"); + g_object_class_override_property (gobject_class, PROP_ACTION_NAME, "action-name"); + g_object_class_override_property (gobject_class, PROP_ACTION_TARGET, "action-target"); + gtk_widget_class_install_style_property_parser (widget_class, g_param_spec_enum ("selected-shadow-type", "Selected Shadow Type", @@ -414,14 +464,24 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass) GTK_PARAM_READABLE), gtk_rc_property_parse_enum); + /** + * GtkMenuItem:horizontal-padding: + * + * Padding to left and right of the menu item. + * + * Deprecated: 3.8: use the standard padding CSS property (through objects + * like #GtkStyleContext and #GtkCssProvider); the value of this style + * property is ignored. + */ gtk_widget_class_install_style_property (widget_class, g_param_spec_int ("horizontal-padding", "Horizontal Padding", "Padding to left and right of the menu item", 0, G_MAXINT, - 3, - GTK_PARAM_READABLE)); + 0, + GTK_PARAM_READABLE | + G_PARAM_DEPRECATED)); gtk_widget_class_install_style_property (widget_class, g_param_spec_int ("toggle-spacing", @@ -555,6 +615,8 @@ gtk_menu_item_dispose (GObject *object) GtkMenuItem *menu_item = GTK_MENU_ITEM (object); GtkMenuItemPrivate *priv = menu_item->priv; + g_clear_object (&priv->action_helper); + if (priv->action) { gtk_action_disconnect_accelerator (priv->action); @@ -564,6 +626,21 @@ gtk_menu_item_dispose (GObject *object) G_OBJECT_CLASS (gtk_menu_item_parent_class)->dispose (object); } +static void +gtk_menu_item_do_set_right_justified (GtkMenuItem *menu_item, + gboolean right_justified) +{ + GtkMenuItemPrivate *priv = menu_item->priv; + + right_justified = right_justified != FALSE; + + if (priv->right_justify != right_justified) + { + priv->right_justify = right_justified; + gtk_widget_queue_resize (GTK_WIDGET (menu_item)); + } +} + static void gtk_menu_item_set_property (GObject *object, guint prop_id, @@ -575,7 +652,7 @@ gtk_menu_item_set_property (GObject *object, switch (prop_id) { case PROP_RIGHT_JUSTIFIED: - gtk_menu_item_set_right_justified (menu_item, g_value_get_boolean (value)); + gtk_menu_item_do_set_right_justified (menu_item, g_value_get_boolean (value)); break; case PROP_SUBMENU: gtk_menu_item_set_submenu (menu_item, g_value_get_object (value)); @@ -595,6 +672,12 @@ gtk_menu_item_set_property (GObject *object, case PROP_ACTIVATABLE_USE_ACTION_APPEARANCE: gtk_menu_item_set_use_action_appearance (menu_item, g_value_get_boolean (value)); break; + case PROP_ACTION_NAME: + gtk_menu_item_set_action_name (GTK_ACTIONABLE (menu_item), g_value_get_string (value)); + break; + case PROP_ACTION_TARGET: + gtk_menu_item_set_action_target_value (GTK_ACTIONABLE (menu_item), g_value_get_variant (value)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -613,7 +696,7 @@ gtk_menu_item_get_property (GObject *object, switch (prop_id) { case PROP_RIGHT_JUSTIFIED: - g_value_set_boolean (value, gtk_menu_item_get_right_justified (menu_item)); + g_value_set_boolean (value, menu_item->priv->right_justify); break; case PROP_SUBMENU: g_value_set_object (value, gtk_menu_item_get_submenu (menu_item)); @@ -633,6 +716,12 @@ gtk_menu_item_get_property (GObject *object, case PROP_ACTIVATABLE_USE_ACTION_APPEARANCE: g_value_set_boolean (value, priv->use_action_appearance); break; + case PROP_ACTION_NAME: + g_value_set_string (value, gtk_action_helper_get_action_name (priv->action_helper)); + break; + case PROP_ACTION_TARGET: + g_value_set_variant (value, gtk_action_helper_get_action_target_value (priv->action_helper)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -666,26 +755,28 @@ gtk_menu_item_detacher (GtkWidget *widget, static void get_arrow_size (GtkWidget *widget, GtkWidget *child, - gint *size) + gint *size, + gint *spacing) { - GtkStyleContext *style_context; - GtkStateFlags state; PangoContext *context; PangoFontMetrics *metrics; gfloat arrow_scaling; + gint arrow_spacing; g_assert (size); gtk_widget_style_get (widget, "arrow-scaling", &arrow_scaling, + "arrow-spacing", &arrow_spacing, NULL); + if (spacing != NULL) + *spacing = arrow_spacing; + context = gtk_widget_get_pango_context (child); - style_context = gtk_widget_get_style_context (child); - state = gtk_widget_get_state_flags (child); metrics = pango_context_get_metrics (context, - gtk_style_context_get_font (style_context, state), + pango_context_get_font_description (context), pango_context_get_language (context)); *size = (PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) + @@ -719,19 +810,15 @@ gtk_menu_item_accel_width_foreach (GtkWidget *widget, static gint get_minimum_width (GtkWidget *widget) { - GtkStyleContext *style_context; - GtkStateFlags state; PangoContext *context; PangoFontMetrics *metrics; gint width; gint width_chars; context = gtk_widget_get_pango_context (widget); - style_context = gtk_widget_get_style_context (widget); - state = gtk_widget_get_state_flags (widget); metrics = pango_context_get_metrics (context, - gtk_style_context_get_font (style_context, state), + pango_context_get_font_description (context), pango_context_get_language (context)); width = pango_font_metrics_get_approximate_char_width (metrics); @@ -754,35 +841,16 @@ gtk_menu_item_get_preferred_width (GtkWidget *widget, GtkWidget *child; GtkWidget *parent; guint accel_width; - guint horizontal_padding; guint border_width; - GtkPackDirection pack_dir; - GtkPackDirection child_pack_dir; gint min_width, nat_width; GtkStyleContext *context; GtkStateFlags state; GtkBorder padding; min_width = nat_width = 0; - - gtk_widget_style_get (widget, - "horizontal-padding", &horizontal_padding, - NULL); - bin = GTK_BIN (widget); parent = gtk_widget_get_parent (widget); - if (GTK_IS_MENU_BAR (parent)) - { - pack_dir = gtk_menu_bar_get_pack_direction (GTK_MENU_BAR (parent)); - child_pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent)); - } - else - { - pack_dir = GTK_PACK_DIRECTION_LTR; - child_pack_dir = GTK_PACK_DIRECTION_LTR; - } - border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); context = gtk_widget_get_style_context (widget); @@ -790,13 +858,8 @@ gtk_menu_item_get_preferred_width (GtkWidget *widget, gtk_style_context_get_padding (context, state, &padding); min_width = (border_width * 2) + padding.left + padding.right; - - if ((pack_dir == GTK_PACK_DIRECTION_LTR || pack_dir == GTK_PACK_DIRECTION_RTL) && - (child_pack_dir == GTK_PACK_DIRECTION_LTR || child_pack_dir == GTK_PACK_DIRECTION_RTL)) - min_width += 2 * horizontal_padding; - nat_width = min_width; - + child = gtk_bin_get_child (bin); if (child != NULL && gtk_widget_get_visible (child)) @@ -808,20 +871,9 @@ gtk_menu_item_get_preferred_width (GtkWidget *widget, if ((menu_item->priv->submenu && !GTK_IS_MENU_BAR (parent)) || priv->reserve_indicator) { - guint arrow_spacing; - gint arrow_size; - - gtk_widget_style_get (widget, - "arrow-spacing", &arrow_spacing, - NULL); - - get_arrow_size (widget, child, &arrow_size); + gint arrow_spacing, arrow_size; - gtk_widget_style_get (widget, - "arrow-spacing", &arrow_spacing, - NULL); - - get_arrow_size (widget, child, &arrow_size); + get_arrow_size (widget, child, &arrow_size, &arrow_spacing); min_width += arrow_size; min_width += arrow_spacing; @@ -848,9 +900,10 @@ gtk_menu_item_get_preferred_width (GtkWidget *widget, } static void -gtk_menu_item_get_preferred_height (GtkWidget *widget, - gint *minimum_size, - gint *natural_size) +gtk_menu_item_real_get_height (GtkWidget *widget, + gint for_size, + gint *minimum_size, + gint *natural_size) { GtkMenuItem *menu_item = GTK_MENU_ITEM (widget); GtkMenuItemPrivate *priv = menu_item->priv; @@ -861,11 +914,9 @@ gtk_menu_item_get_preferred_height (GtkWidget *widget, GtkWidget *child; GtkWidget *parent; guint accel_width; - guint horizontal_padding; guint border_width; - GtkPackDirection pack_dir; - GtkPackDirection child_pack_dir; - gint min_height, nat_height; + gint min_height, nat_height; + gint avail_size = 0; min_height = nat_height = 0; @@ -873,30 +924,17 @@ gtk_menu_item_get_preferred_height (GtkWidget *widget, state = gtk_widget_get_state_flags (widget); gtk_style_context_get_padding (context, state, &padding); - gtk_widget_style_get (widget, - "horizontal-padding", &horizontal_padding, - NULL); - bin = GTK_BIN (widget); parent = gtk_widget_get_parent (widget); - if (GTK_IS_MENU_BAR (parent)) - { - pack_dir = gtk_menu_bar_get_pack_direction (GTK_MENU_BAR (parent)); - child_pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent)); - } - else - { - pack_dir = GTK_PACK_DIRECTION_LTR; - child_pack_dir = GTK_PACK_DIRECTION_LTR; - } - border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); - min_height = (border_width * 2) + padding.top + padding.bottom; + min_height = (border_width * 2) + padding.top + padding.bottom; - if ((pack_dir == GTK_PACK_DIRECTION_TTB || pack_dir == GTK_PACK_DIRECTION_BTT) && - (child_pack_dir == GTK_PACK_DIRECTION_TTB || child_pack_dir == GTK_PACK_DIRECTION_BTT)) - min_height += 2 * horizontal_padding; + if (for_size != -1) + { + avail_size = for_size; + avail_size -= (border_width * 2) + padding.left + padding.right; + } nat_height = min_height; @@ -904,23 +942,30 @@ gtk_menu_item_get_preferred_height (GtkWidget *widget, if (child != NULL && gtk_widget_get_visible (child)) { - GtkMenuItemPrivate *priv = menu_item->priv; gint child_min, child_nat; + gint arrow_size = 0, arrow_spacing = 0; - gtk_widget_get_preferred_height (child, &child_min, &child_nat); + if ((priv->submenu && !GTK_IS_MENU_BAR (parent)) || priv->reserve_indicator) + get_arrow_size (widget, child, &arrow_size, &arrow_spacing); + + if (for_size != -1) + { + avail_size -= (arrow_size + arrow_spacing); + gtk_widget_get_preferred_height_for_width (child, + avail_size, + &child_min, + &child_nat); + } + else + { + gtk_widget_get_preferred_height (child, &child_min, &child_nat); + } min_height += child_min; nat_height += child_nat; - if ((menu_item->priv->submenu && !GTK_IS_MENU_BAR (parent)) || priv->reserve_indicator) - { - gint arrow_size; - - get_arrow_size (widget, child, &arrow_size); - - min_height = MAX (min_height, arrow_size); - nat_height = MAX (nat_height, arrow_size); - } + min_height = MAX (min_height, arrow_size); + nat_height = MAX (nat_height, arrow_size); } else /* separator item */ { @@ -933,11 +978,20 @@ gtk_menu_item_get_preferred_height (GtkWidget *widget, NULL); if (wide_separators) - min_height += separator_height + padding.top; + { + min_height += separator_height; + nat_height += separator_height; + } else - min_height += padding.top + padding.bottom; - - nat_height = min_height; + { + /* force odd, so that we can have the same space above and + * below the line. + */ + if (min_height % 2 == 0) + min_height += 1; + if (nat_height % 2 == 0) + nat_height += 1; + } } accel_width = 0; @@ -953,125 +1007,21 @@ gtk_menu_item_get_preferred_height (GtkWidget *widget, *natural_size = nat_height; } +static void +gtk_menu_item_get_preferred_height (GtkWidget *widget, + gint *minimum_size, + gint *natural_size) +{ + gtk_menu_item_real_get_height (widget, -1, minimum_size, natural_size); +} + static void gtk_menu_item_get_preferred_height_for_width (GtkWidget *widget, gint for_size, gint *minimum_size, gint *natural_size) { - GtkMenuItem *menu_item = GTK_MENU_ITEM (widget); - GtkMenuItemPrivate *priv = menu_item->priv; - GtkBin *bin; - GtkStyleContext *context; - GtkStateFlags state; - GtkBorder padding; - GtkWidget *child; - GtkWidget *parent; - guint horizontal_padding; - guint border_width; - GtkPackDirection pack_dir; - GtkPackDirection child_pack_dir; - gint min_height, nat_height; - gint avail_size; - - min_height = nat_height = 0; - - context = gtk_widget_get_style_context (widget); - state = gtk_widget_get_state_flags (widget); - gtk_style_context_get_padding (context, state, &padding); - - gtk_widget_style_get (widget, - "horizontal-padding", &horizontal_padding, - NULL); - - bin = GTK_BIN (widget); - parent = gtk_widget_get_parent (widget); - - if (GTK_IS_MENU_BAR (parent)) - { - pack_dir = gtk_menu_bar_get_pack_direction (GTK_MENU_BAR (parent)); - child_pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent)); - } - else - { - pack_dir = GTK_PACK_DIRECTION_LTR; - child_pack_dir = GTK_PACK_DIRECTION_LTR; - } - - border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); - min_height = (border_width * 2) + padding.top + padding.bottom; - - avail_size = for_size; - avail_size -= (border_width * 2) + padding.left + padding.right; - - if ((pack_dir == GTK_PACK_DIRECTION_TTB || pack_dir == GTK_PACK_DIRECTION_BTT) && - (child_pack_dir == GTK_PACK_DIRECTION_TTB || child_pack_dir == GTK_PACK_DIRECTION_BTT)) - min_height += 2 * horizontal_padding; - - if ((pack_dir == GTK_PACK_DIRECTION_LTR || pack_dir == GTK_PACK_DIRECTION_RTL) && - (child_pack_dir == GTK_PACK_DIRECTION_LTR || child_pack_dir == GTK_PACK_DIRECTION_RTL)) - avail_size -= 2 * horizontal_padding; - - nat_height = min_height; - - child = gtk_bin_get_child (bin); - - if (child != NULL && gtk_widget_get_visible (child)) - { - gint child_min, child_nat; - gint arrow_size = 0; - - if ((priv->submenu && !GTK_IS_MENU_BAR (parent)) || priv->reserve_indicator) - { - guint arrow_spacing; - - gtk_widget_style_get (widget, - "arrow-spacing", &arrow_spacing, - NULL); - - get_arrow_size (widget, child, &arrow_size); - - avail_size -= arrow_size; - avail_size -= arrow_spacing; - } - - gtk_widget_get_preferred_height_for_width (child, - avail_size, - &child_min, - &child_nat); - - min_height += child_min; - nat_height += child_nat; - - if ((priv->submenu && !GTK_IS_MENU_BAR (parent)) || priv->reserve_indicator) - { - min_height = MAX (min_height, arrow_size); - nat_height = MAX (nat_height, arrow_size); - } - } - else /* separator item */ - { - gboolean wide_separators; - gint separator_height; - - gtk_widget_style_get (widget, - "wide-separators", &wide_separators, - "separator-height", &separator_height, - NULL); - - if (wide_separators) - min_height += separator_height + padding.top; - else - min_height += padding.top + padding.bottom; - - nat_height = min_height; - } - - if (minimum_size) - *minimum_size = min_height; - - if (natural_size) - *natural_size = nat_height; + gtk_menu_item_real_get_height (widget, for_size, minimum_size, natural_size); } static void @@ -1159,7 +1109,50 @@ activatable_update_label (GtkMenuItem *menu_item, GtkAction *action) } } -gboolean _gtk_menu_is_empty (GtkWidget *menu); +/* + * gtk_menu_is_empty: + * @menu: (allow-none): a #GtkMenu or %NULL + * + * Determines whether @menu is empty. A menu is considered empty if it + * the only visible children are tearoff menu items or "filler" menu + * items which were inserted to mark the menu as empty. + * + * This function is used by #GtkAction. + * + * Return value: whether @menu is empty. + **/ +static gboolean +gtk_menu_is_empty (GtkWidget *menu) +{ + GList *children, *cur; + gboolean result = TRUE; + + g_return_val_if_fail (menu == NULL || GTK_IS_MENU (menu), TRUE); + + if (!menu) + return FALSE; + + children = gtk_container_get_children (GTK_CONTAINER (menu)); + + cur = children; + while (cur) + { + if (gtk_widget_get_visible (cur->data)) + { + if (!GTK_IS_TEAROFF_MENU_ITEM (cur->data) && + !g_object_get_data (cur->data, "gtk-empty-menu-item")) + { + result = FALSE; + break; + } + } + cur = cur->next; + } + g_list_free (children); + + return result; +} + static void gtk_menu_item_update (GtkActivatable *activatable, @@ -1171,7 +1164,7 @@ gtk_menu_item_update (GtkActivatable *activatable, if (strcmp (property_name, "visible") == 0) _gtk_action_sync_menu_visible (action, GTK_WIDGET (menu_item), - _gtk_menu_is_empty (gtk_menu_item_get_submenu (menu_item))); + gtk_menu_is_empty (gtk_menu_item_get_submenu (menu_item))); else if (strcmp (property_name, "sensitive") == 0) gtk_widget_set_sensitive (GTK_WIDGET (menu_item), gtk_action_is_sensitive (action)); else if (priv->use_action_appearance) @@ -1201,7 +1194,7 @@ gtk_menu_item_sync_action_properties (GtkActivatable *activatable, return; _gtk_action_sync_menu_visible (action, GTK_WIDGET (menu_item), - _gtk_menu_is_empty (gtk_menu_item_get_submenu (menu_item))); + gtk_menu_is_empty (gtk_menu_item_get_submenu (menu_item))); gtk_widget_set_sensitive (GTK_WIDGET (menu_item), gtk_action_is_sensitive (action)); @@ -1451,7 +1444,6 @@ gtk_menu_item_size_allocate (GtkWidget *widget, GtkBin *bin; GtkAllocation child_allocation; GtkTextDirection direction; - GtkPackDirection pack_dir; GtkPackDirection child_pack_dir; GtkWidget *child; GtkWidget *parent; @@ -1466,12 +1458,10 @@ gtk_menu_item_size_allocate (GtkWidget *widget, parent = gtk_widget_get_parent (widget); if (GTK_IS_MENU_BAR (parent)) { - pack_dir = gtk_menu_bar_get_pack_direction (GTK_MENU_BAR (parent)); child_pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent)); } else { - pack_dir = GTK_PACK_DIRECTION_LTR; child_pack_dir = GTK_PACK_DIRECTION_LTR; } @@ -1483,17 +1473,12 @@ gtk_menu_item_size_allocate (GtkWidget *widget, GtkStyleContext *context; GtkStateFlags state; GtkBorder padding; - guint horizontal_padding; guint border_width; context = gtk_widget_get_style_context (widget); state = gtk_widget_get_state_flags (widget); gtk_style_context_get_padding (context, state, &padding); - gtk_widget_style_get (widget, - "horizontal-padding", &horizontal_padding, - NULL); - border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); child_allocation.x = border_width + padding.left; child_allocation.y = border_width + padding.top; @@ -1503,19 +1488,6 @@ gtk_menu_item_size_allocate (GtkWidget *widget, child_allocation.height = allocation->height - (border_width * 2) - padding.top - padding.bottom; - if ((pack_dir == GTK_PACK_DIRECTION_LTR || pack_dir == GTK_PACK_DIRECTION_RTL) && - (child_pack_dir == GTK_PACK_DIRECTION_LTR || child_pack_dir == GTK_PACK_DIRECTION_RTL)) - { - child_allocation.x += horizontal_padding; - child_allocation.width -= 2 * horizontal_padding; - } - else if ((pack_dir == GTK_PACK_DIRECTION_TTB || pack_dir == GTK_PACK_DIRECTION_BTT) && - (child_pack_dir == GTK_PACK_DIRECTION_TTB || child_pack_dir == GTK_PACK_DIRECTION_BTT)) - { - child_allocation.y += horizontal_padding; - child_allocation.height -= 2 * horizontal_padding; - } - if (child_pack_dir == GTK_PACK_DIRECTION_LTR || child_pack_dir == GTK_PACK_DIRECTION_RTL) { @@ -1535,14 +1507,9 @@ gtk_menu_item_size_allocate (GtkWidget *widget, if ((priv->submenu && !GTK_IS_MENU_BAR (parent)) || priv->reserve_indicator) { - guint arrow_spacing; - gint arrow_size; - - gtk_widget_style_get (widget, - "arrow-spacing", &arrow_spacing, - NULL); + gint arrow_spacing, arrow_size; - get_arrow_size (widget, child, &arrow_size); + get_arrow_size (widget, child, &arrow_size, &arrow_spacing); if (direction == GTK_TEXT_DIR_RTL) child_allocation.x += arrow_size + arrow_spacing; @@ -1599,7 +1566,7 @@ gtk_menu_item_realize (GtkWidget *widget) priv->event_window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask); - gdk_window_set_user_data (priv->event_window, widget); + gtk_widget_register_window (widget, priv->event_window); } static void @@ -1608,7 +1575,7 @@ gtk_menu_item_unrealize (GtkWidget *widget) GtkMenuItem *menu_item = GTK_MENU_ITEM (widget); GtkMenuItemPrivate *priv = menu_item->priv; - gdk_window_set_user_data (priv->event_window, NULL); + gtk_widget_unregister_window (widget, priv->event_window); gdk_window_destroy (priv->event_window); priv->event_window = NULL; @@ -1681,44 +1648,29 @@ gtk_menu_item_draw (GtkWidget *widget, child = gtk_bin_get_child (GTK_BIN (menu_item)); parent = gtk_widget_get_parent (widget); - gtk_style_context_save (context); - gtk_style_context_set_state (context, state); - gtk_style_context_get_padding (context, state, &padding); - if (GTK_IS_MENU_BAR (parent)) - gtk_style_context_add_class (context, GTK_STYLE_CLASS_MENUBAR); - - if (child && (state & GTK_STATE_FLAG_PRELIGHT)) - { - gtk_render_background (context, cr, x, y, w, h); - gtk_render_frame (context, cr, x, y, w, h); - } + gtk_render_background (context, cr, x, y, w, h); + gtk_render_frame (context, cr, x, y, w, h); if (priv->submenu && !GTK_IS_MENU_BAR (parent)) { gint arrow_x, arrow_y; gint arrow_size; - guint horizontal_padding; GtkTextDirection direction; gdouble angle; direction = gtk_widget_get_direction (widget); - - gtk_widget_style_get (widget, - "horizontal-padding", &horizontal_padding, - NULL); - - get_arrow_size (widget, child, &arrow_size); + get_arrow_size (widget, child, &arrow_size, NULL); if (direction == GTK_TEXT_DIR_LTR) { - arrow_x = x + w - horizontal_padding - arrow_size; + arrow_x = x + w - arrow_size; angle = G_PI / 2; } else { - arrow_x = x + horizontal_padding; + arrow_x = x; angle = (3 * G_PI) / 2; } @@ -1730,31 +1682,27 @@ gtk_menu_item_draw (GtkWidget *widget, { gboolean wide_separators; gint separator_height; - guint horizontal_padding; gtk_widget_style_get (widget, "wide-separators", &wide_separators, "separator-height", &separator_height, - "horizontal-padding", &horizontal_padding, NULL); if (wide_separators) gtk_render_frame (context, cr, - horizontal_padding + padding.left, - (height - separator_height - padding.top) / 2, - width - (2 * horizontal_padding) - padding.left - padding.right, + x + padding.left, + y + padding.top, + w - padding.left - padding.right, separator_height); else gtk_render_line (context, cr, - horizontal_padding + padding.left, - (height - padding.top) / 2, - width - horizontal_padding - padding.right - 1, - (height - padding.top) / 2); + x + padding.left, + y + padding.top, + x + w - padding.right - 1, + y + padding.top); } GTK_WIDGET_CLASS (gtk_menu_item_parent_class)->draw (widget, cr); - gtk_style_context_restore (context); - return FALSE; } @@ -1769,13 +1717,20 @@ static void gtk_real_menu_item_select (GtkMenuItem *menu_item) { GtkMenuItemPrivate *priv = menu_item->priv; - gboolean touchscreen_mode; + GdkDevice *source_device = NULL; + GdkEvent *current_event; - g_object_get (gtk_widget_get_settings (GTK_WIDGET (menu_item)), - "gtk-touchscreen-mode", &touchscreen_mode, - NULL); + current_event = gtk_get_current_event (); + + if (current_event) + { + source_device = gdk_event_get_source_device (current_event); + gdk_event_free (current_event); + } - if (!touchscreen_mode && priv->submenu && + if ((!source_device || + gdk_device_get_source (source_device) != GDK_SOURCE_TOUCHSCREEN) && + priv->submenu && (!gtk_widget_get_mapped (priv->submenu) || GTK_MENU (priv->submenu)->priv->tearoff_active)) { @@ -1829,6 +1784,9 @@ gtk_real_menu_item_activate (GtkMenuItem *menu_item) { GtkMenuItemPrivate *priv = menu_item->priv; + if (priv->action_helper) + gtk_action_helper_activate (priv->action_helper); + if (priv->action) gtk_action_activate (priv->action); } @@ -2090,8 +2048,6 @@ get_offsets (GtkMenu *menu, gint *horizontal_offset, gint *vertical_offset) { - gint vertical_padding; - gint horizontal_padding; GtkStyleContext *context; GtkStateFlags state; GtkBorder padding; @@ -2099,8 +2055,6 @@ get_offsets (GtkMenu *menu, gtk_widget_style_get (GTK_WIDGET (menu), "horizontal-offset", horizontal_offset, "vertical-offset", vertical_offset, - "horizontal-padding", &horizontal_padding, - "vertical-padding", &vertical_padding, NULL); context = gtk_widget_get_style_context (GTK_WIDGET (menu)); @@ -2108,8 +2062,7 @@ get_offsets (GtkMenu *menu, gtk_style_context_get_padding (context, state, &padding); *vertical_offset -= padding.top; - *vertical_offset -= vertical_padding; - *horizontal_offset += horizontal_padding; + *horizontal_offset += padding.left; } static void @@ -2156,7 +2109,7 @@ gtk_menu_item_position_menu (GtkMenu *menu, monitor_num = gdk_screen_get_monitor_at_window (screen, priv->event_window); if (monitor_num < 0) monitor_num = 0; - gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); + gdk_screen_get_monitor_workarea (screen, monitor_num, &monitor); if (!gdk_window_get_origin (gtk_widget_get_window (widget), &tx, &ty)) { @@ -2175,21 +2128,7 @@ gtk_menu_item_position_menu (GtkMenu *menu, available_right = monitor.x + monitor.width - (tx + allocation.width); parent = gtk_widget_get_parent (widget); - if (GTK_IS_MENU_BAR (parent)) - { - priv->from_menubar = TRUE; - } - else if (GTK_IS_MENU (parent)) - { - if (GTK_MENU (parent)->priv->parent_menu_item) - priv->from_menubar = GTK_MENU_ITEM (GTK_MENU (parent)->priv->parent_menu_item)->priv->from_menubar; - else - priv->from_menubar = FALSE; - } - else - { - priv->from_menubar = FALSE; - } + priv->from_menubar = GTK_IS_MENU_BAR (parent); switch (priv->submenu_placement) { @@ -2299,17 +2238,9 @@ void gtk_menu_item_set_right_justified (GtkMenuItem *menu_item, gboolean right_justified) { - GtkMenuItemPrivate *priv = menu_item->priv; - g_return_if_fail (GTK_IS_MENU_ITEM (menu_item)); - right_justified = right_justified != FALSE; - - if (priv->right_justify != right_justified) - { - priv->right_justify = right_justified; - gtk_widget_queue_resize (GTK_WIDGET (menu_item)); - } + gtk_menu_item_do_set_right_justified (menu_item, right_justified); } /** @@ -2451,7 +2382,7 @@ _gtk_menu_item_refresh_accel_path (GtkMenuItem *menu_item, } /** - * gtk_menu_item_set_accel_path + * gtk_menu_item_set_accel_path: * @menu_item: a valid #GtkMenuItem * @accel_path: (allow-none): accelerator path, corresponding to this menu * item's functionality, or %NULL to unset the current path. @@ -2511,7 +2442,7 @@ gtk_menu_item_set_accel_path (GtkMenuItem *menu_item, } /** - * gtk_menu_item_get_accel_path + * gtk_menu_item_get_accel_path: * @menu_item: a valid #GtkMenuItem * * Retrieve the accelerator path that was previously set on @menu_item.