#define GTK_MENU_INTERNALS
+#include "config.h"
#include <string.h>
+
#include "gtkaccellabel.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
#include "gtkmenubar.h"
#include "gtkmenuitem.h"
#include "gtkseparatormenuitem.h"
+#include "gtkprivate.h"
+#include "gtkintl.h"
+#include "gtkalias.h"
#define MENU_ITEM_CLASS(w) GTK_MENU_ITEM_CLASS (GTK_OBJECT (w)->klass)
LAST_SIGNAL
};
+enum {
+ PROP_0,
+ PROP_RIGHT_JUSTIFIED,
+ PROP_SUBMENU,
+ PROP_ACCEL_PATH
+};
-static void gtk_menu_item_class_init (GtkMenuItemClass *klass);
-static void gtk_menu_item_init (GtkMenuItem *menu_item);
+
+static void gtk_menu_item_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gtk_menu_item_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
static void gtk_menu_item_destroy (GtkObject *object);
-static void gtk_menu_item_finalize (GObject *object);
static void gtk_menu_item_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void gtk_menu_item_size_allocate (GtkWidget *widget,
static gboolean gtk_menu_item_mnemonic_activate (GtkWidget *widget,
gboolean group_cycling);
-static gint gtk_menu_item_select_timeout (gpointer data);
-static void gtk_menu_item_popup_submenu (gpointer data);
+static gint gtk_menu_item_popup_timeout (gpointer data);
static void gtk_menu_item_position_menu (GtkMenu *menu,
gint *x,
gint *y,
gboolean include_internals,
GtkCallback callback,
gpointer callback_data);
+static gboolean gtk_menu_item_can_activate_accel (GtkWidget *widget,
+ guint signal_id);
-static GtkItemClass *parent_class;
static guint menu_item_signals[LAST_SIGNAL] = { 0 };
-GType
-gtk_menu_item_get_type (void)
-{
- static GType menu_item_type = 0;
-
- if (!menu_item_type)
- {
- static const GTypeInfo menu_item_info =
- {
- sizeof (GtkMenuItemClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) gtk_menu_item_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GtkMenuItem),
- 16, /* n_preallocs */
- (GInstanceInitFunc) gtk_menu_item_init,
- };
-
- menu_item_type = g_type_register_static (GTK_TYPE_ITEM, "GtkMenuItem",
- &menu_item_info, 0);
- }
-
- return menu_item_type;
-}
+G_DEFINE_TYPE (GtkMenuItem, gtk_menu_item, GTK_TYPE_ITEM)
static void
gtk_menu_item_class_init (GtkMenuItemClass *klass)
GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
GtkItemClass *item_class = GTK_ITEM_CLASS (klass);
- parent_class = g_type_class_peek_parent (klass);
-
- gobject_class->finalize = gtk_menu_item_finalize;
+ gobject_class->set_property = gtk_menu_item_set_property;
+ gobject_class->get_property = gtk_menu_item_get_property;
object_class->destroy = gtk_menu_item_destroy;
widget_class->hide_all = gtk_menu_item_hide_all;
widget_class->mnemonic_activate = gtk_menu_item_mnemonic_activate;
widget_class->parent_set = gtk_menu_item_parent_set;
+ widget_class->can_activate_accel = gtk_menu_item_can_activate_accel;
container_class->forall = gtk_menu_item_forall;
klass->hide_on_activate = TRUE;
menu_item_signals[ACTIVATE] =
- g_signal_new ("activate",
+ g_signal_new (I_("activate"),
G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkMenuItemClass, activate),
widget_class->activate_signal = menu_item_signals[ACTIVATE];
menu_item_signals[ACTIVATE_ITEM] =
- g_signal_new ("activate_item",
+ g_signal_new (I_("activate_item"),
G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkMenuItemClass, activate_item),
G_TYPE_NONE, 0);
menu_item_signals[TOGGLE_SIZE_REQUEST] =
- g_signal_new ("toggle_size_request",
+ g_signal_new (I_("toggle_size_request"),
G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkMenuItemClass, toggle_size_request),
G_TYPE_POINTER);
menu_item_signals[TOGGLE_SIZE_ALLOCATE] =
- g_signal_new ("toggle_size_allocate",
+ g_signal_new (I_("toggle_size_allocate"),
G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (GtkMenuItemClass, toggle_size_allocate),
+ G_STRUCT_OFFSET (GtkMenuItemClass, toggle_size_allocate),
NULL, NULL,
_gtk_marshal_NONE__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
+ /**
+ * GtkMenuItem:right-justified:
+ *
+ * Sets whether the menu item appears justified at the right side of a menu bar.
+ *
+ * Since: 2.14
+ **/
+ g_object_class_install_property (gobject_class,
+ PROP_RIGHT_JUSTIFIED,
+ g_param_spec_boolean ("right-justified",
+ P_("Right Justified"),
+ P_("Sets whether the menu item appears justified at the right side of a menu bar"),
+ FALSE,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkMenuItem:submenu:
+ *
+ * The submenu attached to the menu item, or NULL if it has none.
+ *
+ * Since: 2.12
+ **/
+ g_object_class_install_property (gobject_class,
+ PROP_SUBMENU,
+ g_param_spec_object ("submenu",
+ P_("Submenu"),
+ P_("The submenu attached to the menu item, or NULL if it has none"),
+ GTK_TYPE_MENU,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkMenuItem:accel-path:
+ *
+ * Sets the accelerator path of the menu item, through which runtime
+ * changes of the menu item's accelerator caused by the user can be
+ * identified and saved to persistant storage.
+ *
+ * Since: 2.14
+ **/
+ g_object_class_install_property (gobject_class,
+ PROP_ACCEL_PATH,
+ g_param_spec_string ("accel-path",
+ P_("Accel Path"),
+ P_("Sets the accelerator path of the menu item"),
+ NULL,
+ GTK_PARAM_READWRITE));
+
gtk_widget_class_install_style_property_parser (widget_class,
- g_param_spec_enum ("selected_shadow_type",
+ g_param_spec_enum ("selected-shadow-type",
"Selected Shadow Type",
"Shadow type when item is selected",
GTK_TYPE_SHADOW_TYPE,
GTK_SHADOW_NONE,
- G_PARAM_READABLE),
+ GTK_PARAM_READABLE),
gtk_rc_property_parse_enum);
gtk_widget_class_install_style_property (widget_class,
- g_param_spec_int ("horizontal_padding",
+ g_param_spec_int ("horizontal-padding",
"Horizontal Padding",
"Padding to left and right of the menu item",
0,
G_MAXINT,
3,
- G_PARAM_READABLE));
+ GTK_PARAM_READABLE));
gtk_widget_class_install_style_property (widget_class,
- g_param_spec_int ("toggle_spacing",
+ g_param_spec_int ("toggle-spacing",
"Icon Spacing",
"Space between icon and label",
0,
G_MAXINT,
5,
- G_PARAM_READABLE));
+ GTK_PARAM_READABLE));
gtk_widget_class_install_style_property (widget_class,
- g_param_spec_int ("arrow_spacing",
+ g_param_spec_int ("arrow-spacing",
"Arrow Spacing",
"Space between label and arrow",
0,
G_MAXINT,
10,
- G_PARAM_READABLE));
+ GTK_PARAM_READABLE));
+
+ gtk_widget_class_install_style_property (widget_class,
+ g_param_spec_float ("arrow-scaling",
+ P_("Arrow Scaling"),
+ P_("Amount of space used up by arrow, relative to the menu item's font size"),
+ 0.0, 2.0, 0.8,
+ GTK_PARAM_READABLE));
}
static void
return menu_item;
}
-static void
-gtk_menu_item_destroy (GtkObject *object)
+static void
+gtk_menu_item_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
- GtkMenuItem *menu_item;
-
- g_return_if_fail (GTK_IS_MENU_ITEM (object));
+ GtkMenuItem *menu_item = GTK_MENU_ITEM (object);
+
+ switch (prop_id)
+ {
+ case PROP_RIGHT_JUSTIFIED:
+ gtk_menu_item_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));
+ break;
+ case PROP_ACCEL_PATH:
+ gtk_menu_item_set_accel_path (menu_item, g_value_get_string (value));
+ break;
- menu_item = GTK_MENU_ITEM (object);
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
- if (menu_item->submenu)
- gtk_widget_destroy (menu_item->submenu);
+static void
+gtk_menu_item_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GtkMenuItem *menu_item = GTK_MENU_ITEM (object);
+
+ switch (prop_id)
+ {
+ case PROP_RIGHT_JUSTIFIED:
+ g_value_set_boolean (value, gtk_menu_item_get_right_justified (menu_item));
+ break;
+ case PROP_SUBMENU:
+ g_value_set_object (value, gtk_menu_item_get_submenu (menu_item));
+ break;
+ case PROP_ACCEL_PATH:
+ g_value_set_string (value, gtk_menu_item_get_accel_path (menu_item));
+ break;
- GTK_OBJECT_CLASS (parent_class)->destroy (object);
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
}
static void
-gtk_menu_item_finalize (GObject *object)
+gtk_menu_item_destroy (GtkObject *object)
{
GtkMenuItem *menu_item = GTK_MENU_ITEM (object);
- g_free (menu_item->accel_path);
+ if (menu_item->submenu)
+ gtk_widget_destroy (menu_item->submenu);
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ GTK_OBJECT_CLASS (gtk_menu_item_parent_class)->destroy (object);
}
static void
-gtk_menu_item_detacher (GtkWidget *widget,
- GtkMenu *menu)
+gtk_menu_item_detacher (GtkWidget *widget,
+ GtkMenu *menu)
{
- GtkMenuItem *menu_item;
-
- g_return_if_fail (GTK_IS_MENU_ITEM (widget));
+ GtkMenuItem *menu_item = GTK_MENU_ITEM (widget);
- menu_item = GTK_MENU_ITEM (widget);
g_return_if_fail (menu_item->submenu == (GtkWidget*) menu);
menu_item->submenu = NULL;
}
+/**
+ * gtk_menu_item_set_submenu:
+ * @menu_item: a #GtkMenuItem
+ * @submenu: the submenu, or %NULL
+ *
+ * Sets or replaces the menu item's submenu, or removes it when a %NULL
+ * submenu is passed.
+ **/
void
gtk_menu_item_set_submenu (GtkMenuItem *menu_item,
GtkWidget *submenu)
{
g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
+ g_return_if_fail (submenu == NULL || GTK_IS_MENU (submenu));
if (menu_item->submenu != submenu)
{
- gtk_menu_item_remove_submenu (menu_item);
-
- menu_item->submenu = submenu;
- gtk_menu_attach_to_widget (GTK_MENU (submenu),
- GTK_WIDGET (menu_item),
- gtk_menu_item_detacher);
-
+ if (menu_item->submenu)
+ gtk_menu_detach (GTK_MENU (menu_item->submenu));
+
+ if (submenu)
+ {
+ menu_item->submenu = submenu;
+ gtk_menu_attach_to_widget (GTK_MENU (submenu),
+ GTK_WIDGET (menu_item),
+ gtk_menu_item_detacher);
+ }
+
if (GTK_WIDGET (menu_item)->parent)
gtk_widget_queue_resize (GTK_WIDGET (menu_item));
+
+ g_object_notify (G_OBJECT (menu_item), "submenu");
}
}
return menu_item->submenu;
}
+/**
+ * gtk_menu_item_remove_submenu:
+ * @menu_item: a #GtkMenuItem
+ *
+ * Removes the widget's submenu.
+ *
+ * Deprecated: 2.12: gtk_menu_item_remove_submenu() is deprecated and
+ * should not be used in newly written code. Use
+ * gtk_menu_item_set_submenu() instead.
+ **/
void
-gtk_menu_item_remove_submenu (GtkMenuItem *menu_item)
+gtk_menu_item_remove_submenu (GtkMenuItem *menu_item)
{
g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
-
- if (menu_item->submenu)
- gtk_menu_detach (GTK_MENU (menu_item->submenu));
+
+ gtk_menu_item_set_submenu (menu_item, NULL);
}
void _gtk_menu_item_set_placement (GtkMenuItem *menu_item,
gtk_menu_item_select (GtkMenuItem *menu_item)
{
g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
-
+
gtk_item_select (GTK_ITEM (menu_item));
+
+ /* Enable themeing of the parent menu item depending on whether
+ * something is selected in its submenu
+ */
+ if (GTK_IS_MENU (GTK_WIDGET (menu_item)->parent))
+ {
+ GtkMenu *menu = GTK_MENU (GTK_WIDGET (menu_item)->parent);
+
+ if (menu->parent_menu_item)
+ gtk_widget_queue_draw (GTK_WIDGET (menu->parent_menu_item));
+ }
}
void
gtk_menu_item_deselect (GtkMenuItem *menu_item)
{
g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
-
+
gtk_item_deselect (GTK_ITEM (menu_item));
+
+ /* Enable themeing of the parent menu item depending on whether
+ * something is selected in its submenu
+ */
+ if (GTK_IS_MENU (GTK_WIDGET (menu_item)->parent))
+ {
+ GtkMenu *menu = GTK_MENU (GTK_WIDGET (menu_item)->parent);
+
+ if (menu->parent_menu_item)
+ gtk_widget_queue_draw (GTK_WIDGET (menu->parent_menu_item));
+ }
}
void
data);
}
+static gint
+get_minimum_width (GtkWidget *widget)
+{
+ PangoContext *context;
+ PangoFontMetrics *metrics;
+ gint height;
+
+ context = gtk_widget_get_pango_context (widget);
+ metrics = pango_context_get_metrics (context,
+ widget->style->font_desc,
+ pango_context_get_language (context));
+
+ height = pango_font_metrics_get_ascent (metrics) +
+ pango_font_metrics_get_descent (metrics);
+
+ pango_font_metrics_unref (metrics);
+
+ return PANGO_PIXELS (7 * height);
+}
+
static void
gtk_menu_item_size_request (GtkWidget *widget,
GtkRequisition *requisition)
GtkBin *bin;
guint accel_width;
guint horizontal_padding;
+ GtkPackDirection pack_dir;
+ GtkPackDirection child_pack_dir;
g_return_if_fail (GTK_IS_MENU_ITEM (widget));
g_return_if_fail (requisition != NULL);
gtk_widget_style_get (widget,
- "horizontal padding", &horizontal_padding,
+ "horizontal-padding", &horizontal_padding,
NULL);
bin = GTK_BIN (widget);
menu_item = GTK_MENU_ITEM (widget);
+ if (GTK_IS_MENU_BAR (widget->parent))
+ {
+ pack_dir = gtk_menu_bar_get_pack_direction (GTK_MENU_BAR (widget->parent));
+ child_pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (widget->parent));
+ }
+ else
+ {
+ pack_dir = GTK_PACK_DIRECTION_LTR;
+ child_pack_dir = GTK_PACK_DIRECTION_LTR;
+ }
+
requisition->width = (GTK_CONTAINER (widget)->border_width +
- widget->style->xthickness + horizontal_padding) * 2;
+ widget->style->xthickness) * 2;
requisition->height = (GTK_CONTAINER (widget)->border_width +
widget->style->ythickness) * 2;
+ 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))
+ requisition->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))
+ requisition->height += 2 * horizontal_padding;
+
if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
{
GtkRequisition child_requisition;
guint arrow_spacing;
gtk_widget_style_get (widget,
- "arrow_spacing", &arrow_spacing,
+ "arrow-spacing", &arrow_spacing,
NULL);
requisition->width += child_requisition.height;
requisition->width += arrow_spacing;
+
+ requisition->width = MAX (requisition->width, get_minimum_width (widget));
}
}
- else
+ else /* separator item */
{
- /* separator item */
- requisition->height += 4;
+ gboolean wide_separators;
+ gint separator_height;
+
+ gtk_widget_style_get (widget,
+ "wide-separators", &wide_separators,
+ "separator-height", &separator_height,
+ NULL);
+
+ if (wide_separators)
+ requisition->height += separator_height + widget->style->ythickness;
+ else
+ requisition->height += widget->style->ythickness * 2;
}
accel_width = 0;
GtkBin *bin;
GtkAllocation child_allocation;
GtkTextDirection direction;
+ GtkPackDirection pack_dir;
+ GtkPackDirection child_pack_dir;
g_return_if_fail (GTK_IS_MENU_ITEM (widget));
g_return_if_fail (allocation != NULL);
direction = gtk_widget_get_direction (widget);
+ if (GTK_IS_MENU_BAR (widget->parent))
+ {
+ pack_dir = gtk_menu_bar_get_pack_direction (GTK_MENU_BAR (widget->parent));
+ child_pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (widget->parent));
+ }
+ else
+ {
+ pack_dir = GTK_PACK_DIRECTION_LTR;
+ child_pack_dir = GTK_PACK_DIRECTION_LTR;
+ }
+
widget->allocation = *allocation;
if (bin->child)
guint horizontal_padding;
gtk_widget_style_get (widget,
- "horizontal_padding", &horizontal_padding,
+ "horizontal-padding", &horizontal_padding,
NULL);
+
+ child_allocation.x = GTK_CONTAINER (widget)->border_width + widget->style->xthickness;
+ child_allocation.y = GTK_CONTAINER (widget)->border_width + widget->style->ythickness;
+
+ 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;
+ 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.x = (GTK_CONTAINER (widget)->border_width +
- widget->style->xthickness +
- horizontal_padding);
- child_allocation.y = (GTK_CONTAINER (widget)->border_width +
- widget->style->ythickness);
child_allocation.width = MAX (1, (gint)allocation->width - child_allocation.x * 2);
child_allocation.height = MAX (1, (gint)allocation->height - child_allocation.y * 2);
- if (direction == GTK_TEXT_DIR_LTR)
- child_allocation.x += GTK_MENU_ITEM (widget)->toggle_size;
- child_allocation.width -= GTK_MENU_ITEM (widget)->toggle_size;
+
+ if (child_pack_dir == GTK_PACK_DIRECTION_LTR ||
+ child_pack_dir == GTK_PACK_DIRECTION_RTL)
+ {
+ if ((direction == GTK_TEXT_DIR_LTR) == (child_pack_dir != GTK_PACK_DIRECTION_RTL))
+ child_allocation.x += GTK_MENU_ITEM (widget)->toggle_size;
+ child_allocation.width -= GTK_MENU_ITEM (widget)->toggle_size;
+ }
+ else
+ {
+ if ((direction == GTK_TEXT_DIR_LTR) == (child_pack_dir != GTK_PACK_DIRECTION_BTT))
+ child_allocation.y += GTK_MENU_ITEM (widget)->toggle_size;
+ child_allocation.height -= GTK_MENU_ITEM (widget)->toggle_size;
+ }
+
child_allocation.x += widget->allocation.x;
child_allocation.y += widget->allocation.y;
attributes.window_type = GDK_WINDOW_CHILD;
attributes.wclass = GDK_INPUT_ONLY;
attributes.event_mask = (gtk_widget_get_events (widget) |
- GDK_EXPOSURE_MASK |
GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK |
GDK_ENTER_NOTIFY_MASK |
gdk_window_destroy (menu_item->event_window);
menu_item->event_window = NULL;
- if (GTK_WIDGET_CLASS (parent_class)->unrealize)
- (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
+ if (GTK_WIDGET_CLASS (gtk_menu_item_parent_class)->unrealize)
+ (* GTK_WIDGET_CLASS (gtk_menu_item_parent_class)->unrealize) (widget);
}
static void
{
GtkMenuItem *menu_item = GTK_MENU_ITEM (widget);
- GTK_WIDGET_CLASS (parent_class)->map (widget);
+ GTK_WIDGET_CLASS (gtk_menu_item_parent_class)->map (widget);
gdk_window_show (menu_item->event_window);
}
gdk_window_hide (menu_item->event_window);
- GTK_WIDGET_CLASS (parent_class)->unmap (widget);
+ GTK_WIDGET_CLASS (gtk_menu_item_parent_class)->unmap (widget);
}
static void
(GTK_BIN (menu_item)->child))
{
gtk_widget_style_get (widget,
- "selected_shadow_type", &selected_shadow_type,
+ "selected-shadow-type", &selected_shadow_type,
NULL);
gtk_paint_box (widget->style,
widget->window,
if (menu_item->submenu && menu_item->show_submenu_indicator)
{
- GtkRequisition child_requisition;
gint arrow_x, arrow_y;
gint arrow_size;
gint arrow_extent;
guint horizontal_padding;
+ gfloat arrow_scaling;
GtkTextDirection direction;
GtkArrowType arrow_type;
+ PangoContext *context;
+ PangoFontMetrics *metrics;
direction = gtk_widget_get_direction (widget);
gtk_widget_style_get (widget,
- "horizontal_padding", &horizontal_padding,
+ "horizontal-padding", &horizontal_padding,
+ "arrow-scaling", &arrow_scaling,
NULL);
- gtk_widget_get_child_requisition (GTK_BIN (menu_item)->child,
- &child_requisition);
+ context = gtk_widget_get_pango_context (GTK_BIN (menu_item)->child);
+ metrics = pango_context_get_metrics (context,
+ GTK_WIDGET (GTK_BIN (menu_item)->child)->style->font_desc,
+ pango_context_get_language (context));
+
+ arrow_size = (PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) +
+ pango_font_metrics_get_descent (metrics)));
+
+ pango_font_metrics_unref (metrics);
+
+ arrow_extent = arrow_size * arrow_scaling;
- arrow_size = child_requisition.height - 2 * widget->style->ythickness;
- arrow_extent = arrow_size * 0.8;
-
shadow_type = GTK_SHADOW_OUT;
if (state_type == GTK_STATE_PRELIGHT)
shadow_type = GTK_SHADOW_IN;
}
else if (!GTK_BIN (menu_item)->child)
{
- guint horizontal_padding;
+ gboolean wide_separators;
+ gint separator_height;
+ guint horizontal_padding;
gtk_widget_style_get (widget,
- "horizontal_padding", &horizontal_padding,
- NULL);
-
- gtk_paint_hline (widget->style, widget->window, GTK_STATE_NORMAL,
- area, widget, "menuitem",
- widget->allocation.x + horizontal_padding + widget->style->xthickness,
- widget->allocation.x + widget->allocation.width - horizontal_padding - widget->style->xthickness - 1,
- widget->allocation.y + (widget->allocation.height -
- widget->style->ythickness) / 2);
+ "wide-separators", &wide_separators,
+ "separator-height", &separator_height,
+ "horizontal-padding", &horizontal_padding,
+ NULL);
+
+ if (wide_separators)
+ gtk_paint_box (widget->style, widget->window,
+ GTK_STATE_NORMAL, GTK_SHADOW_ETCHED_OUT,
+ area, widget, "hseparator",
+ widget->allocation.x + horizontal_padding + widget->style->xthickness,
+ widget->allocation.y + (widget->allocation.height -
+ separator_height -
+ widget->style->ythickness) / 2,
+ widget->allocation.width -
+ 2 * (horizontal_padding + widget->style->xthickness),
+ separator_height);
+ else
+ gtk_paint_hline (widget->style, widget->window,
+ GTK_STATE_NORMAL, area, widget, "menuitem",
+ widget->allocation.x + horizontal_padding + widget->style->xthickness,
+ widget->allocation.x + widget->allocation.width - horizontal_padding - widget->style->xthickness - 1,
+ widget->allocation.y + (widget->allocation.height -
+ widget->style->ythickness) / 2);
}
}
}
{
gtk_menu_item_paint (widget, &event->area);
- (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
+ (* GTK_WIDGET_CLASS (gtk_menu_item_parent_class)->expose_event) (widget, event);
}
return FALSE;
}
-static gint
-get_popup_delay (GtkMenuItem *menu_item)
-{
- GtkWidget *parent = GTK_WIDGET (menu_item)->parent;
-
- if (GTK_IS_MENU_SHELL (parent))
- {
- return _gtk_menu_shell_get_popup_delay (GTK_MENU_SHELL (parent));
- }
- else
- {
- gint popup_delay;
-
- g_object_get (gtk_widget_get_settings (GTK_WIDGET (menu_item)),
- "gtk-menu-popup-delay", &popup_delay,
- NULL);
-
- return popup_delay;
- }
-}
-
static void
gtk_real_menu_item_select (GtkItem *item)
{
GtkMenuItem *menu_item;
+ gboolean touchscreen_mode;
g_return_if_fail (GTK_IS_MENU_ITEM (item));
menu_item = GTK_MENU_ITEM (item);
- if (menu_item->submenu)
- {
- gint popup_delay;
-
- if (menu_item->timer)
- g_source_remove (menu_item->timer);
-
- popup_delay = get_popup_delay (menu_item);
-
- if (popup_delay > 0)
- {
- GdkEvent *event = gtk_get_current_event ();
-
- menu_item->timer = g_timeout_add (popup_delay,
- gtk_menu_item_select_timeout,
- menu_item);
- if (event &&
- event->type != GDK_BUTTON_PRESS &&
- event->type != GDK_ENTER_NOTIFY)
- menu_item->timer_from_keypress = TRUE;
- else
- menu_item->timer_from_keypress = FALSE;
+ g_object_get (gtk_widget_get_settings (GTK_WIDGET (item)),
+ "gtk-touchscreen-mode", &touchscreen_mode,
+ NULL);
- if (event)
- gdk_event_free (event);
- }
- else
- gtk_menu_item_popup_submenu (menu_item);
+ if (!touchscreen_mode &&
+ menu_item->submenu &&
+ (!GTK_WIDGET_MAPPED (menu_item->submenu) ||
+ GTK_MENU (menu_item->submenu)->tearoff_active))
+ {
+ _gtk_menu_item_popup_submenu (GTK_WIDGET (menu_item), TRUE);
}
-
+
gtk_widget_set_state (GTK_WIDGET (menu_item), GTK_STATE_PRELIGHT);
gtk_widget_queue_draw (GTK_WIDGET (menu_item));
}
menu_item = GTK_MENU_ITEM (item);
if (menu_item->submenu)
- {
- if (menu_item->timer)
- {
- g_source_remove (menu_item->timer);
- menu_item->timer = 0;
- }
- else
- gtk_menu_popdown (GTK_MENU (menu_item->submenu));
- }
+ _gtk_menu_item_popdown_submenu (GTK_WIDGET (menu_item));
gtk_widget_set_state (GTK_WIDGET (menu_item), GTK_STATE_NORMAL);
gtk_widget_queue_draw (GTK_WIDGET (menu_item));
return TRUE;
}
-
static void
gtk_real_menu_item_activate_item (GtkMenuItem *menu_item)
{
GtkWidget *widget;
- GtkMenuShell *submenu;
g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
_gtk_menu_shell_activate (menu_shell);
- gtk_menu_shell_select_item (GTK_MENU_SHELL (widget->parent), widget);
- gtk_menu_item_popup_submenu (widget);
+ gtk_menu_shell_select_item (GTK_MENU_SHELL (widget->parent), widget);
+ _gtk_menu_item_popup_submenu (widget, FALSE);
gtk_menu_shell_select_first (GTK_MENU_SHELL (menu_item->submenu), TRUE);
- submenu = GTK_MENU_SHELL (menu_item->submenu);
}
}
}
+
static void
gtk_real_menu_item_toggle_size_request (GtkMenuItem *menu_item,
gint *requisition)
menu_item->toggle_size = allocation;
}
+static void
+free_timeval (GTimeVal *val)
+{
+ g_slice_free (GTimeVal, val);
+}
+
+static void
+gtk_menu_item_real_popup_submenu (GtkWidget *widget,
+ gboolean remember_exact_time)
+{
+ GtkMenuItem *menu_item = GTK_MENU_ITEM (widget);
+
+ if (GTK_WIDGET_IS_SENSITIVE (menu_item->submenu))
+ {
+ gboolean take_focus;
+
+ take_focus = gtk_menu_shell_get_take_focus (GTK_MENU_SHELL (widget->parent));
+ gtk_menu_shell_set_take_focus (GTK_MENU_SHELL (menu_item->submenu),
+ take_focus);
+
+ if (remember_exact_time)
+ {
+ GTimeVal *popup_time = g_slice_new0 (GTimeVal);
+
+ g_get_current_time (popup_time);
+
+ g_object_set_data_full (G_OBJECT (menu_item->submenu),
+ "gtk-menu-exact-popup-time", popup_time,
+ (GDestroyNotify) free_timeval);
+ }
+ else
+ {
+ g_object_set_data (G_OBJECT (menu_item->submenu),
+ "gtk-menu-exact-popup-time", NULL);
+ }
+
+ gtk_menu_popup (GTK_MENU (menu_item->submenu),
+ widget->parent,
+ widget,
+ gtk_menu_item_position_menu,
+ menu_item,
+ GTK_MENU_SHELL (widget->parent)->button,
+ 0);
+ }
+
+ /* Enable themeing of the parent menu item depending on whether
+ * its submenu is shown or not.
+ */
+ gtk_widget_queue_draw (widget);
+}
+
static gint
-gtk_menu_item_select_timeout (gpointer data)
+gtk_menu_item_popup_timeout (gpointer data)
{
GtkMenuItem *menu_item;
GtkWidget *parent;
- GDK_THREADS_ENTER ();
-
menu_item = GTK_MENU_ITEM (data);
parent = GTK_WIDGET (menu_item)->parent;
- if (parent && GTK_IS_MENU_SHELL (parent) && GTK_MENU_SHELL (parent)->active)
+ if ((GTK_IS_MENU_SHELL (parent) && GTK_MENU_SHELL (parent)->active) ||
+ (GTK_IS_MENU (parent) && GTK_MENU (parent)->torn_off))
{
- gtk_menu_item_popup_submenu (data);
+ gtk_menu_item_real_popup_submenu (GTK_WIDGET (menu_item), TRUE);
if (menu_item->timer_from_keypress && menu_item->submenu)
GTK_MENU_SHELL (menu_item->submenu)->ignore_enter = TRUE;
}
- GDK_THREADS_LEAVE ();
+ menu_item->timer = 0;
return FALSE;
}
-static void
-gtk_menu_item_popup_submenu (gpointer data)
+static gint
+get_popup_delay (GtkWidget *widget)
+{
+ if (GTK_IS_MENU_SHELL (widget->parent))
+ {
+ return _gtk_menu_shell_get_popup_delay (GTK_MENU_SHELL (widget->parent));
+ }
+ else
+ {
+ gint popup_delay;
+
+ g_object_get (gtk_widget_get_settings (widget),
+ "gtk-menu-popup-delay", &popup_delay,
+ NULL);
+
+ return popup_delay;
+ }
+}
+
+void
+_gtk_menu_item_popup_submenu (GtkWidget *widget,
+ gboolean with_delay)
+{
+ GtkMenuItem *menu_item = GTK_MENU_ITEM (widget);
+
+ if (menu_item->timer)
+ {
+ g_source_remove (menu_item->timer);
+ menu_item->timer = 0;
+ with_delay = FALSE;
+ }
+
+ if (with_delay)
+ {
+ gint popup_delay = get_popup_delay (widget);
+
+ if (popup_delay > 0)
+ {
+ GdkEvent *event = gtk_get_current_event ();
+
+ menu_item->timer = gdk_threads_add_timeout (popup_delay,
+ gtk_menu_item_popup_timeout,
+ menu_item);
+
+ if (event &&
+ event->type != GDK_BUTTON_PRESS &&
+ event->type != GDK_ENTER_NOTIFY)
+ menu_item->timer_from_keypress = TRUE;
+ else
+ menu_item->timer_from_keypress = FALSE;
+
+ if (event)
+ gdk_event_free (event);
+
+ return;
+ }
+ }
+
+ gtk_menu_item_real_popup_submenu (widget, FALSE);
+}
+
+void
+_gtk_menu_item_popdown_submenu (GtkWidget *widget)
{
- GtkWidget *widget;
GtkMenuItem *menu_item;
- widget = GTK_WIDGET (data);
menu_item = GTK_MENU_ITEM (widget);
- if (menu_item->timer)
- g_source_remove (menu_item->timer);
- menu_item->timer = 0;
+ if (menu_item->submenu)
+ {
+ g_object_set_data (G_OBJECT (menu_item->submenu),
+ "gtk-menu-exact-popup-time", NULL);
- if (GTK_WIDGET_IS_SENSITIVE (menu_item->submenu))
- gtk_menu_popup (GTK_MENU (menu_item->submenu),
- widget->parent,
- widget,
- gtk_menu_item_position_menu,
- menu_item,
- GTK_MENU_SHELL (widget->parent)->button,
- 0);
+ if (menu_item->timer)
+ {
+ g_source_remove (menu_item->timer);
+ menu_item->timer = 0;
+ }
+ else
+ gtk_menu_popdown (GTK_MENU (menu_item->submenu));
+
+ gtk_widget_queue_draw (widget);
+ }
+}
+
+static void
+get_offsets (GtkMenu *menu,
+ gint *horizontal_offset,
+ gint *vertical_offset)
+{
+ gint vertical_padding;
+ gint horizontal_padding;
+
+ gtk_widget_style_get (GTK_WIDGET (menu),
+ "horizontal-offset", horizontal_offset,
+ "vertical-offset", vertical_offset,
+ "horizontal-padding", &horizontal_padding,
+ "vertical-padding", &vertical_padding,
+ NULL);
+
+ *vertical_offset -= GTK_WIDGET (menu)->style->ythickness;
+ *vertical_offset -= vertical_padding;
+ *horizontal_offset += horizontal_padding;
}
static void
{
GtkMenuItem *menu_item;
GtkWidget *widget;
- GtkWidget *parent_menu_item;
+ GtkMenuItem *parent_menu_item;
GdkScreen *screen;
gint twidth, theight;
gint tx, ty;
GtkTextDirection direction;
GdkRectangle monitor;
gint monitor_num;
+ gint horizontal_offset;
+ gint vertical_offset;
+ gint parent_xthickness;
+ gint available_left, available_right;
g_return_if_fail (menu != NULL);
g_return_if_fail (x != NULL);
menu_item = GTK_MENU_ITEM (user_data);
widget = GTK_WIDGET (user_data);
+ if (push_in)
+ *push_in = FALSE;
+
direction = gtk_widget_get_direction (widget);
twidth = GTK_WIDGET (menu)->requisition.width;
theight = GTK_WIDGET (menu)->requisition.height;
- screen = gtk_widget_get_screen (widget);
- monitor_num = gdk_screen_get_monitor_at_window (screen, widget->window);
+ screen = gtk_widget_get_screen (GTK_WIDGET (menu));
+ monitor_num = gdk_screen_get_monitor_at_window (screen, menu_item->event_window);
if (monitor_num < 0)
monitor_num = 0;
gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
tx += widget->allocation.x;
ty += widget->allocation.y;
+ get_offsets (menu, &horizontal_offset, &vertical_offset);
+
+ available_left = tx - monitor.x;
+ available_right = monitor.x + monitor.width - (tx + widget->allocation.width);
+
+ if (GTK_IS_MENU_BAR (widget->parent))
+ {
+ menu_item->from_menubar = TRUE;
+ }
+ else if (GTK_IS_MENU (widget->parent))
+ {
+ if (GTK_MENU (widget->parent)->parent_menu_item)
+ menu_item->from_menubar = GTK_MENU_ITEM (GTK_MENU (widget->parent)->parent_menu_item)->from_menubar;
+ else
+ menu_item->from_menubar = FALSE;
+ }
+ else
+ {
+ menu_item->from_menubar = FALSE;
+ }
+
switch (menu_item->submenu_placement)
{
case GTK_TOP_BOTTOM:
menu_item->submenu_direction = GTK_DIRECTION_LEFT;
tx += widget->allocation.width - twidth;
}
-
if ((ty + widget->allocation.height + theight) <= monitor.y + monitor.height)
ty += widget->allocation.height;
else if ((ty - theight) >= monitor.y)
break;
case GTK_LEFT_RIGHT:
- parent_menu_item = GTK_MENU (widget->parent)->parent_menu_item;
- if (parent_menu_item &&
- !GTK_MENU (widget->parent)->torn_off &&
- !GTK_MENU_SHELL (menu)->active)
- menu_item->submenu_direction = GTK_MENU_ITEM (parent_menu_item)->submenu_direction;
- else if (direction == GTK_TEXT_DIR_LTR)
- menu_item->submenu_direction = GTK_DIRECTION_RIGHT;
+ if (GTK_IS_MENU (widget->parent))
+ parent_menu_item = GTK_MENU_ITEM (GTK_MENU (widget->parent)->parent_menu_item);
else
- menu_item->submenu_direction = GTK_DIRECTION_LEFT;
+ parent_menu_item = NULL;
+
+ parent_xthickness = widget->parent->style->xthickness;
+
+ if (parent_menu_item && !GTK_MENU (widget->parent)->torn_off)
+ {
+ menu_item->submenu_direction = parent_menu_item->submenu_direction;
+ }
+ else
+ {
+ if (direction == GTK_TEXT_DIR_LTR)
+ menu_item->submenu_direction = GTK_DIRECTION_RIGHT;
+ else
+ menu_item->submenu_direction = GTK_DIRECTION_LEFT;
+ }
switch (menu_item->submenu_direction)
{
case GTK_DIRECTION_LEFT:
- if ((tx - twidth) >= monitor.x)
- tx -= twidth;
+ if (tx - twidth - parent_xthickness - horizontal_offset >= monitor.x ||
+ available_left >= available_right)
+ tx -= twidth + parent_xthickness + horizontal_offset;
else
{
menu_item->submenu_direction = GTK_DIRECTION_RIGHT;
- tx += widget->allocation.width - 5;
+ tx += widget->allocation.width + parent_xthickness + horizontal_offset;
}
break;
case GTK_DIRECTION_RIGHT:
- if ((tx + widget->allocation.width + twidth - 5) <= monitor.x + monitor.width)
- tx += widget->allocation.width - 5;
+ if (tx + widget->allocation.width + parent_xthickness + horizontal_offset + twidth <= monitor.x + monitor.width ||
+ available_right >= available_left)
+ tx += widget->allocation.width + parent_xthickness + horizontal_offset;
else
{
menu_item->submenu_direction = GTK_DIRECTION_LEFT;
- tx -= twidth;
+ tx -= twidth + parent_xthickness + horizontal_offset;
}
break;
}
- ty += widget->allocation.height / 4;
-
+ ty += vertical_offset;
+
/* If the height of the menu doesn't fit we move it upward. */
ty = CLAMP (ty, monitor.y, MAX (monitor.y, monitor.y + monitor.height - theight));
break;
*/
*x = CLAMP (tx, monitor.x, MAX (monitor.x, monitor.x + monitor.width - twidth));
*y = ty;
+
+ gtk_menu_set_monitor (menu, monitor_num);
+
+ if (!GTK_WIDGET_VISIBLE (menu->toplevel))
+ {
+ gtk_window_set_type_hint (GTK_WINDOW (menu->toplevel), menu_item->from_menubar?
+ GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU : GDK_WINDOW_TYPE_HINT_POPUP_MENU);
+ }
}
/**
gtk_widget_hide_all (menu_item->submenu);
}
+static gboolean
+gtk_menu_item_can_activate_accel (GtkWidget *widget,
+ guint signal_id)
+{
+ /* Chain to the parent GtkMenu for further checks */
+ return (GTK_WIDGET_IS_SENSITIVE (widget) && GTK_WIDGET_VISIBLE (widget) &&
+ widget->parent && gtk_widget_can_activate_accel (widget->parent, signal_id));
+}
+
static void
gtk_menu_item_accel_name_foreach (GtkWidget *widget,
gpointer data)
menu->accel_group,
TRUE);
- if (GTK_WIDGET_CLASS (parent_class)->parent_set)
- GTK_WIDGET_CLASS (parent_class)->parent_set (widget, previous_parent);
+ if (GTK_WIDGET_CLASS (gtk_menu_item_parent_class)->parent_set)
+ GTK_WIDGET_CLASS (gtk_menu_item_parent_class)->parent_set (widget, previous_parent);
}
void
path = menu_item->accel_path;
if (!path && prefix)
{
- gchar *postfix = NULL;
+ const gchar *postfix = NULL;
+ gchar *new_path;
/* try to construct one from label text */
gtk_container_foreach (GTK_CONTAINER (menu_item),
gtk_menu_item_accel_name_foreach,
&postfix);
- menu_item->accel_path = postfix ? g_strconcat (prefix, "/", postfix, NULL) : NULL;
- path = menu_item->accel_path;
+ if (postfix)
+ {
+ new_path = g_strconcat (prefix, "/", postfix, NULL);
+ path = menu_item->accel_path = (char*)g_intern_string (new_path);
+ g_free (new_path);
+ }
}
if (path)
gtk_widget_set_accel_path (widget, path, accel_group);
*
* Note that you do need to set an accelerator on the parent menu with
* gtk_menu_set_accel_group() for this to work.
+ *
+ * Note that @accel_path string will be stored in a #GQuark. Therefore, if you
+ * pass a static string, you can save some memory by interning it first with
+ * g_intern_static_string().
*/
void
gtk_menu_item_set_accel_path (GtkMenuItem *menu_item,
widget = GTK_WIDGET (menu_item);
/* store new path */
- g_free (menu_item->accel_path);
- menu_item->accel_path = g_strdup (accel_path);
+ menu_item->accel_path = (char*)g_intern_string (accel_path);
/* forget accelerators associated with old path */
gtk_widget_set_accel_path (widget, NULL, NULL);
/* install accelerators associated with new path */
- if (widget->parent && GTK_IS_MENU (widget->parent))
+ if (GTK_IS_MENU (widget->parent))
{
GtkMenu *menu = GTK_MENU (widget->parent);
}
}
+/**
+ * gtk_menu_item_get_accel_path
+ * @menu_item: a valid #GtkMenuItem
+ *
+ * Retrieve the accelerator path that was previously set on @menu_item.
+ *
+ * See gtk_menu_item_set_accel_path() for details.
+ *
+ * Returns: the accelerator path corresponding to this menu item's
+ * functionality, or %NULL if not set
+ *
+ * Since: 2.14
+ */
+G_CONST_RETURN gchar *
+gtk_menu_item_get_accel_path (GtkMenuItem *menu_item)
+{
+ g_return_val_if_fail (GTK_IS_MENU_ITEM (menu_item), NULL);
+
+ return menu_item->accel_path;
+}
+
static void
gtk_menu_item_forall (GtkContainer *container,
gboolean include_internals,
gpointer callback_data)
{
GtkBin *bin;
- GtkMenuItem *menu_item;
g_return_if_fail (GTK_IS_MENU_ITEM (container));
g_return_if_fail (callback != NULL);
bin = GTK_BIN (container);
- menu_item = GTK_MENU_ITEM (container);
if (bin->child)
callback (bin->child, callback_data);
return TRUE;
}
+
+#define __GTK_MENU_ITEM_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff