* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+/**
+ * SECTION:gtkmenubar
+ * @Title: GtkMenuBar
+ * @Short_description: A subclass of GtkMenuShell which holds GtkMenuItem widgets
+ * @See_also: #GtkMenuShell, #GtkMenu, #GtkMenuItem
+ *
+ * The #GtkMenuBar is a subclass of #GtkMenuShell which contains one or
+ * more #GtkMenuItems. The result is a standard menu bar which can hold
+ * many menu items.
+ */
+
#include "config.h"
#include "gtkmenubar.h"
-#include "gdk/gdkkeysyms.h"
#include "gtkbindings.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
-#include "gtkmenuitem.h"
+#include "gtkmenuitemprivate.h"
#include "gtkmenuprivate.h"
+#include "gtkmenushellprivate.h"
#include "gtksettings.h"
#include "gtksizerequest.h"
#include "gtkwindow.h"
-
#include "gtkintl.h"
#include "gtkprivate.h"
+#include "gtktypebuiltins.h"
#define BORDER_SPACING 0
#define DEFAULT_IPADDING 1
guint prop_id,
GValue *value,
GParamSpec *pspec);
-static void gtk_menu_bar_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
+static void gtk_menu_bar_get_preferred_width (GtkWidget *widget,
+ gint *minimum,
+ gint *natural);
+static void gtk_menu_bar_get_preferred_height (GtkWidget *widget,
+ gint *minimum,
+ gint *natural);
+static void gtk_menu_bar_get_preferred_width_for_height (GtkWidget *widget,
+ gint height,
+ gint *minimum,
+ gint *natural);
+static void gtk_menu_bar_get_preferred_height_for_width (GtkWidget *widget,
+ gint width,
+ gint *minimum,
+ gint *natural);
static void gtk_menu_bar_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static gint gtk_menu_bar_draw (GtkWidget *widget,
gobject_class->get_property = gtk_menu_bar_get_property;
gobject_class->set_property = gtk_menu_bar_set_property;
- widget_class->size_request = gtk_menu_bar_size_request;
+ widget_class->get_preferred_width = gtk_menu_bar_get_preferred_width;
+ widget_class->get_preferred_height = gtk_menu_bar_get_preferred_height;
+ widget_class->get_preferred_width_for_height = gtk_menu_bar_get_preferred_width_for_height;
+ widget_class->get_preferred_height_for_width = gtk_menu_bar_get_preferred_height_for_width;
widget_class->size_allocate = gtk_menu_bar_size_allocate;
widget_class->draw = gtk_menu_bar_draw;
widget_class->hierarchy_changed = gtk_menu_bar_hierarchy_changed;
DEFAULT_IPADDING,
GTK_PARAM_READABLE));
- gtk_settings_install_property (g_param_spec_int ("gtk-menu-bar-popup-delay",
- P_("Delay before drop down menus appear"),
- P_("Delay before the submenus of a menu bar appear"),
- 0,
- G_MAXINT,
- 0,
- GTK_PARAM_READWRITE));
-
g_type_class_add_private (gobject_class, sizeof (GtkMenuBarPrivate));
}
static void
gtk_menu_bar_init (GtkMenuBar *menu_bar)
{
+ GtkStyleContext *context;
+
menu_bar->priv = G_TYPE_INSTANCE_GET_PRIVATE (menu_bar,
GTK_TYPE_MENU_BAR,
GtkMenuBarPrivate);
+
+ context = gtk_widget_get_style_context (GTK_WIDGET (menu_bar));
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_MENUBAR);
}
+/**
+ * gtk_menu_bar_new:
+ *
+ * Creates a new #GtkMenuBar
+ *
+ * Returns: the new menu bar, as a #GtkWidget
+ */
GtkWidget*
gtk_menu_bar_new (void)
{
}
}
+static void
+get_preferred_size_for_size (GtkWidget *widget,
+ GtkOrientation orientation,
+ gint size,
+ gint *minimum,
+ gint *natural)
+{
+ if (orientation == GTK_ORIENTATION_HORIZONTAL)
+ if (size < 0)
+ gtk_widget_get_preferred_width (widget, minimum, natural);
+ else
+ gtk_widget_get_preferred_width_for_height (widget, size, minimum, natural);
+ else
+ if (size < 0)
+ gtk_widget_get_preferred_height (widget, minimum, natural);
+ else
+ gtk_widget_get_preferred_height_for_width (widget, size, minimum, natural);
+}
+
static void
gtk_menu_bar_size_request (GtkWidget *widget,
- GtkRequisition *requisition)
+ GtkOrientation orientation,
+ gint size,
+ gint *minimum,
+ gint *natural)
{
GtkMenuBar *menu_bar;
GtkMenuBarPrivate *priv;
GtkMenuShell *menu_shell;
GtkWidget *child;
GList *children;
- gint nchildren;
- GtkRequisition child_requisition;
gint ipadding;
guint border_width;
+ gboolean use_toggle_size, use_maximize;
+ gint child_minimum, child_natural;
- g_return_if_fail (GTK_IS_MENU_BAR (widget));
- g_return_if_fail (requisition != NULL);
+ *minimum = 0;
+ *natural = 0;
- requisition->width = 0;
- requisition->height = 0;
-
- if (gtk_widget_get_visible (widget))
- {
- menu_bar = GTK_MENU_BAR (widget);
- menu_shell = GTK_MENU_SHELL (widget);
- priv = menu_bar->priv;
+ menu_bar = GTK_MENU_BAR (widget);
+ menu_shell = GTK_MENU_SHELL (widget);
+ priv = menu_bar->priv;
- nchildren = 0;
- children = menu_shell->children;
+ children = menu_shell->priv->children;
- while (children)
- {
- child = children->data;
- children = children->next;
+ if (priv->child_pack_direction == GTK_PACK_DIRECTION_LTR ||
+ priv->child_pack_direction == GTK_PACK_DIRECTION_RTL)
+ use_toggle_size = (orientation == GTK_ORIENTATION_HORIZONTAL);
+ else
+ use_toggle_size = (orientation == GTK_ORIENTATION_VERTICAL);
- if (gtk_widget_get_visible (child))
- {
+ if (priv->pack_direction == GTK_PACK_DIRECTION_LTR ||
+ priv->pack_direction == GTK_PACK_DIRECTION_RTL)
+ use_maximize = (orientation == GTK_ORIENTATION_VERTICAL);
+ else
+ use_maximize = (orientation == GTK_ORIENTATION_HORIZONTAL);
+
+ while (children)
+ {
+ child = children->data;
+ children = children->next;
+
+ if (gtk_widget_get_visible (child))
+ {
+ get_preferred_size_for_size (child, orientation, size, &child_minimum, &child_natural);
+
+ if (use_toggle_size)
+ {
gint toggle_size;
- GTK_MENU_ITEM (child)->show_submenu_indicator = FALSE;
- gtk_size_request_get_size (GTK_SIZE_REQUEST (child),
- &child_requisition, NULL);
gtk_menu_item_toggle_size_request (GTK_MENU_ITEM (child),
&toggle_size);
- if (priv->child_pack_direction == GTK_PACK_DIRECTION_LTR ||
- priv->child_pack_direction == GTK_PACK_DIRECTION_RTL)
- child_requisition.width += toggle_size;
- else
- child_requisition.height += toggle_size;
+ child_minimum += toggle_size;
+ child_natural += toggle_size;
+ }
+
+ if (use_maximize)
+ {
+ *minimum = MAX (*minimum, child_minimum);
+ *natural = MAX (*natural, child_natural);
+ }
+ else
+ {
+ *minimum += child_minimum;
+ *natural += child_natural;
+ }
+ }
+ }
- if (priv->pack_direction == GTK_PACK_DIRECTION_LTR ||
- priv->pack_direction == GTK_PACK_DIRECTION_RTL)
- {
- requisition->width += child_requisition.width;
- requisition->height = MAX (requisition->height, child_requisition.height);
- }
- else
- {
- requisition->width = MAX (requisition->width, child_requisition.width);
- requisition->height += child_requisition.height;
- }
- nchildren += 1;
- }
- }
+ gtk_widget_style_get (widget, "internal-padding", &ipadding, NULL);
+ border_width = gtk_container_get_border_width (GTK_CONTAINER (menu_bar));
+ *minimum += (border_width + ipadding + BORDER_SPACING) * 2;
+ *natural += (border_width + ipadding + BORDER_SPACING) * 2;
- gtk_widget_style_get (widget, "internal-padding", &ipadding, NULL);
+ if (get_shadow_type (menu_bar) != GTK_SHADOW_NONE)
+ {
+ GtkStyleContext *context;
+ GtkBorder *border;
- border_width = gtk_container_get_border_width (GTK_CONTAINER (menu_bar));
- requisition->width += (border_width +
- ipadding +
- BORDER_SPACING) * 2;
- requisition->height += (border_width +
- ipadding +
- BORDER_SPACING) * 2;
+ context = gtk_widget_get_style_context (widget);
- if (get_shadow_type (menu_bar) != GTK_SHADOW_NONE)
- {
- GtkStyle *style;
+ gtk_style_context_get (context, 0,
+ "border-width", &border,
+ NULL);
- style = gtk_widget_get_style (widget);
- requisition->width += style->xthickness * 2;
- requisition->height += style->ythickness * 2;
- }
+ if (orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ *minimum += border->left + border->right;
+ *natural += border->left + border->right;
+ }
+ else
+ {
+ *minimum += border->top + border->bottom;
+ *natural += border->top + border->bottom;
+ }
+ gtk_border_free (border);
}
}
+static void
+gtk_menu_bar_get_preferred_width (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
+{
+ gtk_menu_bar_size_request (widget, GTK_ORIENTATION_HORIZONTAL, -1, minimum, natural);
+}
+
+static void
+gtk_menu_bar_get_preferred_height (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
+{
+ gtk_menu_bar_size_request (widget, GTK_ORIENTATION_VERTICAL, -1, minimum, natural);
+}
+
+static void
+gtk_menu_bar_get_preferred_width_for_height (GtkWidget *widget,
+ gint height,
+ gint *minimum,
+ gint *natural)
+{
+ gtk_menu_bar_size_request (widget, GTK_ORIENTATION_HORIZONTAL, height, minimum, natural);
+}
+
+static void
+gtk_menu_bar_get_preferred_height_for_width (GtkWidget *widget,
+ gint width,
+ gint *minimum,
+ gint *natural)
+{
+ gtk_menu_bar_size_request (widget, GTK_ORIENTATION_VERTICAL, width, minimum, natural);
+}
+
static void
gtk_menu_bar_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
gtk_widget_style_get (widget, "internal-padding", &ipadding, NULL);
- if (menu_shell->children)
+ if (menu_shell->priv->children)
{
border_width = gtk_container_get_border_width (GTK_CONTAINER (menu_bar));
child_allocation.x = (border_width +
ipadding +
BORDER_SPACING);
child_allocation.y = (border_width +
+ ipadding +
BORDER_SPACING);
if (get_shadow_type (menu_bar) != GTK_SHADOW_NONE)
{
- GtkStyle *style;
+ GtkStyleContext *context;
+ GtkBorder *border;
+
+ context = gtk_widget_get_style_context (widget);
+ gtk_style_context_get (context, 0,
+ "border-width", &border,
+ NULL);
- style = gtk_widget_get_style (widget);
- child_allocation.x += style->xthickness;
- child_allocation.y += style->ythickness;
+ child_allocation.x += border->left;
+ child_allocation.y += border->top;
+
+ gtk_border_free (border);
}
if (priv->pack_direction == GTK_PACK_DIRECTION_LTR ||
priv->pack_direction == GTK_PACK_DIRECTION_RTL)
{
child_allocation.height = MAX (1, (gint)allocation->height - child_allocation.y * 2);
-
- offset = child_allocation.x; /* Window edge to menubar start */
- ltr_x = child_allocation.x;
-
- children = menu_shell->children;
- while (children)
- {
- gint toggle_size;
-
+
+ offset = child_allocation.x; /* Window edge to menubar start */
+ ltr_x = child_allocation.x;
+
+ children = menu_shell->priv->children;
+ while (children)
+ {
+ gint toggle_size;
+
child = children->data;
children = children->next;
gtk_menu_item_toggle_size_request (GTK_MENU_ITEM (child),
&toggle_size);
- gtk_size_request_get_size (GTK_SIZE_REQUEST (child),
- &child_requisition, NULL);
+ gtk_widget_get_preferred_size (child, &child_requisition, NULL);
if (priv->child_pack_direction == GTK_PACK_DIRECTION_LTR ||
priv->child_pack_direction == GTK_PACK_DIRECTION_RTL)
child_requisition.width += toggle_size;
else
child_requisition.height += toggle_size;
-
+
/* Support for the right justified help menu */
- if ((children == NULL) && (GTK_IS_MENU_ITEM(child))
- && (GTK_MENU_ITEM(child)->right_justify))
+ if (children == NULL &&
+ GTK_IS_MENU_ITEM (child) &&
+ GTK_MENU_ITEM (child)->priv->right_justify)
{
ltr_x = allocation->width -
child_requisition.width - offset;
else
{
child_allocation.width = MAX (1, (gint)allocation->width - child_allocation.x * 2);
-
- offset = child_allocation.y; /* Window edge to menubar start */
- ltr_y = child_allocation.y;
-
- children = menu_shell->children;
- while (children)
- {
- gint toggle_size;
-
+
+ offset = child_allocation.y; /* Window edge to menubar start */
+ ltr_y = child_allocation.y;
+
+ children = menu_shell->priv->children;
+ while (children)
+ {
+ gint toggle_size;
+
child = children->data;
children = children->next;
gtk_menu_item_toggle_size_request (GTK_MENU_ITEM (child),
&toggle_size);
- gtk_size_request_get_size (GTK_SIZE_REQUEST (child),
- &child_requisition, NULL);
+ gtk_widget_get_preferred_size (child, &child_requisition, NULL);
if (priv->child_pack_direction == GTK_PACK_DIRECTION_LTR ||
priv->child_pack_direction == GTK_PACK_DIRECTION_RTL)
child_requisition.width += toggle_size;
else
child_requisition.height += toggle_size;
-
- /* Support for the right justified help menu */
- if ((children == NULL) && (GTK_IS_MENU_ITEM(child))
- && (GTK_MENU_ITEM(child)->right_justify))
- {
+
+ /* Support for the right justified help menu */
+ if (children == NULL &&
+ GTK_IS_MENU_ITEM (child) &&
+ GTK_MENU_ITEM (child)->priv->right_justify)
+ {
ltr_y = allocation->height -
child_requisition.height - offset;
}
gtk_menu_bar_draw (GtkWidget *widget,
cairo_t *cr)
{
+ GtkStyleContext *context;
+ GtkStateFlags state;
int border;
border = gtk_container_get_border_width (GTK_CONTAINER (widget));
+ context = gtk_widget_get_style_context (widget);
+
+ state = gtk_widget_get_state_flags (widget);
+ gtk_style_context_set_state (context, state);
+
+ if (get_shadow_type (GTK_MENU_BAR (widget)) != GTK_SHADOW_NONE)
+ gtk_render_background (context, cr,
+ border, border,
+ gtk_widget_get_allocated_width (widget) - border * 2,
+ gtk_widget_get_allocated_height (widget) - border * 2);
- gtk_cairo_paint_box (gtk_widget_get_style (widget),
- cr,
- gtk_widget_get_state (widget),
- get_shadow_type (GTK_MENU_BAR (widget)),
- widget, "menubar",
- border, border,
- gtk_widget_get_allocated_width (widget) - border * 2,
- gtk_widget_get_allocated_height (widget) - border * 2);
+ gtk_render_frame (context, cr,
+ border, border,
+ gtk_widget_get_allocated_width (widget) - border * 2,
+ gtk_widget_get_allocated_height (widget) - border * 2);
GTK_WIDGET_CLASS (gtk_menu_bar_parent_class)->draw (widget, cr);
GtkMenuShell *menu_shell = GTK_MENU_SHELL (menubars->data);
_gtk_menu_shell_set_keyboard_mode (menu_shell, TRUE);
- _gtk_menu_shell_activate (menu_shell);
gtk_menu_shell_select_first (menu_shell, FALSE);
g_list_free (menubars);
if (current && current->next)
{
GtkMenuShell *new_menushell = GTK_MENU_SHELL (current->next->data);
- if (new_menushell->children)
- to_activate = new_menushell->children->data;
+ if (new_menushell->priv->children)
+ to_activate = new_menushell->priv->children->data;
}
}
gtk_widget_queue_resize (GTK_WIDGET (menubar));
- for (l = GTK_MENU_SHELL (menubar)->children; l; l = l->next)
+ for (l = GTK_MENU_SHELL (menubar)->priv->children; l; l = l->next)
gtk_widget_queue_resize (GTK_WIDGET (l->data));
g_object_notify (G_OBJECT (menubar), "pack-direction");
gtk_widget_queue_resize (GTK_WIDGET (menubar));
- for (l = GTK_MENU_SHELL (menubar)->children; l; l = l->next)
+ for (l = GTK_MENU_SHELL (menubar)->priv->children; l; l = l->next)
gtk_widget_queue_resize (GTK_WIDGET (l->data));
g_object_notify (G_OBJECT (menubar), "child-pack-direction");
projects / ~andy / gtk / blobdiff