X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkmenuitem.c;h=73c2545dcbd32243d399b27eb8f521e8f2e8754e;hb=d84f5ae17e5b891b30dd54ddc10fd22c2a609e0e;hp=388c2a503859d85eda4a8f5e8f1271ff1e98c7b0;hpb=050cba6a31bb783720eb2cb9e773784d24107f03;p=~andy%2Fgtk diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index 388c2a503..73c2545dc 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -43,7 +43,7 @@ #include "gtksettings.h" #include "gtktypebuiltins.h" #include "a11y/gtkmenuitemaccessible.h" - +#include "deprecated/gtktearoffmenuitem.h" /** * SECTION:gtkmenuitem @@ -97,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 }; @@ -179,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, @@ -198,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) @@ -397,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", @@ -406,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", @@ -547,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); @@ -602,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; @@ -640,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; @@ -676,8 +758,6 @@ get_arrow_size (GtkWidget *widget, gint *size, gint *spacing) { - GtkStyleContext *style_context; - GtkStateFlags state; PangoContext *context; PangoFontMetrics *metrics; gfloat arrow_scaling; @@ -694,11 +774,9 @@ get_arrow_size (GtkWidget *widget, *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) + @@ -732,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); @@ -767,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); @@ -803,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)) @@ -864,10 +914,7 @@ gtk_menu_item_real_get_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 avail_size = 0; @@ -877,39 +924,16 @@ gtk_menu_item_real_get_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; - 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; - - 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; @@ -1085,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, @@ -1097,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) @@ -1127,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)); @@ -1377,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; @@ -1392,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; } @@ -1409,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; @@ -1429,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) { @@ -1520,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 @@ -1529,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; @@ -1602,43 +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_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, 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; } @@ -1650,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, - x + horizontal_padding + padding.left, + x + padding.left, y + padding.top, - w - (2 * horizontal_padding) - padding.left - padding.right, + w - padding.left - padding.right, separator_height); else gtk_render_line (context, cr, - x + horizontal_padding + padding.left, + x + padding.left, y + padding.top, - x + w - horizontal_padding - padding.right - 1, + 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; } @@ -1756,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); } @@ -2017,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; @@ -2026,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)); @@ -2035,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