* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
* GtkToolbar copyright (C) Federico Mena
*
+ * Copyright (C) 2002 Anders Carlsson <andersca@codefactory.se>
+ * Copyright (C) 2002 James Henstridge <james@daa.com.au>
+ * Copyright (C) 2003 Soeren Sandmann <sandmann@daimi.au.dk>
+ *
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
+ * 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.
*/
-#include "gtkbutton.h"
-#include "gtktogglebutton.h"
+/*
+ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
+ * file for a list of people on the GTK+ Team. See the ChangeLog
+ * files for a list of changes. These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#undef GTK_DISABLE_DEPRECATED
+
+#include "gtkarrow.h"
+#include "gtktoolbar.h"
+#include "gtkradiotoolbutton.h"
+#include "gtkseparatortoolitem.h"
+#include "gtkmenu.h"
#include "gtkradiobutton.h"
-#include "gtklabel.h"
-#include "gtkvbox.h"
#include "gtktoolbar.h"
+#include "gtkbindings.h"
+#include <gdk/gdkkeysyms.h>
+#include "gtkmarshalers.h"
+#include "gtkmain.h"
+#include "gtkstock.h"
+#include "gtklabel.h"
+#include "gtkprivate.h"
+#include "gtkintl.h"
+#include <string.h>
+
+#define DEFAULT_IPADDING 0
+
+/* note: keep in sync with DEFAULT_SPACE_SIZE and DEFAULT_SPACE_STYLE in gtkseparatortoolitem.c */
+#define DEFAULT_SPACE_SIZE 4
+#define DEFAULT_SPACE_STYLE GTK_TOOLBAR_SPACE_LINE
+#define DEFAULT_ICON_SIZE GTK_ICON_SIZE_LARGE_TOOLBAR
+#define DEFAULT_TOOLBAR_STYLE GTK_TOOLBAR_BOTH
-#define DEFAULT_SPACE_SIZE 5
+#define MAX_HOMOGENEOUS_N_CHARS 13 /* Items that are wider than this do not participate
+ * in the homogeneous game. In units of
+ * pango_font_get_estimated_char_width().
+ */
+enum {
+ PROP_0,
+ PROP_ORIENTATION,
+ PROP_TOOLBAR_STYLE,
+ PROP_SHOW_ARROW
+};
+
+enum {
+ CHILD_PROP_0,
+ CHILD_PROP_EXPAND,
+ CHILD_PROP_HOMOGENEOUS,
+ CHILD_PROP_PACK_END,
+};
enum {
ORIENTATION_CHANGED,
STYLE_CHANGED,
+ POPUP_CONTEXT_MENU,
+ MOVE_FOCUS,
+ FOCUS_HOME_OR_END,
LAST_SIGNAL
};
-static void gtk_toolbar_class_init (GtkToolbarClass *class);
-static void gtk_toolbar_init (GtkToolbar *toolbar);
-static void gtk_toolbar_destroy (GtkObject *object);
-static void gtk_toolbar_map (GtkWidget *widget);
-static void gtk_toolbar_unmap (GtkWidget *widget);
-static void gtk_toolbar_draw (GtkWidget *widget,
- GdkRectangle *area);
-static gint gtk_toolbar_expose (GtkWidget *widget,
- GdkEventExpose *event);
-static void gtk_toolbar_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
-static void gtk_toolbar_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation);
-static void gtk_toolbar_add (GtkContainer *container,
- GtkWidget *widget);
-static void gtk_toolbar_remove (GtkContainer *container,
- GtkWidget *widget);
-static void gtk_toolbar_forall (GtkContainer *container,
- gboolean include_internals,
- GtkCallback callback,
- gpointer callback_data);
-static void gtk_real_toolbar_orientation_changed (GtkToolbar *toolbar,
+static void gtk_toolbar_init (GtkToolbar *toolbar);
+static void gtk_toolbar_class_init (GtkToolbarClass *klass);
+
+static void gtk_toolbar_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gtk_toolbar_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+
+static gint gtk_toolbar_expose (GtkWidget *widget,
+ GdkEventExpose *event);
+static void gtk_toolbar_realize (GtkWidget *widget);
+static void gtk_toolbar_unrealize (GtkWidget *widget);
+static void gtk_toolbar_size_request (GtkWidget *widget,
+ GtkRequisition *requisition);
+static void gtk_toolbar_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation);
+static void gtk_toolbar_style_set (GtkWidget *widget,
+ GtkStyle *prev_style);
+static void gtk_toolbar_direction_changed (GtkWidget *widget,
+ GtkTextDirection previous_direction);
+static gboolean gtk_toolbar_focus (GtkWidget *widget,
+ GtkDirectionType dir);
+static void gtk_toolbar_screen_changed (GtkWidget *widget,
+ GdkScreen *previous_screen);
+static void gtk_toolbar_map (GtkWidget *widget);
+static void gtk_toolbar_unmap (GtkWidget *widget);
+
+static void gtk_toolbar_set_child_property (GtkContainer *container,
+ GtkWidget *child,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gtk_toolbar_get_child_property (GtkContainer *container,
+ GtkWidget *child,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void gtk_toolbar_finalize (GObject *object);
+
+
+static void gtk_toolbar_add (GtkContainer *container,
+ GtkWidget *widget);
+static void gtk_toolbar_remove (GtkContainer *container,
+ GtkWidget *widget);
+static void gtk_toolbar_forall (GtkContainer *container,
+ gboolean include_internals,
+ GtkCallback callback,
+ gpointer callback_data);
+static GType gtk_toolbar_child_type (GtkContainer *container);
+
+static void gtk_toolbar_real_orientation_changed (GtkToolbar *toolbar,
GtkOrientation orientation);
-static void gtk_real_toolbar_style_changed (GtkToolbar *toolbar,
+static void gtk_toolbar_real_style_changed (GtkToolbar *toolbar,
GtkToolbarStyle style);
+static gboolean gtk_toolbar_move_focus (GtkToolbar *toolbar,
+ GtkDirectionType dir);
+static gboolean gtk_toolbar_focus_home_or_end (GtkToolbar *toolbar,
+ gboolean focus_home);
+
+static gboolean gtk_toolbar_button_press (GtkWidget *toolbar,
+ GdkEventButton *event);
+static gboolean gtk_toolbar_arrow_button_press (GtkWidget *button,
+ GdkEventButton *event,
+ GtkToolbar *toolbar);
+static void gtk_toolbar_arrow_button_clicked (GtkWidget *button,
+ GtkToolbar *toolbar);
+static void gtk_toolbar_update_button_relief (GtkToolbar *toolbar);
+static GtkReliefStyle get_button_relief (GtkToolbar *toolbar);
+static gint get_internal_padding (GtkToolbar *toolbar);
+static GtkShadowType get_shadow_type (GtkToolbar *toolbar);
+static void gtk_toolbar_remove_tool_item (GtkToolbar *toolbar,
+ GtkToolItem *item);
+static gboolean gtk_toolbar_popup_menu (GtkWidget *toolbar);
+
+static GtkWidget *gtk_toolbar_internal_insert_element (GtkToolbar *toolbar,
+ GtkToolbarChildType type,
+ GtkWidget *widget,
+ const char *text,
+ const char *tooltip_text,
+ const char *tooltip_private_text,
+ GtkWidget *icon,
+ GtkSignalFunc callback,
+ gpointer user_data,
+ gint position,
+ gboolean use_stock);
+static void gtk_toolbar_insert_tool_item (GtkToolbar *toolbar,
+ GtkToolItem *item,
+ gint pos,
+ gboolean is_placeholder);
+
+
+typedef enum {
+ DONT_KNOW,
+ OLD_API,
+ NEW_API
+} ApiMode;
+
+#define GTK_TOOLBAR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_TOOLBAR, GtkToolbarPrivate))
+typedef struct _ToolbarContent ToolbarContent;
+struct _ToolbarContent
+{
+ GtkToolItem *item;
+ guint is_overflow : 1;
+ guint is_placeholder : 1;
+ gint start_width;
+ gint goal_width;
+ gint start_height;
+ gint goal_height;
+};
-static GtkContainerClass *parent_class;
-
-static guint toolbar_signals[LAST_SIGNAL] = { 0 };
+struct _GtkToolbarPrivate
+{
+ GList *content;
+
+ GtkWidget *arrow;
+ GtkWidget *arrow_button;
+
+ gboolean show_arrow;
+
+ GtkMenu *menu;
+
+ GdkWindow *event_window;
+ ApiMode api_mode;
+ GtkSettings *settings;
+ int idle_id;
+ GTimer *timer;
+ gboolean need_sync;
+ gboolean leaving_dnd;
+ gboolean in_dnd;
+ gint n_overflow_items_when_dnd_started;
+};
+static GtkContainerClass *parent_class = NULL;
+static guint toolbar_signals [LAST_SIGNAL] = { 0 };
-guint
+GType
gtk_toolbar_get_type (void)
{
- static guint toolbar_type = 0;
+ static GtkType type = 0;
- if (!toolbar_type)
+ if (!type)
{
- GtkTypeInfo toolbar_info =
- {
- "GtkToolbar",
- sizeof (GtkToolbar),
- sizeof (GtkToolbarClass),
- (GtkClassInitFunc) gtk_toolbar_class_init,
- (GtkObjectInitFunc) gtk_toolbar_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
- };
-
- toolbar_type = gtk_type_unique (gtk_container_get_type (), &toolbar_info);
+ static const GTypeInfo type_info =
+ {
+ sizeof (GtkToolbarClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) gtk_toolbar_class_init,
+ (GClassFinalizeFunc) NULL,
+ NULL,
+ sizeof (GtkToolbar),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtk_toolbar_init,
+ };
+
+ type = g_type_register_static (GTK_TYPE_CONTAINER,
+ "GtkToolbar",
+ &type_info, 0);
}
+
+ return type;
+}
- return toolbar_type;
+static void
+add_arrow_bindings (GtkBindingSet *binding_set,
+ guint keysym,
+ GtkDirectionType dir)
+{
+ guint keypad_keysym = keysym - GDK_Left + GDK_KP_Left;
+
+ gtk_binding_entry_add_signal (binding_set, keysym, 0,
+ "move_focus", 1,
+ GTK_TYPE_DIRECTION_TYPE, dir);
+ gtk_binding_entry_add_signal (binding_set, keypad_keysym, 0,
+ "move_focus", 1,
+ GTK_TYPE_DIRECTION_TYPE, dir);
+}
+
+static void
+add_ctrl_tab_bindings (GtkBindingSet *binding_set,
+ GdkModifierType modifiers,
+ GtkDirectionType direction)
+{
+ gtk_binding_entry_add_signal (binding_set,
+ GDK_Tab, GDK_CONTROL_MASK | modifiers,
+ "move_focus", 1,
+ GTK_TYPE_DIRECTION_TYPE, direction);
+ gtk_binding_entry_add_signal (binding_set,
+ GDK_KP_Tab, GDK_CONTROL_MASK | modifiers,
+ "move_focus", 1,
+ GTK_TYPE_DIRECTION_TYPE, direction);
}
static void
-gtk_toolbar_class_init (GtkToolbarClass *class)
+gtk_toolbar_class_init (GtkToolbarClass *klass)
{
- GtkObjectClass *object_class;
+ GObjectClass *gobject_class;
GtkWidgetClass *widget_class;
GtkContainerClass *container_class;
+ GtkBindingSet *binding_set;
- object_class = (GtkObjectClass *) class;
- widget_class = (GtkWidgetClass *) class;
- container_class = (GtkContainerClass *) class;
-
- parent_class = gtk_type_class (gtk_container_get_type ());
-
- toolbar_signals[ORIENTATION_CHANGED] =
- gtk_signal_new ("orientation_changed",
- GTK_RUN_FIRST,
- object_class->type,
- GTK_SIGNAL_OFFSET (GtkToolbarClass, orientation_changed),
- gtk_marshal_NONE__INT,
- GTK_TYPE_NONE, 1,
- GTK_TYPE_INT);
- toolbar_signals[STYLE_CHANGED] =
- gtk_signal_new ("style_changed",
- GTK_RUN_FIRST,
- object_class->type,
- GTK_SIGNAL_OFFSET (GtkToolbarClass, style_changed),
- gtk_marshal_NONE__INT,
- GTK_TYPE_NONE, 1,
- GTK_TYPE_INT);
-
- gtk_object_class_add_signals (object_class, toolbar_signals, LAST_SIGNAL);
-
- object_class->destroy = gtk_toolbar_destroy;
+ parent_class = g_type_class_peek_parent (klass);
+
+ gobject_class = (GObjectClass *)klass;
+ widget_class = (GtkWidgetClass *)klass;
+ container_class = (GtkContainerClass *)klass;
+
+ gobject_class->set_property = gtk_toolbar_set_property;
+ gobject_class->get_property = gtk_toolbar_get_property;
+ gobject_class->finalize = gtk_toolbar_finalize;
- widget_class->map = gtk_toolbar_map;
- widget_class->unmap = gtk_toolbar_unmap;
- widget_class->draw = gtk_toolbar_draw;
+ widget_class->button_press_event = gtk_toolbar_button_press;
widget_class->expose_event = gtk_toolbar_expose;
widget_class->size_request = gtk_toolbar_size_request;
widget_class->size_allocate = gtk_toolbar_size_allocate;
-
- container_class->add = gtk_toolbar_add;
+ widget_class->style_set = gtk_toolbar_style_set;
+ widget_class->direction_changed = gtk_toolbar_direction_changed;
+ widget_class->focus = gtk_toolbar_focus;
+ widget_class->screen_changed = gtk_toolbar_screen_changed;
+ widget_class->realize = gtk_toolbar_realize;
+ widget_class->unrealize = gtk_toolbar_unrealize;
+ widget_class->map = gtk_toolbar_map;
+ widget_class->unmap = gtk_toolbar_unmap;
+ widget_class->popup_menu = gtk_toolbar_popup_menu;
+
+ container_class->add = gtk_toolbar_add;
container_class->remove = gtk_toolbar_remove;
container_class->forall = gtk_toolbar_forall;
- container_class->focus = NULL;
-
- class->orientation_changed = gtk_real_toolbar_orientation_changed;
- class->style_changed = gtk_real_toolbar_style_changed;
+ container_class->child_type = gtk_toolbar_child_type;
+ container_class->get_child_property = gtk_toolbar_get_child_property;
+ container_class->set_child_property = gtk_toolbar_set_child_property;
+
+ klass->orientation_changed = gtk_toolbar_real_orientation_changed;
+ klass->style_changed = gtk_toolbar_real_style_changed;
+
+/**
+ * GtkToolbar::orientation-changed:
+ * @toolbar: the object which emitted the signal
+ * @orientation: the new #GtkOrientation of the toolbar
+ *
+ * Emitted when the orientation of the toolbar changes.
+ */
+ toolbar_signals[ORIENTATION_CHANGED] =
+ g_signal_new ("orientation-changed",
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (GtkToolbarClass, orientation_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__ENUM,
+ G_TYPE_NONE, 1,
+ GTK_TYPE_ORIENTATION);
+/**
+ * GtkToolbar::style-changed:
+ * @toolbar: The #GtkToolbar which emitted the signal
+ * @style: the new #GtkToolbarStyle of the toolbar
+ *
+ * Emitted when the style of the toolbar changes.
+ */
+ toolbar_signals[STYLE_CHANGED] =
+ g_signal_new ("style-changed",
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (GtkToolbarClass, style_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__ENUM,
+ G_TYPE_NONE, 1,
+ GTK_TYPE_TOOLBAR_STYLE);
+/**
+ * GtkToolbar::popup-context-menu:
+ * @toolbar: the #GtkToolbar which emitted the signal
+ * @x: the x coordinate of the point where the menu should appear
+ * @y: the y coordinate of the point where the menu should appear
+ * @button: the mouse button the user pressed, or -1
+ *
+ * Emitted when the user right-clicks the toolbar or uses the
+ * keybinding to display a popup menu.
+ *
+ * Application developers should handle this signal if they want
+ * to display a context menu on the toolbar. The context-menu should
+ * appear at the coordinates given by @x and @y. The mouse button
+ * number is given by the @button parameter. If the menu was popped
+ * up using the keybaord, @button is -1.
+ *
+ * Return value: return %TRUE if the signal was handled, %FALSE if not
+ */
+ toolbar_signals[POPUP_CONTEXT_MENU] =
+ g_signal_new ("popup_context_menu",
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkToolbarClass, popup_context_menu),
+ _gtk_boolean_handled_accumulator, NULL,
+ _gtk_marshal_BOOLEAN__INT_INT_INT,
+ G_TYPE_BOOLEAN, 3,
+ G_TYPE_INT, G_TYPE_INT,
+ G_TYPE_INT);
+/**
+ * GtkToolbar::move-focus:
+ * @toolbar: the #GtkToolbar which emitted the signal
+ * @dir: a #GtkDirection
+ *
+ * A keybinding signal used internally by GTK+. This signal can't
+ * be used in application code.
+ *
+ * Return value: %TRUE if the signal was handled, %FALSE if not
+ */
+ toolbar_signals[MOVE_FOCUS] =
+ _gtk_binding_signal_new ("move_focus",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_CALLBACK (gtk_toolbar_move_focus),
+ NULL, NULL,
+ _gtk_marshal_BOOLEAN__ENUM,
+ G_TYPE_BOOLEAN, 1,
+ GTK_TYPE_DIRECTION_TYPE);
+/**
+ * GtkToolbar::focus-home-or-end:
+ * @toolbar: the #GtkToolbar which emitted the signal
+ * @focus_home: %TRUE if the first item should be focused
+ *
+ * A keybinding signal used internally by GTK+. This signal can't
+ * be used in application code
+ *
+ * Return value: %TRUE if the signal was handled, %FALSE if not
+ */
+ toolbar_signals[FOCUS_HOME_OR_END] =
+ _gtk_binding_signal_new ("focus_home_or_end",
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_CALLBACK (gtk_toolbar_focus_home_or_end),
+ NULL, NULL,
+ _gtk_marshal_BOOLEAN__BOOLEAN,
+ G_TYPE_BOOLEAN, 1,
+ G_TYPE_BOOLEAN);
+
+ /* properties */
+ g_object_class_install_property (gobject_class,
+ PROP_ORIENTATION,
+ g_param_spec_enum ("orientation",
+ _("Orientation"),
+ _("The orientation of the toolbar"),
+ GTK_TYPE_ORIENTATION,
+ GTK_ORIENTATION_HORIZONTAL,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_TOOLBAR_STYLE,
+ g_param_spec_enum ("toolbar_style",
+ _("Toolbar Style"),
+ _("How to draw the toolbar"),
+ GTK_TYPE_TOOLBAR_STYLE,
+ GTK_TOOLBAR_ICONS,
+ G_PARAM_READWRITE));
+ g_object_class_install_property (gobject_class,
+ PROP_SHOW_ARROW,
+ g_param_spec_boolean ("show_arrow",
+ _("Show Arrow"),
+ _("If an arrow should be shown if the toolbar doesn't fit"),
+ TRUE,
+ G_PARAM_READWRITE));
+
+ /* child properties */
+ gtk_container_class_install_child_property (container_class,
+ CHILD_PROP_EXPAND,
+ g_param_spec_boolean ("expand",
+ _("Expand"),
+ _("Whether the item should receive extra space when the toolbar grows"),
+ TRUE,
+ G_PARAM_READWRITE));
+
+ gtk_container_class_install_child_property (container_class,
+ CHILD_PROP_HOMOGENEOUS,
+ g_param_spec_boolean ("homogeneous",
+ _("Homogeneous"),
+ _("Whether the item should be the same size as other homogeneous items"),
+ TRUE,
+ G_PARAM_READWRITE));
+
+ gtk_container_class_install_child_property (container_class,
+ CHILD_PROP_PACK_END,
+ g_param_spec_uint ("pack_end",
+ _("Pack End"),
+ _("Whether the item is positioned at the end of the toolbar"),
+ 0, G_MAXINT, 0,
+ G_PARAM_READWRITE));
+
+ /* style properties */
+ gtk_widget_class_install_style_property (widget_class,
+ g_param_spec_int ("space_size",
+ _("Spacer size"),
+ _("Size of spacers"),
+ 0,
+ G_MAXINT,
+ DEFAULT_SPACE_SIZE,
+ G_PARAM_READABLE));
+
+ gtk_widget_class_install_style_property (widget_class,
+ g_param_spec_int ("internal_padding",
+ _("Internal padding"),
+ _("Amount of border space between the toolbar shadow and the buttons"),
+ 0,
+ G_MAXINT,
+ DEFAULT_IPADDING,
+ G_PARAM_READABLE));
+
+ gtk_widget_class_install_style_property (widget_class,
+ g_param_spec_enum ("space_style",
+ _("Space style"),
+ _("Whether spacers are vertical lines or just blank"),
+ GTK_TYPE_TOOLBAR_SPACE_STYLE,
+ DEFAULT_SPACE_STYLE,
+ G_PARAM_READABLE));
+
+ gtk_widget_class_install_style_property (widget_class,
+ g_param_spec_enum ("button_relief",
+ _("Button relief"),
+ _("Type of bevel around toolbar buttons"),
+ GTK_TYPE_RELIEF_STYLE,
+ GTK_RELIEF_NONE,
+ G_PARAM_READABLE));
+ gtk_widget_class_install_style_property (widget_class,
+ g_param_spec_enum ("shadow_type",
+ _("Shadow type"),
+ _("Style of bevel around the toolbar"),
+ GTK_TYPE_SHADOW_TYPE,
+ GTK_SHADOW_OUT,
+ G_PARAM_READABLE));
+
+ gtk_settings_install_property (g_param_spec_enum ("gtk-toolbar-style",
+ _("Toolbar style"),
+ _("Whether default toolbars have text only, text and icons, icons only, etc."),
+ GTK_TYPE_TOOLBAR_STYLE,
+ DEFAULT_TOOLBAR_STYLE,
+ G_PARAM_READWRITE));
+
+ gtk_settings_install_property (g_param_spec_enum ("gtk-toolbar-icon-size",
+ _("Toolbar icon size"),
+ _("Size of icons in default toolbars"),
+ GTK_TYPE_ICON_SIZE,
+ DEFAULT_ICON_SIZE,
+ G_PARAM_READWRITE));
+
+ binding_set = gtk_binding_set_by_class (klass);
+
+ add_arrow_bindings (binding_set, GDK_Left, GTK_DIR_LEFT);
+ add_arrow_bindings (binding_set, GDK_Right, GTK_DIR_RIGHT);
+ add_arrow_bindings (binding_set, GDK_Up, GTK_DIR_UP);
+ add_arrow_bindings (binding_set, GDK_Down, GTK_DIR_DOWN);
+
+ gtk_binding_entry_add_signal (binding_set, GDK_KP_Home, 0,
+ "focus_home_or_end", 1,
+ G_TYPE_BOOLEAN, TRUE);
+ gtk_binding_entry_add_signal (binding_set, GDK_Home, 0,
+ "focus_home_or_end", 1,
+ G_TYPE_BOOLEAN, TRUE);
+ gtk_binding_entry_add_signal (binding_set, GDK_KP_End, 0,
+ "focus_home_or_end", 1,
+ G_TYPE_BOOLEAN, FALSE);
+ gtk_binding_entry_add_signal (binding_set, GDK_End, 0,
+ "focus_home_or_end", 1,
+ G_TYPE_BOOLEAN, FALSE);
+
+ add_ctrl_tab_bindings (binding_set, 0, GTK_DIR_TAB_FORWARD);
+ add_ctrl_tab_bindings (binding_set, GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
+
+ g_type_class_add_private (gobject_class, sizeof (GtkToolbarPrivate));
}
static void
gtk_toolbar_init (GtkToolbar *toolbar)
{
- GTK_WIDGET_SET_FLAGS (toolbar, GTK_NO_WINDOW);
+ GtkToolbarPrivate *priv;
+
GTK_WIDGET_UNSET_FLAGS (toolbar, GTK_CAN_FOCUS);
+ GTK_WIDGET_SET_FLAGS (toolbar, GTK_NO_WINDOW);
- toolbar->num_children = 0;
- toolbar->children = NULL;
- toolbar->orientation = GTK_ORIENTATION_HORIZONTAL;
- toolbar->style = GTK_TOOLBAR_ICONS;
- toolbar->relief = GTK_RELIEF_NORMAL;
- toolbar->space_size = DEFAULT_SPACE_SIZE;
- toolbar->tooltips = gtk_tooltips_new ();
- toolbar->button_maxw = 0;
- toolbar->button_maxh = 0;
-}
-
-GtkWidget *
-gtk_toolbar_new (GtkOrientation orientation,
- GtkToolbarStyle style)
-{
- GtkToolbar *toolbar;
-
- toolbar = gtk_type_new (gtk_toolbar_get_type ());
+ priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
+ toolbar->orientation = GTK_ORIENTATION_HORIZONTAL;
+ toolbar->style = DEFAULT_TOOLBAR_STYLE;
+ toolbar->icon_size = DEFAULT_ICON_SIZE;
+ toolbar->tooltips = gtk_tooltips_new ();
+ g_object_ref (toolbar->tooltips);
+ gtk_object_sink (GTK_OBJECT (toolbar->tooltips));
+
+ priv->arrow_button = gtk_toggle_button_new ();
+ g_signal_connect (priv->arrow_button, "button_press_event",
+ G_CALLBACK (gtk_toolbar_arrow_button_press), toolbar);
+ g_signal_connect (priv->arrow_button, "clicked",
+ G_CALLBACK (gtk_toolbar_arrow_button_clicked), toolbar);
+ gtk_button_set_relief (GTK_BUTTON (priv->arrow_button),
+ get_button_relief (toolbar));
+
+ priv->api_mode = DONT_KNOW;
+
+ gtk_button_set_focus_on_click (GTK_BUTTON (priv->arrow_button), FALSE);
+
+ priv->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
+ gtk_widget_set_name (priv->arrow, "gtk-toolbar-arrow");
+ gtk_widget_show (priv->arrow);
+ gtk_container_add (GTK_CONTAINER (priv->arrow_button), priv->arrow);
+
+ gtk_widget_set_parent (priv->arrow_button, GTK_WIDGET (toolbar));
- toolbar->orientation = orientation;
- toolbar->style = style;
+ /* which child position a drop will occur at */
+ priv->menu = NULL;
+ priv->show_arrow = TRUE;
+ priv->settings = NULL;
- return GTK_WIDGET (toolbar);
+ priv->timer = g_timer_new ();
}
-static void
-gtk_toolbar_destroy (GtkObject *object)
+static gboolean
+toolbar_item_visible (GtkToolbar *toolbar,
+ GtkToolItem *item)
{
- GtkToolbar *toolbar;
- GList *children;
-
- g_return_if_fail (object != NULL);
- g_return_if_fail (GTK_IS_TOOLBAR (object));
+ if (GTK_WIDGET_VISIBLE (item) &&
+ ((toolbar->orientation == GTK_ORIENTATION_HORIZONTAL &&
+ gtk_tool_item_get_visible_horizontal (item)) ||
+ (toolbar->orientation == GTK_ORIENTATION_VERTICAL &&
+ gtk_tool_item_get_visible_vertical (item))))
+ {
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
+ /* With the old toolbar you could hide a button by calling gtk_widget_hide()
+ * on it. This doesn't work with the new API because the GtkToolItem will not be
+ * hidden.
+ */
+ if (priv->api_mode == OLD_API)
+ {
+ GtkWidget *bin_child = GTK_BIN (item)->child;
+
+ if (bin_child && !GTK_WIDGET_VISIBLE (bin_child))
+ return FALSE;
+ }
+
+ return TRUE;
+ }
+
+ return FALSE;
+}
- toolbar = GTK_TOOLBAR (object);
+static gboolean
+toolbar_item_is_homogeneous (GtkToolbar *toolbar,
+ GtkToolItem *item)
+{
+ gboolean result;
+ GtkWidget *widget = GTK_WIDGET (item);
+ GtkRequisition requisition;
+ PangoContext *context;
+ PangoFontMetrics *metrics;
+ int char_width;
+ gint max_homogeneous_pixels;
+
+ context = gtk_widget_get_pango_context (widget);
+ metrics = pango_context_get_metrics (context,
+ widget->style->font_desc,
+ pango_context_get_language (context));
+ char_width = pango_font_metrics_get_approximate_char_width (metrics);
+ pango_font_metrics_unref (metrics);
+
+ max_homogeneous_pixels = PANGO_PIXELS (MAX_HOMOGENEOUS_N_CHARS * char_width);
+
+ result = gtk_tool_item_get_homogeneous (item) && !GTK_IS_SEPARATOR_TOOL_ITEM (item);
- gtk_object_unref (GTK_OBJECT (toolbar->tooltips));
- toolbar->tooltips = NULL;
+ gtk_widget_size_request (GTK_WIDGET (item), &requisition);
- for (children = toolbar->children; children; children = children->next)
+ if ((gtk_tool_item_get_is_important (item) &&
+ toolbar->style == GTK_TOOLBAR_BOTH_HORIZ &&
+ toolbar->orientation == GTK_ORIENTATION_HORIZONTAL) ||
+ requisition.width > max_homogeneous_pixels)
{
- GtkToolbarChild *child;
+ result = FALSE;
+ }
- child = children->data;
+ return result;
+}
- if (child->type != GTK_TOOLBAR_CHILD_SPACE)
- {
- gtk_widget_ref (child->widget);
- gtk_widget_unparent (child->widget);
- gtk_widget_destroy (child->widget);
- gtk_widget_unref (child->widget);
- }
+static void
+gtk_toolbar_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GtkToolbar *toolbar = GTK_TOOLBAR (object);
- g_free (child);
+ switch (prop_id)
+ {
+ case PROP_ORIENTATION:
+ gtk_toolbar_set_orientation (toolbar, g_value_get_enum (value));
+ break;
+ case PROP_TOOLBAR_STYLE:
+ gtk_toolbar_set_style (toolbar, g_value_get_enum (value));
+ break;
+ case PROP_SHOW_ARROW:
+ gtk_toolbar_set_show_arrow (toolbar, g_value_get_boolean (value));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
}
+}
- g_list_free (toolbar->children);
- toolbar->children = NULL;
+static void
+gtk_toolbar_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GtkToolbar *toolbar = GTK_TOOLBAR (object);
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
- if (GTK_OBJECT_CLASS (parent_class)->destroy)
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+ switch (prop_id)
+ {
+ case PROP_ORIENTATION:
+ g_value_set_enum (value, toolbar->orientation);
+ break;
+ case PROP_TOOLBAR_STYLE:
+ g_value_set_enum (value, toolbar->style);
+ break;
+ case PROP_SHOW_ARROW:
+ g_value_set_boolean (value, priv->show_arrow);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
}
static void
gtk_toolbar_map (GtkWidget *widget)
{
- GtkToolbar *toolbar;
- GList *children;
- GtkToolbarChild *child;
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (widget);
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_TOOLBAR (widget));
+ GTK_WIDGET_CLASS (parent_class)->map (widget);
- toolbar = GTK_TOOLBAR (widget);
- GTK_WIDGET_SET_FLAGS (toolbar, GTK_MAPPED);
+ if (priv->event_window)
+ gdk_window_show_unraised (priv->event_window);
+}
- for (children = toolbar->children; children; children = children->next)
- {
- child = children->data;
+static void
+gtk_toolbar_unmap (GtkWidget *widget)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (widget);
- if ((child->type != GTK_TOOLBAR_CHILD_SPACE)
- && GTK_WIDGET_VISIBLE (child->widget) && !GTK_WIDGET_MAPPED (child->widget))
- gtk_widget_map (child->widget);
- }
+ if (priv->event_window)
+ gdk_window_hide (priv->event_window);
+
+ GTK_WIDGET_CLASS (parent_class)->unmap (widget);
}
static void
-gtk_toolbar_unmap (GtkWidget *widget)
+gtk_toolbar_realize (GtkWidget *widget)
{
- GtkToolbar *toolbar;
- GList *children;
- GtkToolbarChild *child;
+ GtkToolbar *toolbar = GTK_TOOLBAR (widget);
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_TOOLBAR (widget));
+ GdkWindowAttr attributes;
+ gint attributes_mask;
+ gint border_width;
- toolbar = GTK_TOOLBAR (widget);
- GTK_WIDGET_UNSET_FLAGS (toolbar, GTK_MAPPED);
+ GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
- for (children = toolbar->children; children; children = children->next)
- {
- child = children->data;
+ border_width = GTK_CONTAINER (widget)->border_width;
- if ((child->type != GTK_TOOLBAR_CHILD_SPACE)
- && GTK_WIDGET_VISIBLE (child->widget) && GTK_WIDGET_MAPPED (child->widget))
- gtk_widget_unmap (child->widget);
- }
+ attributes.wclass = GDK_INPUT_ONLY;
+ attributes.window_type = GDK_WINDOW_CHILD;
+ attributes.x = widget->allocation.x + border_width;
+ attributes.y = widget->allocation.y + border_width;
+ attributes.width = widget->allocation.width - border_width * 2;
+ attributes.height = widget->allocation.height - border_width * 2;
+ attributes.event_mask = gtk_widget_get_events (widget);
+ attributes.event_mask |= (GDK_BUTTON_PRESS_MASK |
+ GDK_BUTTON_RELEASE_MASK |
+ GDK_ENTER_NOTIFY_MASK |
+ GDK_LEAVE_NOTIFY_MASK);
+
+ attributes_mask = GDK_WA_X | GDK_WA_Y;
+
+ widget->window = gtk_widget_get_parent_window (widget);
+ g_object_ref (widget->window);
+ widget->style = gtk_style_attach (widget->style, widget->window);
+
+ priv->event_window = gdk_window_new (gtk_widget_get_parent_window (widget),
+ &attributes, attributes_mask);
+ gdk_window_set_user_data (priv->event_window, toolbar);
}
static void
-gtk_toolbar_draw (GtkWidget *widget,
- GdkRectangle *area)
+gtk_toolbar_unrealize (GtkWidget *widget)
{
- GtkToolbar *toolbar;
- GList *children;
- GtkToolbarChild *child;
- GdkRectangle child_area;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_TOOLBAR (widget));
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (widget);
- if (GTK_WIDGET_DRAWABLE (widget))
+ if (priv->event_window)
{
- toolbar = GTK_TOOLBAR (widget);
-
- for (children = toolbar->children; children; children = children->next)
- {
- child = children->data;
-
- if ((child->type != GTK_TOOLBAR_CHILD_SPACE)
- && gtk_widget_intersect (child->widget, area, &child_area))
- gtk_widget_draw (child->widget, &child_area);
- }
+ gdk_window_set_user_data (priv->event_window, NULL);
+ gdk_window_destroy (priv->event_window);
+ priv->event_window = NULL;
}
+
+ if (GTK_WIDGET_CLASS (parent_class)->unrealize)
+ (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
}
static gint
gtk_toolbar_expose (GtkWidget *widget,
GdkEventExpose *event)
{
- GtkToolbar *toolbar;
- GList *children;
- GtkToolbarChild *child;
- GdkEventExpose child_event;
-
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_TOOLBAR (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
+ GtkToolbar *toolbar = GTK_TOOLBAR (widget);
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
+ GList *list;
+ gint border_width;
+
+ border_width = GTK_CONTAINER (widget)->border_width;
+
if (GTK_WIDGET_DRAWABLE (widget))
{
- toolbar = GTK_TOOLBAR (widget);
-
- child_event = *event;
+ gtk_paint_box (widget->style,
+ widget->window,
+ GTK_WIDGET_STATE (widget),
+ get_shadow_type (toolbar),
+ &event->area, widget, "toolbar",
+ border_width + widget->allocation.x,
+ border_width + widget->allocation.y,
+ widget->allocation.width - 2 * border_width,
+ widget->allocation.height - 2 * border_width);
+ }
- for (children = toolbar->children; children; children = children->next)
- {
- child = children->data;
+ for (list = priv->content; list != NULL; list = list->next)
+ {
+ ToolbarContent *content = list->data;
+ GtkToolItem *item = content->item;
- if ((child->type != GTK_TOOLBAR_CHILD_SPACE)
- && GTK_WIDGET_NO_WINDOW (child->widget)
- && gtk_widget_intersect (child->widget, &event->area, &child_event.area))
- gtk_widget_event (child->widget, (GdkEvent *) &child_event);
- }
+ if (!content->is_placeholder)
+ gtk_container_propagate_expose (GTK_CONTAINER (widget),
+ GTK_WIDGET (item),
+ event);
}
+ gtk_container_propagate_expose (GTK_CONTAINER (widget),
+ priv->arrow_button,
+ event);
+
return FALSE;
}
gtk_toolbar_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
- GtkToolbar *toolbar;
- GList *children;
- GtkToolbarChild *child;
- gint nbuttons;
- gint button_maxw, button_maxh;
- gint widget_maxw, widget_maxh;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_TOOLBAR (widget));
- g_return_if_fail (requisition != NULL);
-
- toolbar = GTK_TOOLBAR (widget);
+ GtkToolbar *toolbar = GTK_TOOLBAR (widget);
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+ GList *list;
+ gint max_child_height;
+ gint max_child_width;
+ gint max_homogeneous_child_width;
+ gint max_homogeneous_child_height;
+ gint homogeneous_size;
+ gint long_req;
+ gint pack_end_size;
+ gint pack_front_size;
+ gint ipadding;
+ GtkRequisition arrow_requisition;
+
+ max_homogeneous_child_width = 0;
+ max_homogeneous_child_height = 0;
+ max_child_width = 0;
+ max_child_height = 0;
+ for (list = priv->content; list != NULL; list = list->next)
+ {
+ GtkRequisition requisition;
+ ToolbarContent *content = list->data;
+ GtkToolItem *item = content->item;
+
+ if (!toolbar_item_visible (toolbar, item))
+ continue;
- requisition->width = GTK_CONTAINER (toolbar)->border_width * 2;
- requisition->height = GTK_CONTAINER (toolbar)->border_width * 2;
- nbuttons = 0;
- button_maxw = 0;
- button_maxh = 0;
- widget_maxw = 0;
- widget_maxh = 0;
+ gtk_widget_size_request (GTK_WIDGET (item), &requisition);
+
+ max_child_width = MAX (max_child_width, requisition.width);
+ max_child_height = MAX (max_child_height, requisition.height);
- for (children = toolbar->children; children; children = children->next)
+ if (toolbar_item_is_homogeneous (toolbar, item))
+ {
+ max_homogeneous_child_width = MAX (max_homogeneous_child_width, requisition.width);
+ max_homogeneous_child_height = MAX (max_homogeneous_child_height, requisition.height);
+ }
+ }
+
+ if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL)
+ homogeneous_size = max_homogeneous_child_width;
+ else
+ homogeneous_size = max_homogeneous_child_height;
+
+ pack_end_size = 0;
+ pack_front_size = 0;
+ for (list = priv->content; list != NULL; list = list->next)
{
- child = children->data;
-
- switch (child->type)
+ ToolbarContent *content = list->data;
+ GtkToolItem *item = content->item;
+ guint size;
+
+ if (!toolbar_item_visible (toolbar, item))
+ continue;
+
+ if (toolbar_item_is_homogeneous (toolbar, item))
+ {
+ size = homogeneous_size;
+ }
+ else
{
- case GTK_TOOLBAR_CHILD_SPACE:
+ GtkRequisition requisition;
+
+ gtk_widget_size_request (GTK_WIDGET (item), &requisition);
+
if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL)
- requisition->width += toolbar->space_size;
+ size = requisition.width;
else
- requisition->height += toolbar->space_size;
-
- break;
-
- case GTK_TOOLBAR_CHILD_BUTTON:
- case GTK_TOOLBAR_CHILD_RADIOBUTTON:
- case GTK_TOOLBAR_CHILD_TOGGLEBUTTON:
- if (GTK_WIDGET_VISIBLE (child->widget))
- {
- gtk_widget_size_request (child->widget, &child->widget->requisition);
-
- nbuttons++;
- button_maxw = MAX (button_maxw, child->widget->requisition.width);
- button_maxh = MAX (button_maxh, child->widget->requisition.height);
- }
+ size = requisition.height;
+ }
+
+ if (gtk_tool_item_get_pack_end (item))
+ pack_end_size += size;
+ else
+ pack_front_size += size;
+ }
+
+ if (priv->show_arrow && priv->api_mode == NEW_API)
+ {
+ gtk_widget_size_request (priv->arrow_button, &arrow_requisition);
+
+ if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL)
+ long_req = arrow_requisition.width;
+ else
+ long_req = arrow_requisition.height;
- break;
+ /* There is no point requesting space for the arrow if that would take
+ * up more space than all the items combined
+ */
+ long_req = MIN (long_req, pack_front_size + pack_end_size);
+ }
+ else
+ {
+ arrow_requisition.height = 0;
+ arrow_requisition.width = 0;
+
+ long_req = pack_end_size + pack_front_size;
+ }
+
+ if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ requisition->width = long_req;
+ requisition->height = MAX (max_child_height, arrow_requisition.height);
+ }
+ else
+ {
+ requisition->height = long_req;
+ requisition->width = MAX (max_child_width, arrow_requisition.width);
+ }
+
+ /* Extra spacing */
+ ipadding = get_internal_padding (toolbar);
- case GTK_TOOLBAR_CHILD_WIDGET:
- if (GTK_WIDGET_VISIBLE (child->widget))
- {
- gtk_widget_size_request (child->widget, &child->widget->requisition);
+ requisition->width += 2 * (ipadding + GTK_CONTAINER (toolbar)->border_width);
+ requisition->height += 2 * (ipadding + GTK_CONTAINER (toolbar)->border_width);
- widget_maxw = MAX (widget_maxw, child->widget->requisition.width);
- widget_maxh = MAX (widget_maxh, child->widget->requisition.height);
+ if (get_shadow_type (toolbar) != GTK_SHADOW_NONE)
+ {
+ requisition->width += 2 * widget->style->xthickness;
+ requisition->height += 2 * widget->style->ythickness;
+ }
+
+ toolbar->button_maxw = max_homogeneous_child_width;
+ toolbar->button_maxh = max_homogeneous_child_height;
+}
- if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL)
- requisition->width += child->widget->requisition.width;
- else
- requisition->height += child->widget->requisition.height;
- }
+static void
+fixup_allocation_for_rtl (gint total_size,
+ GtkAllocation *allocation)
+{
+ allocation->x += (total_size - (2 * allocation->x + allocation->width));
+}
- break;
+static void
+fixup_allocation_for_vertical (GtkAllocation *allocation)
+{
+ gint tmp;
+
+ tmp = allocation->x;
+ allocation->x = allocation->y;
+ allocation->y = tmp;
+
+ tmp = allocation->width;
+ allocation->width = allocation->height;
+ allocation->height = tmp;
+}
- default:
- g_assert_not_reached ();
- }
- }
+static gint
+get_item_size (GtkToolbar *toolbar,
+ GtkWidget *child)
+{
+ GtkRequisition requisition;
+ GtkToolItem *item = GTK_TOOL_ITEM (child);
+ gtk_widget_get_child_requisition (child, &requisition);
+
if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL)
{
- requisition->width += nbuttons * button_maxw;
- requisition->height += MAX (button_maxh, widget_maxh);
+ if (toolbar_item_is_homogeneous (toolbar, item))
+ return toolbar->button_maxw;
+ else
+ return requisition.width;
}
else
{
- requisition->width += MAX (button_maxw, widget_maxw);
- requisition->height += nbuttons * button_maxh;
+ if (toolbar_item_is_homogeneous (toolbar, item))
+ return toolbar->button_maxh;
+ else
+ return requisition.height;
}
-
- toolbar->button_maxw = button_maxw;
- toolbar->button_maxh = button_maxh;
}
static void
gtk_toolbar_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
- GtkToolbar *toolbar;
- GList *children;
- GtkToolbarChild *child;
- GtkAllocation alloc;
+ GtkToolbar *toolbar = GTK_TOOLBAR (widget);
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+ GtkAllocation *allocations;
+ GtkAllocation arrow_allocation;
+ gint arrow_size;
+ gint size, pos, short_size;
+ GList *list;
+ gint i;
+ gboolean need_arrow;
+ gint n_expand_items;
gint border_width;
+ gint available_size;
+ gint n_items;
+ gint needed_size;
+ GList *content;
+ GtkRequisition arrow_requisition;
+ gint n_overflowed;
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_TOOLBAR (widget));
- g_return_if_fail (allocation != NULL);
-
- toolbar = GTK_TOOLBAR (widget);
widget->allocation = *allocation;
border_width = GTK_CONTAINER (toolbar)->border_width;
+ if (GTK_WIDGET_REALIZED (widget))
+ {
+ gdk_window_move_resize (priv->event_window,
+ allocation->x + border_width,
+ allocation->y + border_width,
+ allocation->width - border_width * 2,
+ allocation->height - border_width * 2);
+ }
+
+ border_width += get_internal_padding (toolbar);
+
+ gtk_widget_get_child_requisition (GTK_WIDGET (priv->arrow_button),
+ &arrow_requisition);
+
if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL)
- alloc.x = allocation->x + border_width;
- else
- alloc.y = allocation->y + border_width;
-
- for (children = toolbar->children; children; children = children->next)
{
- child = children->data;
+ available_size = size = allocation->width - 2 * border_width;
+ short_size = allocation->height - 2 * border_width;
+ arrow_size = arrow_requisition.width;
- switch (child->type)
+ if (get_shadow_type (toolbar) != GTK_SHADOW_NONE)
{
- case GTK_TOOLBAR_CHILD_SPACE:
- if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL)
- alloc.x += toolbar->space_size;
- else
- alloc.y += toolbar->space_size;
+ available_size -= 2 * widget->style->xthickness;
+ short_size -= 2 * widget->style->ythickness;
+ }
+ }
+ else
+ {
+ available_size = size = allocation->height - 2 * border_width;
+ short_size = allocation->width - 2 * border_width;
+ arrow_size = arrow_requisition.height;
+
+ if (get_shadow_type (toolbar) != GTK_SHADOW_NONE)
+ {
+ available_size -= 2 * widget->style->ythickness;
+ short_size -= 2 * widget->style->xthickness;
+ }
+ }
+
+ n_items = g_list_length (priv->content);
+ allocations = g_new0 (GtkAllocation, n_items);
+
+ needed_size = 0;
+ for (list = priv->content; list != NULL; list = list->next)
+ {
+ ToolbarContent *content = list->data;
+ GtkToolItem *item = content->item;
+
+ if (toolbar_item_visible (toolbar, item))
+ needed_size += get_item_size (toolbar, GTK_WIDGET (item));
+ }
+
+ need_arrow = (needed_size > available_size) && priv->show_arrow && priv->api_mode == NEW_API;
+ if (need_arrow)
+ size = available_size - arrow_size;
+ else
+ size = available_size;
+
+ content = g_list_copy (priv->content);
+
+ n_overflowed = 0;
+
+ /* calculate widths of pack end items */
+ for (list = g_list_last (content), i = 0; list != NULL; list = list->prev, ++i)
+ {
+ ToolbarContent *content = list->data;
+ GtkToolItem *item = content->item;
+ GtkAllocation *allocation = &(allocations[n_items - i - 1]);
+ gint item_size;
+
+ if (!gtk_tool_item_get_pack_end (item) ||
+ !toolbar_item_visible (toolbar, item))
+ continue;
+
+ item_size = get_item_size (toolbar, GTK_WIDGET (item));
+ if (item_size <= size)
+ {
+ size -= item_size;
+ allocation->width = item_size;
+ content->is_overflow = FALSE;
+ }
+ else
+ {
+ while (list)
+ {
+ content = list->data;
+ item = content->item;
+ if (gtk_tool_item_get_pack_end (item))
+ content->is_overflow = TRUE;
+ ++n_overflowed;
+ list = list->prev;
+ }
break;
+ }
+ }
- case GTK_TOOLBAR_CHILD_BUTTON:
- case GTK_TOOLBAR_CHILD_RADIOBUTTON:
- case GTK_TOOLBAR_CHILD_TOGGLEBUTTON:
- if (!GTK_WIDGET_VISIBLE (child->widget))
- break;
+ /* calculate widths of pack front items */
+ for (list = content, i = 0; list != NULL; list = list->next, ++i)
+ {
+ ToolbarContent *content = list->data;
+ GtkToolItem *item = content->item;
+ gint item_size;
- alloc.width = toolbar->button_maxw;
- alloc.height = toolbar->button_maxh;
+ if (gtk_tool_item_get_pack_end (item) || !toolbar_item_visible (toolbar, item))
+ continue;
- if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL)
- alloc.y = allocation->y + (allocation->height - toolbar->button_maxh) / 2;
- else
- alloc.x = allocation->x + (allocation->width - toolbar->button_maxw) / 2;
+ item_size = get_item_size (toolbar, GTK_WIDGET (item));
+ if (item_size <= size)
+ {
+ size -= item_size;
+ allocations[i].width = item_size;
+ content->is_overflow = FALSE;
+ }
+ else
+ {
+ while (list)
+ {
+ content = list->data;
+ item = content->item;
+ if (!gtk_tool_item_get_pack_end (item))
+ content->is_overflow = TRUE;
+ ++n_overflowed;
+ list = list->next;
+ }
+ break;
+ }
+ }
- gtk_widget_size_allocate (child->widget, &alloc);
+ if (need_arrow)
+ {
+ arrow_allocation.width = arrow_size;
+ arrow_allocation.height = short_size;
+ }
+
+ /* expand expandable items */
+
+ /* We don't expand when dnd causes items to overflow. Doing so would result in
+ * weird jumps as items are overflowed and expandable items suddenly get lots of
+ * extra space. On the other hand we can't disable expanding completely, because
+ * that would cause a weird jump when dnd begins
+ */
+ if (!(priv->in_dnd && n_overflowed > priv->n_overflow_items_when_dnd_started))
+ {
+ n_expand_items = 0;
+ for (list = priv->content; list != NULL; list = list->next)
+ {
+ ToolbarContent *content = list->data;
+ GtkToolItem *item = content->item;
+
+ if (toolbar_item_visible (toolbar, item) &&
+ gtk_tool_item_get_expand (item) &&
+ !content->is_overflow &&
+ !GTK_IS_SEPARATOR_TOOL_ITEM (item))
+ {
+ n_expand_items++;
+ }
+ }
+
+ for (list = content, i = 0; list != NULL; list = list->next, ++i)
+ {
+ ToolbarContent *content = list->data;
+ GtkToolItem *item = content->item;
+
+ if (toolbar_item_visible (toolbar, item) && gtk_tool_item_get_expand (item) &&
+ !content->is_overflow &&
+ !GTK_IS_SEPARATOR_TOOL_ITEM (item))
+ {
+ gint extra = size / n_expand_items;
+ if (size % n_expand_items != 0)
+ extra++;
+
+ allocations[i].width += extra;
+ size -= extra;
+ n_expand_items--;
+ }
+ }
+
+ g_assert (n_expand_items == 0);
+ }
+
+ /* position pack front items */
+ pos = border_width;
+ for (list = content, i = 0; list != NULL; list = list->next, ++i)
+ {
+ ToolbarContent *content = list->data;
+ GtkToolItem *item = content->item;
+
+ if (toolbar_item_visible (toolbar, item) &&
+ !content->is_overflow &&
+ !gtk_tool_item_get_pack_end (item))
+ {
+ allocations[i].x = pos;
+ allocations[i].y = border_width;
+ allocations[i].height = short_size;
- if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL)
- alloc.x += toolbar->button_maxw;
+ pos += allocations[i].width;
+ }
+ }
+
+ /* position pack end items */
+ pos = available_size + border_width;
+ for (list = g_list_last (content), i = 0; list != NULL; list = list->prev, ++i)
+ {
+ ToolbarContent *content = list->data;
+ GtkToolItem *item = content->item;
+
+ if (toolbar_item_visible (toolbar, item) &&
+ !content->is_overflow &&
+ gtk_tool_item_get_pack_end (item))
+ {
+ GtkAllocation *allocation = &(allocations[n_items - i - 1]);
+
+ allocation->x = pos - allocation->width;
+ allocation->y = border_width;
+ allocation->height = short_size;
+
+ pos -= allocation->width;
+ }
+ }
+
+ /* position arrow */
+ if (need_arrow)
+ {
+ arrow_allocation.x = pos - arrow_allocation.width;
+ arrow_allocation.y = border_width;
+ }
+
+ /* fix up allocations in the vertical or RTL cases */
+ if (toolbar->orientation == GTK_ORIENTATION_VERTICAL)
+ {
+ for (i = 0; i < n_items; ++i)
+ fixup_allocation_for_vertical (&(allocations[i]));
+
+ if (need_arrow)
+ fixup_allocation_for_vertical (&arrow_allocation);
+ }
+ else if (gtk_widget_get_direction (GTK_WIDGET (toolbar)) == GTK_TEXT_DIR_RTL)
+ {
+ for (i = 0; i < n_items; ++i)
+ fixup_allocation_for_rtl (available_size, &(allocations[i]));
+
+ if (need_arrow)
+ fixup_allocation_for_rtl (available_size, &arrow_allocation);
+ }
+
+ /* translate the items by allocation->(x,y) */
+ for (i = 0; i < n_items; ++i)
+ {
+ allocations[i].x += allocation->x;
+ allocations[i].y += allocation->y;
+
+ if (get_shadow_type (toolbar) != GTK_SHADOW_NONE)
+ {
+ allocations[i].x += widget->style->xthickness;
+ allocations[i].y += widget->style->ythickness;
+ }
+ }
+
+ if (need_arrow)
+ {
+ arrow_allocation.x += allocation->x;
+ arrow_allocation.y += allocation->y;
+
+ if (get_shadow_type (toolbar) != GTK_SHADOW_NONE)
+ {
+ arrow_allocation.x += widget->style->xthickness;
+ arrow_allocation.y += widget->style->ythickness;
+ }
+ }
+
+ /* finally allocate the items */
+ for (list = content, i = 0; list != NULL; list = list->next, i++)
+ {
+ ToolbarContent *content = list->data;
+ GtkToolItem *item = content->item;
+
+ if (toolbar_item_visible (toolbar, item) && !content->is_overflow)
+ {
+ gtk_widget_size_allocate (GTK_WIDGET (item), &(allocations[i]));
+ gtk_widget_set_child_visible (GTK_WIDGET (item), TRUE);
+ }
+ else
+ {
+ gtk_widget_set_child_visible (GTK_WIDGET (item), FALSE);
+ }
+ }
+
+ if (need_arrow)
+ {
+ gtk_widget_size_allocate (GTK_WIDGET (priv->arrow_button),
+ &arrow_allocation);
+ gtk_widget_show (GTK_WIDGET (priv->arrow_button));
+ }
+ else
+ {
+ gtk_widget_hide (GTK_WIDGET (priv->arrow_button));
+ }
+
+ g_free (allocations);
+ g_list_free (content);
+}
+
+static void
+gtk_toolbar_style_set (GtkWidget *widget,
+ GtkStyle *prev_style)
+{
+ if (GTK_WIDGET_REALIZED (widget))
+ gtk_style_set_background (widget->style, widget->window, widget->state);
+
+ if (prev_style)
+ gtk_toolbar_update_button_relief (GTK_TOOLBAR (widget));
+}
+
+static void
+gtk_toolbar_direction_changed (GtkWidget *widget,
+ GtkTextDirection previous_dir)
+{
+ GtkToolbar *toolbar = GTK_TOOLBAR (widget);
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
+ if (toolbar->orientation == GTK_ORIENTATION_VERTICAL)
+ {
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
+ gtk_arrow_set (GTK_ARROW (priv->arrow), GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
+ else
+ gtk_arrow_set (GTK_ARROW (priv->arrow), GTK_ARROW_LEFT, GTK_SHADOW_NONE);
+ }
+
+ GTK_WIDGET_CLASS (parent_class)->direction_changed (widget, previous_dir);
+}
+
+static GList *
+gtk_toolbar_list_children_in_focus_order (GtkToolbar *toolbar,
+ GtkDirectionType dir)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+ GList *result = NULL;
+ GList *list;
+ gboolean rtl;
+
+ /* generate list of children in reverse logical order */
+
+ for (list = priv->content; list != NULL; list = list->next)
+ {
+ ToolbarContent *content = list->data;
+ GtkToolItem *item = content->item;
+ if (!gtk_tool_item_get_pack_end (item))
+ result = g_list_prepend (result, item);
+ }
+
+ result = g_list_prepend (result, priv->arrow_button);
+
+ for (list = priv->content; list != NULL; list = list->next)
+ {
+ ToolbarContent *content = list->data;
+ GtkToolItem *item = content->item;
+
+ if (gtk_tool_item_get_pack_end (item))
+ result = g_list_prepend (result, item);
+ }
+
+ rtl = (gtk_widget_get_direction (GTK_WIDGET (toolbar)) == GTK_TEXT_DIR_RTL);
+
+ /* move in logical order when
+ *
+ * - dir is TAB_FORWARD
+ *
+ * - in RTL mode and moving left or up
+ *
+ * - in LTR mode and moving right or down
+ */
+ if (dir == GTK_DIR_TAB_FORWARD ||
+ (rtl && (dir == GTK_DIR_UP || dir == GTK_DIR_LEFT)) ||
+ (!rtl && (dir == GTK_DIR_DOWN || dir == GTK_DIR_RIGHT)))
+ {
+ result = g_list_reverse (result);
+ }
+
+ return result;
+}
+
+static gboolean
+gtk_toolbar_focus_home_or_end (GtkToolbar *toolbar,
+ gboolean focus_home)
+{
+ GList *children, *list;
+ GtkDirectionType dir = focus_home? GTK_DIR_RIGHT : GTK_DIR_LEFT;
+
+ children = gtk_toolbar_list_children_in_focus_order (toolbar, dir);
+
+ if (gtk_widget_get_direction (GTK_WIDGET (toolbar)) == GTK_TEXT_DIR_RTL)
+ {
+ children = g_list_reverse (children);
+
+ dir = (dir == GTK_DIR_RIGHT)? GTK_DIR_LEFT : GTK_DIR_RIGHT;
+ }
+
+ for (list = children; list != NULL; list = list->next)
+ {
+ GtkWidget *child = list->data;
+
+ if (GTK_CONTAINER (toolbar)->focus_child == child)
+ break;
+
+ if (GTK_WIDGET_MAPPED (child) && gtk_widget_child_focus (child, dir))
+ break;
+ }
+
+ g_list_free (children);
+
+ return TRUE;
+}
+
+/* Keybinding handler. This function is called when the user presses
+ * Ctrl TAB or an arrow key.
+ */
+static gboolean
+gtk_toolbar_move_focus (GtkToolbar *toolbar,
+ GtkDirectionType dir)
+{
+ GList *list;
+ gboolean try_focus = FALSE;
+ GList *children;
+ GtkContainer *container = GTK_CONTAINER (toolbar);
+
+ if (container->focus_child &&
+ gtk_widget_child_focus (container->focus_child, dir))
+ {
+ return TRUE;
+ }
+
+ children = gtk_toolbar_list_children_in_focus_order (toolbar, dir);
+
+ for (list = children; list != NULL; list = list->next)
+ {
+ GtkWidget *child = list->data;
+
+ if (try_focus && GTK_WIDGET_MAPPED (child) && gtk_widget_child_focus (child, dir))
+ break;
+
+ if (child == GTK_CONTAINER (toolbar)->focus_child)
+ try_focus = TRUE;
+ }
+
+ g_list_free (children);
+
+ return FALSE;
+}
+
+/* The focus handler for the toolbar. It called when the user presses
+ * TAB or otherwise tries to focus the toolbar.
+ */
+static gboolean
+gtk_toolbar_focus (GtkWidget *widget,
+ GtkDirectionType dir)
+{
+ GtkToolbar *toolbar = GTK_TOOLBAR (widget);
+ GList *children, *list;
+
+ /* if focus is already somewhere inside the toolbar then return FALSE.
+ * The only way focus can stay inside the toolbar is when the user presses
+ * arrow keys or Ctrl TAB (both of which are handled by the
+ * gtk_toolbar_move_focus() keybinding function.
+ */
+ if (GTK_CONTAINER (widget)->focus_child)
+ return FALSE;
+
+ children = gtk_toolbar_list_children_in_focus_order (toolbar, dir);
+
+ for (list = children; list != NULL; list = list->next)
+ {
+ GtkWidget *child = list->data;
+
+ if (GTK_WIDGET_MAPPED (child) && gtk_widget_child_focus (child, dir))
+ return TRUE;
+ }
+
+ g_list_free (children);
+
+ return FALSE;
+}
+
+static void
+style_change_notify (GtkToolbar *toolbar)
+{
+ if (!toolbar->style_set)
+ {
+ /* pretend it was set, then unset, thus reverting to new default */
+ toolbar->style_set = TRUE;
+ gtk_toolbar_unset_style (toolbar);
+ }
+}
+
+static void
+icon_size_change_notify (GtkToolbar *toolbar)
+{
+ if (!toolbar->icon_size_set)
+ {
+ /* pretend it was set, then unset, thus reverting to new default */
+ toolbar->icon_size_set = TRUE;
+ gtk_toolbar_unset_icon_size (toolbar);
+ }
+}
+
+static GtkSettings *
+toolbar_get_settings (GtkToolbar *toolbar)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+ return priv->settings;
+}
+
+static void
+gtk_toolbar_screen_changed (GtkWidget *widget,
+ GdkScreen *previous_screen)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (widget);
+ GtkToolbar *toolbar = GTK_TOOLBAR (widget);
+ GtkSettings *old_settings = toolbar_get_settings (toolbar);
+ GtkSettings *settings;
+
+ if (gtk_widget_has_screen (GTK_WIDGET (toolbar)))
+ settings = gtk_widget_get_settings (GTK_WIDGET (toolbar));
+ else
+ settings = NULL;
+
+ if (settings == old_settings)
+ return;
+
+ if (old_settings)
+ {
+ g_signal_handler_disconnect (old_settings, toolbar->style_set_connection);
+ g_signal_handler_disconnect (old_settings, toolbar->icon_size_connection);
+
+ g_object_unref (old_settings);
+ }
+
+ if (settings)
+ {
+ toolbar->style_set_connection =
+ g_signal_connect_swapped (settings,
+ "notify::gtk-toolbar-style",
+ G_CALLBACK (style_change_notify),
+ toolbar);
+ toolbar->icon_size_connection =
+ g_signal_connect_swapped (settings,
+ "notify::gtk-toolbar-icon-size",
+ G_CALLBACK (icon_size_change_notify),
+ toolbar);
+
+ g_object_ref (settings);
+ priv->settings = settings;
+ }
+ else
+ priv->settings = NULL;
+
+ style_change_notify (toolbar);
+ icon_size_change_notify (toolbar);
+}
+
+static int
+find_drop_index (GtkToolbar *toolbar,
+ gint x,
+ gint y)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+ GList *interesting_content;
+ GList *list;
+ GtkOrientation orientation;
+ GtkTextDirection direction;
+ gint best_distance = G_MAXINT;
+ gint distance;
+ gint cursor;
+ gint pos;
+ ToolbarContent *best_content;
+
+ /* list items we care about wrt. drag and drop */
+ interesting_content = NULL;
+ for (list = priv->content; list != NULL; list = list->next)
+ {
+ ToolbarContent *content = list->data;
+ GtkToolItem *item = content->item;
+
+ if (!gtk_tool_item_get_pack_end (item) &&
+ toolbar_item_visible (toolbar, item) &&
+ !content->is_overflow)
+ {
+ interesting_content = g_list_prepend (interesting_content, content);
+ }
+ }
+ interesting_content = g_list_reverse (interesting_content);
+
+ if (!interesting_content)
+ return 0;
+
+ orientation = toolbar->orientation;
+ direction = gtk_widget_get_direction (GTK_WIDGET (toolbar));
+
+ /* distance to first interesting item */
+ best_content = interesting_content->data;
+
+ if (orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ cursor = x;
+
+ if (direction == GTK_TEXT_DIR_LTR)
+ pos = GTK_WIDGET (best_content->item)->allocation.x;
+ else
+ pos = GTK_WIDGET (best_content->item)->allocation.x +
+ GTK_WIDGET (best_content->item)->allocation.width;
+ }
+ else
+ {
+ cursor = y;
+ pos = GTK_WIDGET (best_content->item)->allocation.y;
+ }
+
+ best_content = NULL;
+ best_distance = ABS (pos - cursor);
+
+ /* distance to far end of each item */
+ for (list = interesting_content; list != NULL; list = list->next)
+ {
+ ToolbarContent *content = list->data;
+ GtkWidget *widget = GTK_WIDGET (content->item);
+
+ if (orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ if (direction == GTK_TEXT_DIR_LTR)
+ pos = widget->allocation.x + widget->allocation.width;
else
- alloc.y += toolbar->button_maxh;
+ pos = widget->allocation.x;
+ }
+ else
+ {
+ pos = widget->allocation.y + widget->allocation.height;
+ }
+
+ distance = ABS (pos - cursor);
+
+ if (distance < best_distance)
+ {
+ best_distance = distance;
+ best_content = content;
+ }
+ }
- break;
+ g_list_free (interesting_content);
- case GTK_TOOLBAR_CHILD_WIDGET:
- if (!GTK_WIDGET_VISIBLE (child->widget))
- break;
+ if (!best_content)
+ return 0;
+ else
+ return g_list_index (priv->content, best_content) + 1;
+}
+
+static void
+get_size (GtkToolItem *tool_item, gint *width, gint *height)
+{
+ if (!GTK_WIDGET_VISIBLE (tool_item))
+ {
+ *width = 0;
+ *height = 0;
+ }
+ else
+ {
+ GtkRequisition req;
+
+ gtk_widget_get_child_requisition (GTK_WIDGET (tool_item), &req);
+ *width = req.width;
+ *height = req.height;
+ }
+}
+
+#define UPDATE_TIME (0.10)
+
+static gboolean
+update_dnd_animation (gpointer data)
+{
+ GtkToolbar *toolbar = data;
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+ GList *list;
+ gboolean cont;
+ gdouble elapsed;
+ double error;
+
+ GDK_THREADS_ENTER();
+
+ if (priv->need_sync)
+ gdk_flush ();
+
+ elapsed = g_timer_elapsed (priv->timer, NULL);
+
+ cont = FALSE;
+
+ list = priv->content;
+ error = 0.0;
+ while (list)
+ {
+ ToolbarContent *content = list->data;
+ GtkWidget *widget = GTK_WIDGET (content->item);
+ GList *next = list->next;
+ gdouble exact_value;
+ gint start_value, goal_value;
+ gint new_value, prev_value;
+
+ if (content->is_placeholder)
+ {
+ gint prev_width, prev_height;
+
+ get_size (GTK_TOOL_ITEM (widget), &prev_width, &prev_height);
+ if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ start_value = content->start_width;
+ goal_value = content->goal_width;
+ prev_value = prev_width;
+ }
+ else
+ {
+ start_value = content->start_height;
+ goal_value = content->goal_height;
+ prev_value = prev_height;
+ }
+
+ if (elapsed <= UPDATE_TIME)
+ {
+ exact_value = start_value + (elapsed / UPDATE_TIME) * (goal_value - start_value);
+ new_value = (int) (exact_value + error + 0.5);
+
+ error += (exact_value - new_value);
+
+ cont = TRUE;
+ }
+ else
+ {
+ exact_value = (double)goal_value;
+ new_value = goal_value;
+ }
+
+ if (new_value == 0)
+ gtk_widget_hide (widget);
+ else
+ gtk_widget_show (widget);
+
+ /* We need to check for "elapsed > UPDATE_TIME" so that the widget
+ * doesn't disappear before time. We need its contribution to
+ * the error value, even if its pixel width is 0.
+ */
+ if (goal_value == 0 && elapsed > UPDATE_TIME)
+ {
+ gtk_toolbar_remove_tool_item (toolbar, GTK_TOOL_ITEM (widget));
+ }
+ else if (new_value != prev_value)
+ {
+ if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL)
+ gtk_widget_set_size_request (widget, new_value, 0);
+ else
+ gtk_widget_set_size_request (widget, 0, new_value);
+
+ priv->need_sync = TRUE;
+ cont = TRUE;
+ }
+ }
+
+ list = next;
+ }
+
+ gtk_widget_queue_resize_no_redraw (GTK_WIDGET (toolbar));
+
+ GDK_THREADS_LEAVE();
+
+ if (!cont)
+ {
+ priv->idle_id = 0;
+ if (priv->leaving_dnd)
+ {
+ priv->in_dnd = FALSE;
+ priv->leaving_dnd = FALSE;
+ priv->n_overflow_items_when_dnd_started = 0;
+ }
+
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+static void
+ensure_idle_handler (GtkToolbar *toolbar)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
+ if (!priv->idle_id)
+ priv->idle_id = g_idle_add (update_dnd_animation, toolbar);
+}
+
+static void
+reset_all_placeholders (GtkToolbar *toolbar)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+ GList *list;
+
+ for (list = priv->content; list != NULL; list = list->next)
+ {
+ ToolbarContent *content = list->data;
+ if (content->is_placeholder)
+ {
+ get_size (content->item,
+ &(content->start_width), &(content->start_height));
+ content->goal_width = 0;
+ content->goal_height = 0;
+ }
+ }
+
+ g_timer_reset (priv->timer);
+}
+
+void
+gtk_toolbar_highlight_drop_location (GtkToolbar *toolbar,
+ gint x,
+ gint y,
+ gint width,
+ gint height)
+{
+ gint index;
+ ToolbarContent *content;
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+ gint start_width, start_height;
+ GList *list;
+
+ if (!priv->in_dnd)
+ {
+ priv->n_overflow_items_when_dnd_started = 0;
+ for (list = priv->content; list != NULL; list = list->next)
+ {
+ content = list->data;
+ if (content->is_overflow)
+ priv->n_overflow_items_when_dnd_started++;
+ }
+ }
+
+ priv->in_dnd = TRUE;
+ priv->leaving_dnd = FALSE;
+
+ index = find_drop_index (toolbar, x, y);
+
+ content = g_list_nth_data (priv->content, index);
+
+ if (index > 0)
+ {
+ ToolbarContent *prev_content;
+
+ prev_content = g_list_nth_data (priv->content, index - 1);
+
+ if (prev_content && prev_content->is_placeholder)
+ content = prev_content;
+ }
+
+ if (!content || !content->is_placeholder)
+ {
+ GtkWidget *placeholder = GTK_WIDGET (gtk_separator_tool_item_new ());
+ gtk_widget_set_size_request (placeholder, 0, 0);
+ gtk_toolbar_insert_tool_item (toolbar, GTK_TOOL_ITEM (placeholder),
+ index, TRUE);
+ content = g_list_nth_data (priv->content, index);
+ g_assert (content->is_placeholder);
+ start_width = start_height = 0;
+ }
+ else
+ {
+ get_size (content->item, &start_width, &start_height);
+ }
+
+ g_assert (content);
+ g_assert (content->is_placeholder);
+
+ if (content->start_width != start_width ||
+ content->start_height != start_height ||
+ content->goal_width != width ||
+ content->goal_height != height)
+ {
+ reset_all_placeholders (toolbar);
+
+ content->start_width = start_width;
+ content->goal_width = width;
+ content->start_height = start_height;
+ content->goal_height = height;
+
+ ensure_idle_handler (toolbar);
+ }
+}
+
+void
+gtk_toolbar_unhighlight_drop_location (GtkToolbar *toolbar)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
+ priv->leaving_dnd = TRUE;
+ reset_all_placeholders (toolbar);
+ ensure_idle_handler (toolbar);
+}
+
+static void
+gtk_toolbar_get_child_property (GtkContainer *container,
+ GtkWidget *child,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GtkToolItem *item = GTK_TOOL_ITEM (child);
+
+ switch (property_id)
+ {
+ case CHILD_PROP_PACK_END:
+ g_value_set_boolean (value, gtk_tool_item_get_pack_end (item));
+ break;
+
+ case CHILD_PROP_HOMOGENEOUS:
+ g_value_set_boolean (value, gtk_tool_item_get_homogeneous (item));
+ break;
+
+ case CHILD_PROP_EXPAND:
+ g_value_set_boolean (value, gtk_tool_item_get_expand (item));
+ break;
+
+ default:
+ GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
+ break;
+ }
+}
+
+static void
+gtk_toolbar_set_child_property (GtkContainer *container,
+ GtkWidget *child,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ switch (property_id)
+ {
+ case CHILD_PROP_PACK_END:
+ gtk_tool_item_set_pack_end (GTK_TOOL_ITEM (child), g_value_get_boolean (value));
+ break;
+
+ case CHILD_PROP_HOMOGENEOUS:
+ gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (child), g_value_get_boolean (value));
+ break;
+
+ case CHILD_PROP_EXPAND:
+ gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (child), g_value_get_boolean (value));
+ break;
+
+ default:
+ GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
+ break;
+ }
+}
+
+static void
+gtk_toolbar_add (GtkContainer *container,
+ GtkWidget *widget)
+{
+ GtkToolbar *toolbar;
+
+ g_return_if_fail (GTK_IS_TOOLBAR (container));
+ g_return_if_fail (widget != NULL);
+
+ toolbar = GTK_TOOLBAR (container);
+
+ if (GTK_IS_TOOL_ITEM (widget))
+ gtk_toolbar_insert (toolbar, GTK_TOOL_ITEM (widget), 0);
+ else
+ gtk_toolbar_append_widget (toolbar, widget, NULL, NULL);
+}
+
+static void
+gtk_toolbar_remove (GtkContainer *container,
+ GtkWidget *widget)
+{
+ GtkToolbar *toolbar;
+ GtkToolItem *item = NULL;
+
+ g_return_if_fail (GTK_IS_TOOLBAR (container));
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+
+ toolbar = GTK_TOOLBAR (container);
+
+ if (GTK_IS_TOOL_ITEM (widget))
+ {
+ item = GTK_TOOL_ITEM (widget);
+ }
+ else
+ {
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+ GList *list;
+
+ for (list = priv->content; list != NULL; list = list->next)
+ {
+ ToolbarContent *content = list->data;
+
+ if (GTK_BIN (content->item)->child == widget)
+ {
+ item = content->item;
+ break;
+ }
+ }
+ }
+
+ g_return_if_fail (item != NULL);
+
+ gtk_toolbar_remove_tool_item (GTK_TOOLBAR (container), item);
+}
+
+static void
+gtk_toolbar_forall (GtkContainer *container,
+ gboolean include_internals,
+ GtkCallback callback,
+ gpointer callback_data)
+{
+ GtkToolbar *toolbar = GTK_TOOLBAR (container);
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+ GList *list;
+
+ g_return_if_fail (callback != NULL);
+
+ list = priv->content;
+ while (list)
+ {
+ ToolbarContent *content = list->data;
+ GList *next = list->next;
+
+ (*callback) (GTK_WIDGET (content->item), callback_data);
+
+ list = next;
+ }
+
+ if (include_internals)
+ (* callback) (priv->arrow_button, callback_data);
+}
+
+static GType
+gtk_toolbar_child_type (GtkContainer *container)
+{
+ return GTK_TYPE_TOOL_ITEM;
+}
+
+static void
+gtk_toolbar_reconfigured (GtkToolbar *toolbar)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+ GList *list;
+
+ list = priv->content;
+ while (list)
+ {
+ ToolbarContent *content = list->data;
+ GList *next = list->next;
+
+ _gtk_tool_item_toolbar_reconfigured (content->item);
+
+ list = next;
+ }
+}
+
+static void
+gtk_toolbar_real_orientation_changed (GtkToolbar *toolbar,
+ GtkOrientation orientation)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+ if (toolbar->orientation != orientation)
+ {
+ toolbar->orientation = orientation;
+
+ if (orientation == GTK_ORIENTATION_HORIZONTAL)
+ gtk_arrow_set (GTK_ARROW (priv->arrow), GTK_ARROW_DOWN, GTK_SHADOW_NONE);
+ else if (gtk_widget_get_direction (GTK_WIDGET (toolbar)) == GTK_TEXT_DIR_LTR)
+ gtk_arrow_set (GTK_ARROW (priv->arrow), GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
+ else
+ gtk_arrow_set (GTK_ARROW (priv->arrow), GTK_ARROW_LEFT, GTK_SHADOW_NONE);
+
+ gtk_toolbar_reconfigured (toolbar);
+
+ gtk_widget_queue_resize (GTK_WIDGET (toolbar));
+ g_object_notify (G_OBJECT (toolbar), "orientation");
+ }
+}
+
+static void
+gtk_toolbar_real_style_changed (GtkToolbar *toolbar,
+ GtkToolbarStyle style)
+{
+ if (toolbar->style != style)
+ {
+ toolbar->style = style;
+
+ gtk_toolbar_reconfigured (toolbar);
+
+ gtk_widget_queue_resize (GTK_WIDGET (toolbar));
+ g_object_notify (G_OBJECT (toolbar), "toolbar_style");
+ }
+}
+
+static void
+menu_position_func (GtkMenu *menu,
+ gint *x,
+ gint *y,
+ gboolean *push_in,
+ gpointer user_data)
+{
+ GtkToolbar *toolbar = GTK_TOOLBAR (user_data);
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+ GtkRequisition req;
+ GtkRequisition menu_req;
+
+ gdk_window_get_origin (GTK_BUTTON (priv->arrow_button)->event_window, x, y);
+ gtk_widget_size_request (priv->arrow_button, &req);
+ gtk_widget_size_request (GTK_WIDGET (menu), &menu_req);
+
+ if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ *y += priv->arrow_button->allocation.height;
+ if (gtk_widget_get_direction (GTK_WIDGET (toolbar)) == GTK_TEXT_DIR_LTR)
+ *x += priv->arrow_button->allocation.width - req.width;
+ else
+ *x += req.width - menu_req.width;
+ }
+ else
+ {
+ if (gtk_widget_get_direction (GTK_WIDGET (toolbar)) == GTK_TEXT_DIR_LTR)
+ *x += priv->arrow_button->allocation.width;
+ else
+ *x -= menu_req.width;
+ *y += priv->arrow_button->allocation.height - req.height;
+ }
+
+ *push_in = TRUE;
+}
+
+static void
+menu_deactivated (GtkWidget *menu,
+ GtkToolbar *toolbar)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->arrow_button), FALSE);
+}
+
+static void
+remove_item (GtkWidget *menu_item,
+ gpointer data)
+{
+ gtk_container_remove (GTK_CONTAINER (menu_item->parent), menu_item);
+}
+
+static void
+show_menu (GtkToolbar *toolbar,
+ GdkEventButton *event)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+ GList *list;
+
+ if (priv->menu)
+ {
+ gtk_container_foreach (GTK_CONTAINER (priv->menu), remove_item, NULL);
+ gtk_widget_destroy (GTK_WIDGET (priv->menu));
+ }
+
+ priv->menu = GTK_MENU (gtk_menu_new ());
+ g_signal_connect (priv->menu, "deactivate", G_CALLBACK (menu_deactivated), toolbar);
+
+ for (list = priv->content; list != NULL; list = list->next)
+ {
+ ToolbarContent *content = list->data;
+ GtkToolItem *item = content->item;
+
+ if (toolbar_item_visible (toolbar, item) && content->is_overflow)
+ {
+ GtkWidget *menu_item = gtk_tool_item_retrieve_proxy_menu_item (item);
+
+ if (menu_item)
+ {
+ g_assert (GTK_IS_MENU_ITEM (menu_item));
+ gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), menu_item);
+ }
+ }
+ }
+
+ gtk_widget_show_all (GTK_WIDGET (priv->menu));
+
+ gtk_menu_popup (GTK_MENU (priv->menu), NULL, NULL,
+ menu_position_func, toolbar,
+ event? event->button : 0, event? event->time : gtk_get_current_event_time());
+}
+
+static void
+gtk_toolbar_arrow_button_clicked (GtkWidget *button,
+ GtkToolbar *toolbar)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->arrow_button)) &&
+ (!priv->menu || !GTK_WIDGET_VISIBLE (GTK_WIDGET (priv->menu))))
+ {
+ /* We only get here when the button is clicked with the keybaord,
+ * because mouse button presses result in the menu being shown so
+ * that priv->menu would be non-NULL and visible.
+ */
+ show_menu (toolbar, NULL);
+ gtk_menu_shell_select_first (GTK_MENU_SHELL (priv->menu), FALSE);
+ }
+}
+
+static gboolean
+gtk_toolbar_arrow_button_press (GtkWidget *button,
+ GdkEventButton *event,
+ GtkToolbar *toolbar)
+{
+ show_menu (toolbar, event);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
+
+ return TRUE;
+}
+
+static gboolean
+gtk_toolbar_button_press (GtkWidget *toolbar,
+ GdkEventButton *event)
+{
+ if (event->button == 3)
+ {
+ gboolean return_value;
+
+ g_signal_emit (toolbar, toolbar_signals[POPUP_CONTEXT_MENU], 0,
+ (int)event->x_root, (int)event->y_root, event->button,
+ &return_value);
+
+ return return_value;
+ }
+
+ return FALSE;
+}
+
+static gboolean
+gtk_toolbar_popup_menu (GtkWidget *toolbar)
+{
+ gboolean return_value;
+ /* This function is the handler for the "popup menu" keybinding,
+ * ie., it is called when the user presses Shift F10
+ */
+ g_signal_emit (toolbar, toolbar_signals[POPUP_CONTEXT_MENU], 0,
+ -1, -1, -1, &return_value);
+
+ return return_value;
+}
+
+static void
+gtk_toolbar_update_button_relief (GtkToolbar *toolbar)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
+ gtk_toolbar_reconfigured (toolbar);
+
+ gtk_button_set_relief (GTK_BUTTON (priv->arrow_button), get_button_relief (toolbar));
+}
+
+static GtkReliefStyle
+get_button_relief (GtkToolbar *toolbar)
+{
+ GtkReliefStyle button_relief = GTK_RELIEF_NORMAL;
+
+ gtk_widget_ensure_style (GTK_WIDGET (toolbar));
+
+ gtk_widget_style_get (GTK_WIDGET (toolbar),
+ "button_relief", &button_relief,
+ NULL);
+
+ return button_relief;
+}
+
+static gint
+get_internal_padding (GtkToolbar *toolbar)
+{
+ gint ipadding = 0;
+
+ gtk_widget_style_get (GTK_WIDGET (toolbar),
+ "internal_padding", &ipadding,
+ NULL);
+
+ return ipadding;
+}
+
+static GtkShadowType
+get_shadow_type (GtkToolbar *toolbar)
+{
+ GtkShadowType shadow_type;
+
+ gtk_widget_style_get (GTK_WIDGET (toolbar),
+ "shadow_type", &shadow_type,
+ NULL);
+
+ return shadow_type;
+}
+
+static gboolean
+gtk_toolbar_check_old_api (GtkToolbar *toolbar)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
+ if (priv->api_mode == NEW_API)
+ {
+ g_warning ("mixing deprecated and non-deprecated GtkToolbar API is not allowed");
+ return FALSE;
+ }
+
+ priv->api_mode = OLD_API;
+ return TRUE;
+}
+
+static gboolean
+gtk_toolbar_check_new_api (GtkToolbar *toolbar)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
+ if (priv->api_mode == OLD_API)
+ {
+ g_warning ("mixing deprecated and non-deprecated GtkToolbar API is not allowed");
+ return FALSE;
+ }
+
+ priv->api_mode = NEW_API;
+ return TRUE;
+}
+
+static gint
+physical_to_logical (GtkToolbar *toolbar, gint physical)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+ GList *list;
+ int logical;
+
+ if (physical < 0)
+ return -1;
+
+ logical = 0;
+ for (list = priv->content; list; list = list->next)
+ {
+ ToolbarContent *content = list->data;
+
+ if (!physical)
+ return logical;
+
+ if (!content->is_placeholder)
+ logical++;
+ physical--;
+ }
+ return -1;
+}
+
+static gint
+logical_to_physical (GtkToolbar *toolbar, gint logical)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+ GList *list;
+ gint physical;
+
+ if (logical < 0)
+ return -1;
+
+ physical = 0;
+ for (list = priv->content; list; list = list->next)
+ {
+ ToolbarContent *content = list->data;
+
+ if (!logical)
+ return physical;
+
+ if (!content->is_placeholder)
+ logical--;
+ physical++;
+ }
+ return -1;
+}
+
+static void
+gtk_toolbar_insert_tool_item (GtkToolbar *toolbar,
+ GtkToolItem *item,
+ gint pos,
+ gboolean is_placeholder)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+ ToolbarContent *content = g_new0 (ToolbarContent, 1);
+
+ content->is_overflow = FALSE;
+ content->is_placeholder = is_placeholder;
+ content->item = item;
+ toolbar->num_children++;
+
+ priv->content = g_list_insert (priv->content, content, pos);
+
+ gtk_widget_set_parent (GTK_WIDGET (item), GTK_WIDGET (toolbar));
+}
+
+static void
+gtk_toolbar_remove_tool_item (GtkToolbar *toolbar,
+ GtkToolItem *item)
+{
+ GtkToolbarPrivate *priv;
+ GList *tmp;
+ gint nth_child;
+ ToolbarContent *content = NULL;
+
+ g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
+ g_return_if_fail (GTK_IS_TOOL_ITEM (item));
+
+ priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
+ nth_child = 0;
+
+ for (tmp = priv->content; tmp != NULL; tmp = tmp->next)
+ {
+ content = tmp->data;
+ if (content->item == item)
+ break;
+
+ nth_child++;
+ }
+
+ g_return_if_fail (content != NULL);
+
+ g_free (content);
+
+ priv->content = g_list_remove (priv->content, content);
+
+ gtk_widget_unparent (GTK_WIDGET (item));
+
+ if (priv->api_mode == OLD_API)
+ {
+ GtkToolbarChild *toolbar_child;
+
+ toolbar_child = g_list_nth_data (toolbar->children, nth_child);
+ toolbar->children = g_list_remove (toolbar->children, toolbar_child);
+
+ g_free (toolbar_child);
+ }
+
+ gtk_widget_queue_resize (GTK_WIDGET (toolbar));
+}
+
+/**
+ * gtk_toolbar_new:
+ *
+ * Creates a new toolbar.
+
+ * Return Value: the newly-created toolbar.
+ **/
+GtkWidget *
+gtk_toolbar_new (void)
+{
+ GtkToolbar *toolbar;
+
+ toolbar = g_object_new (GTK_TYPE_TOOLBAR, NULL);
+
+ return GTK_WIDGET (toolbar);
+}
+
+/**
+ * gtk_toolbar_insert:
+ * @toolbar: a #GtkToolbar
+ * @item: a #GtkToolItem
+ * @pos: the position of the new item
+ *
+ * Insert a #GtkToolItem into the toolbar at position @pos. If @pos is
+ * 0 the item is prepended to the start of the toolbar. If @pos is
+ * negative, the item is appended to the end of the toolbar.
+ *
+ * Since: 2.4
+ **/
+void
+gtk_toolbar_insert (GtkToolbar *toolbar,
+ GtkToolItem *item,
+ gint pos)
+{
+ g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
+ g_return_if_fail (GTK_IS_TOOL_ITEM (item));
+
+ if (!gtk_toolbar_check_new_api (toolbar))
+ return;
+
+ gtk_toolbar_insert_tool_item (toolbar, item,
+ logical_to_physical (toolbar, pos), FALSE);
+}
+
+/**
+ * gtk_toolbar_get_item_index:
+ * @toolbar: a #GtkToolbar
+ * @item: a #GtkToolItem that is a child of @toolbar
+ *
+ * Returns the position of @item on the toolbar, starting from 0.
+ * It is an error if @item is not a child of the toolbar.
+ *
+ * Return value: the position of item on the toolbar.
+ *
+ * Since: 2.4
+ **/
+gint
+gtk_toolbar_get_item_index (GtkToolbar *toolbar,
+ GtkToolItem *item)
+{
+ GtkToolbarPrivate *priv;
+ GList *list;
+ int n;
+
+ g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), -1);
+ g_return_val_if_fail (GTK_IS_TOOL_ITEM (item), -1);
+ g_return_val_if_fail (GTK_WIDGET (item)->parent == GTK_WIDGET (toolbar), -1);
+
+ if (!gtk_toolbar_check_new_api (toolbar))
+ return -1;
+
+ priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
+ n = 0;
+ for (list = priv->content; list != NULL; list = list->next)
+ {
+ ToolbarContent *content = list->data;
+
+ if (content->item == item)
+ break;
+
+ ++n;
+ }
+
+ return physical_to_logical (toolbar, n);
+}
+
+/**
+ * gtk_toolbar_set_orientation:
+ * @toolbar: a #GtkToolbar.
+ * @orientation: a new #GtkOrientation.
+ *
+ * Sets whether a toolbar should appear horizontally or vertically.
+ **/
+void
+gtk_toolbar_set_orientation (GtkToolbar *toolbar,
+ GtkOrientation orientation)
+{
+ g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
+
+ g_signal_emit (toolbar, toolbar_signals[ORIENTATION_CHANGED], 0, orientation);
+}
+
+/**
+ * gtk_toolbar_get_orientation:
+ * @toolbar: a #GtkToolbar
+ *
+ * Retrieves the current orientation of the toolbar. See
+ * gtk_toolbar_set_orientation().
+ *
+ * Return value: the orientation
+ **/
+GtkOrientation
+gtk_toolbar_get_orientation (GtkToolbar *toolbar)
+{
+ g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), GTK_ORIENTATION_HORIZONTAL);
+
+ return toolbar->orientation;
+}
+
+/**
+ * gtk_toolbar_set_style:
+ * @toolbar: a #GtkToolbar.
+ * @style: the new style for @toolbar.
+ *
+ * Alters the view of @toolbar to display either icons only, text only, or both.
+ **/
+void
+gtk_toolbar_set_style (GtkToolbar *toolbar,
+ GtkToolbarStyle style)
+{
+ g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
+
+ toolbar->style_set = TRUE;
+ g_signal_emit (toolbar, toolbar_signals[STYLE_CHANGED], 0, style);
+
+
+}
+
+/**
+ * gtk_toolbar_get_style:
+ * @toolbar: a #GtkToolbar
+ *
+ * Retrieves whether the toolbar has text, icons, or both . See
+ * gtk_toolbar_set_style().
+
+ * Return value: the current style of @toolbar
+ **/
+GtkToolbarStyle
+gtk_toolbar_get_style (GtkToolbar *toolbar)
+{
+ g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), DEFAULT_TOOLBAR_STYLE);
+
+ return toolbar->style;
+}
+
+/**
+ * gtk_toolbar_unset_style:
+ * @toolbar: a #GtkToolbar
+ *
+ * Unsets a toolbar style set with gtk_toolbar_set_style(), so that
+ * user preferences will be used to determine the toolbar style.
+ **/
+void
+gtk_toolbar_unset_style (GtkToolbar *toolbar)
+{
+ GtkToolbarStyle style;
+
+ g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
+
+ if (toolbar->style_set)
+ {
+ GtkSettings *settings = toolbar_get_settings (toolbar);
+
+ if (settings)
+ g_object_get (settings,
+ "gtk-toolbar-style", &style,
+ NULL);
+ else
+ style = DEFAULT_TOOLBAR_STYLE;
+
+ if (style != toolbar->style)
+ g_signal_emit (toolbar, toolbar_signals[STYLE_CHANGED], 0, style);
+
+ toolbar->style_set = FALSE;
+ }
+}
+
+/**
+ * gtk_toolbar_set_tooltips:
+ * @toolbar: a #GtkToolbar.
+ * @enable: set to %FALSE to disable the tooltips, or %TRUE to enable them.
+ *
+ * Sets if the tooltips of a toolbar should be active or not.
+ **/
+void
+gtk_toolbar_set_tooltips (GtkToolbar *toolbar,
+ gboolean enable)
+{
+ g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
+
+ if (enable)
+ gtk_tooltips_enable (toolbar->tooltips);
+ else
+ gtk_tooltips_disable (toolbar->tooltips);
+}
+
+/**
+ * gtk_toolbar_get_tooltips:
+ * @toolbar: a #GtkToolbar
+ *
+ * Retrieves whether tooltips are enabled. See
+ * gtk_toolbar_set_tooltips().
+ *
+ * Return value: %TRUE if tooltips are enabled
+ **/
+gboolean
+gtk_toolbar_get_tooltips (GtkToolbar *toolbar)
+{
+ g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), FALSE);
+
+ return toolbar->tooltips->enabled;
+}
+
+/**
+ * gtk_toolbar_get_n_items:
+ * @toolbar: a #GtkToolbar
+ *
+ * Returns the number of items on the toolbar.
+ *
+ * Return value: the number of items on the toolbar
+ *
+ * Since: 2.4
+ **/
+gint
+gtk_toolbar_get_n_items (GtkToolbar *toolbar)
+{
+ GtkToolbarPrivate *priv;
+
+ g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), -1);
+
+ if (!gtk_toolbar_check_new_api (toolbar))
+ return -1;
+
+ priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
+ if (!priv->content)
+ return 0;
+
+ return physical_to_logical (toolbar, g_list_length (priv->content) - 1);
+}
+
+/**
+ * gtk_toolbar_get_nth_item:
+ * @toolbar: a #GtkToolbar
+ * @n: A position on the toolbar
+ *
+ * Returns the @n<!-- -->'s item on @toolbar, or %NULL if the
+ * toolbar does not contain an @n<!-- -->'th item.
+ *
+ * Return value: The @n<!-- -->'th #GtkToolItem on @toolbar, or %NULL if there
+ * isn't an @n<!-- -->th item.
+ *
+ * Since: 2.4
+ **/
+GtkToolItem *
+gtk_toolbar_get_nth_item (GtkToolbar *toolbar,
+ gint n)
+{
+ GtkToolbarPrivate *priv;
+ ToolbarContent *content;
+
+ g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), NULL);
+
+ if (!gtk_toolbar_check_new_api (toolbar))
+ return NULL;
+
+ priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
+ content = g_list_nth_data (priv->content, logical_to_physical (toolbar, n));
+
+ if (content)
+ return content->item;
+
+ return NULL;
+}
- alloc.width = child->widget->requisition.width;
- alloc.height = child->widget->requisition.height;
+/**
+ * gtk_toolbar_set_icon_size:
+ * @toolbar: A #GtkToolbar
+ * @icon_size: The #GtkIconSize that stock icons in the toolbar shall have.
+ *
+ * This function sets the size of stock icons in the toolbar. You
+ * can call it both before you add the icons and after they've been
+ * added. The size you set will override user preferences for the default
+ * icon size.
+ **/
+void
+gtk_toolbar_set_icon_size (GtkToolbar *toolbar,
+ GtkIconSize icon_size)
+{
+ g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
- if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL)
- alloc.y = allocation->y + (allocation->height - child->widget->requisition.height) / 2;
- else
- alloc.x = allocation->x + (allocation->width - child->widget->requisition.width) / 2;
+ toolbar->icon_size_set = TRUE;
- gtk_widget_size_allocate (child->widget, &alloc);
+ if (toolbar->icon_size == icon_size)
+ return;
- if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL)
- alloc.x += child->widget->requisition.width;
- else
- alloc.y += child->widget->requisition.height;
+ toolbar->icon_size = icon_size;
- break;
+ gtk_toolbar_reconfigured (toolbar);
- default:
- g_assert_not_reached ();
- }
- }
+ gtk_widget_queue_resize (GTK_WIDGET (toolbar));
}
-static void
-gtk_toolbar_add (GtkContainer *container,
- GtkWidget *widget)
+/**
+ * gtk_toolbar_get_icon_size:
+ * @toolbar: a #GtkToolbar
+ *
+ * Retrieves the icon size fo the toolbar. See gtk_toolbar_set_icon_size().
+ *
+ * Return value: the current icon size for the icons on the toolbar.
+ **/
+GtkIconSize
+gtk_toolbar_get_icon_size (GtkToolbar *toolbar)
{
- g_return_if_fail (container != NULL);
- g_return_if_fail (GTK_IS_TOOLBAR (container));
- g_return_if_fail (widget != NULL);
+ g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), DEFAULT_ICON_SIZE);
- gtk_toolbar_append_widget (GTK_TOOLBAR (container), widget, NULL, NULL);
+ return toolbar->icon_size;
}
-static void
-gtk_toolbar_remove (GtkContainer *container,
- GtkWidget *widget)
+/**
+ * gtk_toolbar_get_relief_style:
+ * @toolbar: a #GtkToolbar
+ *
+ * Returns the relief style of buttons on @toolbar. See
+ * gtk_button_set_relief_style().
+ *
+ * Return value: The relief style of buttons on @toolbar.
+ *
+ * Since: 2.4
+ **/
+GtkReliefStyle
+gtk_toolbar_get_relief_style (GtkToolbar *toolbar)
{
- GtkToolbar *toolbar;
- GList *children;
- GtkToolbarChild *child;
+ g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), GTK_RELIEF_NONE);
- g_return_if_fail (container != NULL);
- g_return_if_fail (GTK_IS_TOOLBAR (container));
- g_return_if_fail (widget != NULL);
+ return get_button_relief (toolbar);
+}
- toolbar = GTK_TOOLBAR (container);
+/**
+ * gtk_toolbar_unset_icon_size:
+ * @toolbar: a #GtkToolbar
+ *
+ * Unsets toolbar icon size set with gtk_toolbar_set_icon_size(), so that
+ * user preferences will be used to determine the icon size.
+ **/
+void
+gtk_toolbar_unset_icon_size (GtkToolbar *toolbar)
+{
+ GtkIconSize size;
- for (children = toolbar->children; children; children = children->next)
+ g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
+
+ if (toolbar->icon_size_set)
{
- child = children->data;
+ GtkSettings *settings = toolbar_get_settings (toolbar);
- if ((child->type != GTK_TOOLBAR_CHILD_SPACE) && (child->widget == widget))
+ if (settings)
{
- gboolean was_visible;
+ g_object_get (settings,
+ "gtk-toolbar-icon-size", &size,
+ NULL);
+ }
+ else
+ size = DEFAULT_ICON_SIZE;
+
+ if (size != toolbar->icon_size)
+ gtk_toolbar_set_icon_size (toolbar, size);
- was_visible = GTK_WIDGET_VISIBLE (widget);
- gtk_widget_unparent (widget);
+ toolbar->icon_size_set = FALSE;
+ }
+}
- toolbar->children = g_list_remove_link (toolbar->children, children);
- g_free (child);
- g_list_free (children);
- toolbar->num_children--;
+/**
+ * gtk_toolbar_set_show_arrow:
+ * @toolbar: a #GtkToolbar
+ * @show_arrow: Whether to show an overflow menu
+ *
+ * Sets whether to show an overflow menu when
+ * @toolbar doesn't have room for all items on it. If %TRUE,
+ * items that there are not room are available through an
+ * overflow menu.
+ *
+ * Since: 2.4
+ **/
+void
+gtk_toolbar_set_show_arrow (GtkToolbar *toolbar,
+ gboolean show_arrow)
+{
+ GtkToolbarPrivate *priv;
+
+ g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
- if (was_visible && GTK_WIDGET_VISIBLE (container))
- gtk_widget_queue_resize (GTK_WIDGET (container));
+ priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+ show_arrow = show_arrow != FALSE;
- break;
- }
+ if (priv->show_arrow != show_arrow)
+ {
+ priv->show_arrow = show_arrow;
+
+ if (!priv->show_arrow)
+ gtk_widget_hide (priv->arrow_button);
+
+ gtk_widget_queue_resize (GTK_WIDGET (toolbar));
+ g_object_notify (G_OBJECT (toolbar), "show_arrow");
}
}
-static void
-gtk_toolbar_forall (GtkContainer *container,
- gboolean include_internals,
- GtkCallback callback,
- gpointer callback_data)
+/**
+ * gtk_toolbar_get_show_arrow:
+ * @toolbar: a #GtkToolbar
+ *
+ * Returns whether the toolbar has an overflow menu.
+ * See gtk_toolbar_set_show_arrow()
+ *
+ * Return value:
+ *
+ * Since: 2.4
+ **/
+gboolean
+gtk_toolbar_get_show_arrow (GtkToolbar *toolbar)
{
- GtkToolbar *toolbar;
- GList *children;
- GtkToolbarChild *child;
-
- g_return_if_fail (container != NULL);
- g_return_if_fail (GTK_IS_TOOLBAR (container));
- g_return_if_fail (callback != NULL);
+ GtkToolbarPrivate *priv;
- toolbar = GTK_TOOLBAR (container);
+ g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), FALSE);
- for (children = toolbar->children; children; children = children->next)
- {
- child = children->data;
+ if (!gtk_toolbar_check_new_api (toolbar))
+ return FALSE;
+
+ priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
+ return priv->show_arrow;
+}
- if (child->type != GTK_TOOLBAR_CHILD_SPACE)
- (*callback) (child->widget, callback_data);
- }
+/**
+ * gtk_toolbar_get_drop_index:
+ * @toolbar: a #GtkToolbar
+ * @x: x coordinate of a point on the toolbar
+ * @y: y coordinate of a point on the toolbar
+ *
+ * Returns the position corresponding to the indicated point on
+ * @toolbar. This is useful when dragging items to the toolbar:
+ * this function returns the position a new item should be
+ * inserted.
+ *
+ * @x and @y are in @toolbar coordinates.
+ *
+ * Return value: The position corresponding to the point (@x, @y) on the toolbar.
+ *
+ * Since: 2.4
+ **/
+gint
+gtk_toolbar_get_drop_index (GtkToolbar *toolbar,
+ gint x,
+ gint y)
+{
+ g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), FALSE);
+
+ if (!gtk_toolbar_check_new_api (toolbar))
+ return -1;
+
+ return physical_to_logical (toolbar, find_drop_index (toolbar, x, y));
}
+/**
+ * gtk_toolbar_append_item:
+ * @toolbar: a #GtkToolbar.
+ * @text: give your toolbar button a label.
+ * @tooltip_text: a string that appears when the user holds the mouse over this item.
+ * @tooltip_private_text: use with #GtkTipsQuery.
+ * @icon: a #GtkWidget that should be used as the button's icon.
+ * @callback: the function to be executed when the button is pressed.
+ * @user_data: a pointer to any data you wish to be passed to the callback.
+ *
+ * Inserts a new item into the toolbar. You must specify the position
+ * in the toolbar where it will be inserted.
+ *
+ * @callback must be a pointer to a function taking a #GtkWidget and a gpointer as
+ * arguments. Use the GTK_SIGNAL_FUNC() to cast the function to #GtkSignalFunc.
+ *
+ * Return value: the new toolbar item as a #GtkWidget.
+ **/
GtkWidget *
gtk_toolbar_append_item (GtkToolbar *toolbar,
const char *text,
toolbar->num_children);
}
+/**
+ * gtk_toolbar_prepend_item:
+ * @toolbar: a #GtkToolbar.
+ * @text: give your toolbar button a label.
+ * @tooltip_text: a string that appears when the user holds the mouse over this item.
+ * @tooltip_private_text: use with #GtkTipsQuery.
+ * @icon: a #GtkWidget that should be used as the button's icon.
+ * @callback: the function to be executed when the button is pressed.
+ * @user_data: a pointer to any data you wish to be passed to the callback.
+ *
+ * Adds a new button to the beginning (top or left edges) of the given toolbar.
+ *
+ * @callback must be a pointer to a function taking a #GtkWidget and a gpointer as
+ * arguments. Use the GTK_SIGNAL_FUNC() to cast the function to #GtkSignalFunc.
+ *
+ * Return value: the new toolbar item as a #GtkWidget.
+ **/
GtkWidget *
gtk_toolbar_prepend_item (GtkToolbar *toolbar,
const char *text,
0);
}
+/**
+ * gtk_toolbar_insert_item:
+ * @toolbar: a #GtkToolbar.
+ * @text: give your toolbar button a label.
+ * @tooltip_text: a string that appears when the user holds the mouse over this item.
+ * @tooltip_private_text: use with #GtkTipsQuery.
+ * @icon: a #GtkWidget that should be used as the button's icon.
+ * @callback: the function to be executed when the button is pressed.
+ * @user_data: a pointer to any data you wish to be passed to the callback.
+ * @position: the number of widgets to insert this item after.
+ *
+ * Inserts a new item into the toolbar. You must specify the position in the
+ * toolbar where it will be inserted.
+ *
+ * @callback must be a pointer to a function taking a #GtkWidget and a gpointer as
+ * arguments. Use the GTK_SIGNAL_FUNC() to cast the function to #GtkSignalFunc.
+ *
+ * Return value: the new toolbar item as a #GtkWidget.
+ **/
GtkWidget *
gtk_toolbar_insert_item (GtkToolbar *toolbar,
const char *text,
position);
}
+/**
+ * gtk_toolbar_insert_stock:
+ * @toolbar: A #GtkToolbar
+ * @stock_id: The id of the stock item you want to insert
+ * @tooltip_text: The text in the tooltip of the toolbar button
+ * @tooltip_private_text: The private text of the tooltip
+ * @callback: The callback called when the toolbar button is clicked.
+ * @user_data: user data passed to callback
+ * @position: The position the button shall be inserted at.
+ * -1 means at the end.
+ *
+ * Inserts a stock item at the specified position of the toolbar. If
+ * @stock_id is not a known stock item ID, it's inserted verbatim,
+ * except that underscores used to mark mnemonics are removed.
+ *
+ * @callback must be a pointer to a function taking a #GtkWidget and a gpointer as
+ * arguments. Use the GTK_SIGNAL_FUNC() to cast the function to #GtkSignalFunc.
+ *
+ * Returns: the inserted widget
+ */
+GtkWidget*
+gtk_toolbar_insert_stock (GtkToolbar *toolbar,
+ const gchar *stock_id,
+ const char *tooltip_text,
+ const char *tooltip_private_text,
+ GtkSignalFunc callback,
+ gpointer user_data,
+ gint position)
+{
+ return gtk_toolbar_internal_insert_element (toolbar, GTK_TOOLBAR_CHILD_BUTTON,
+ NULL, stock_id,
+ tooltip_text, tooltip_private_text,
+ NULL, callback, user_data,
+ position, TRUE);
+}
+
+/**
+ * gtk_toolbar_append_space:
+ * @toolbar: a #GtkToolbar.
+ *
+ * Adds a new space to the end of the toolbar.
+ **/
void
gtk_toolbar_append_space (GtkToolbar *toolbar)
{
toolbar->num_children);
}
+/**
+ * gtk_toolbar_prepend_space:
+ * @toolbar: a #GtkToolbar.
+ *
+ * Adds a new space to the beginning of the toolbar.
+ **/
void
gtk_toolbar_prepend_space (GtkToolbar *toolbar)
{
0);
}
+/**
+ * gtk_toolbar_insert_space:
+ * @toolbar: a #GtkToolbar
+ * @position: the number of widgets after which a space should be inserted.
+ *
+ * Inserts a new space in the toolbar at the specified position.
+ **/
void
gtk_toolbar_insert_space (GtkToolbar *toolbar,
gint position)
position);
}
+/**
+ * gtk_toolbar_remove_space:
+ * @toolbar: a #GtkToolbar.
+ * @position: the index of the space to remove.
+ *
+ * Removes a space from the specified position.
+ **/
+void
+gtk_toolbar_remove_space (GtkToolbar *toolbar,
+ gint position)
+{
+ GtkToolItem *item;
+
+ g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
+
+ if (!gtk_toolbar_check_old_api (toolbar))
+ return;
+
+ item = g_list_nth_data (toolbar->children, position);
+
+ if (!item)
+ {
+ g_warning ("Toolbar position %d doesn't exist", position);
+ return;
+ }
+
+ if (!GTK_IS_SEPARATOR_TOOL_ITEM (item))
+ {
+ g_warning ("Toolbar position %d is not a space", position);
+ return;
+ }
+
+ gtk_toolbar_remove_tool_item (toolbar, item);
+}
+
+/**
+ * gtk_toolbar_append_widget:
+ * @toolbar: a #GtkToolbar.
+ * @widget: a #GtkWidget to add to the toolbar.
+ * @tooltip_text: the element's tooltip.
+ * @tooltip_private_text: used for context-sensitive help about this toolbar element.
+ *
+ * Adds a widget to the end of the given toolbar.
+ **/
void
gtk_toolbar_append_widget (GtkToolbar *toolbar,
GtkWidget *widget,
toolbar->num_children);
}
+/**
+ * gtk_toolbar_prepend_widget:
+ * @toolbar: a #GtkToolbar.
+ * @widget: a #GtkWidget to add to the toolbar.
+ * @tooltip_text: the element's tooltip.
+ * @tooltip_private_text: used for context-sensitive help about this toolbar element.
+ *
+ * Adds a widget to the beginning of the given toolbar.
+ **/
void
gtk_toolbar_prepend_widget (GtkToolbar *toolbar,
GtkWidget *widget,
widget, NULL,
tooltip_text, tooltip_private_text,
NULL, NULL, NULL,
- toolbar->num_children);
+ 0);
}
+/**
+ * gtk_toolbar_insert_widget:
+ * @toolbar: a #GtkToolbar.
+ * @widget: a #GtkWidget to add to the toolbar.
+ * @tooltip_text: the element's tooltip.
+ * @tooltip_private_text: used for context-sensitive help about this toolbar element.
+ * @position: the number of widgets to insert this widget after.
+ *
+ * Inserts a widget in the toolbar at the given position.
+ **/
void
gtk_toolbar_insert_widget (GtkToolbar *toolbar,
GtkWidget *widget,
position);
}
-GtkWidget *
+/**
+ * gtk_toolbar_append_element:
+ * @toolbar: a #GtkToolbar.
+ * @type: a value of type #GtkToolbarChildType that determines what @widget will be.
+ * @widget: a #GtkWidget, or %NULL.
+ * @text: the element's label.
+ * @tooltip_text: the element's tooltip.
+ * @tooltip_private_text: used for context-sensitive help about this toolbar element.
+ * @icon: a #GtkWidget that provides pictorial representation of the element's function.
+ * @callback: the function to be executed when the button is pressed.
+ * @user_data: any data you wish to pass to the callback.
+ *
+ * Adds a new element to the end of a toolbar.
+ *
+ * If @type == %GTK_TOOLBAR_CHILD_WIDGET, @widget is used as the new element.
+ * If @type == %GTK_TOOLBAR_CHILD_RADIOBUTTON, @widget is used to determine
+ * the radio group for the new element. In all other cases, @widget must
+ * be %NULL.
+ *
+ * @callback must be a pointer to a function taking a #GtkWidget and a gpointer as
+ * arguments. Use the GTK_SIGNAL_FUNC() to cast the function to #GtkSignalFunc.
+ *
+ * Return value: the new toolbar element as a #GtkWidget.
+ **/
+GtkWidget*
gtk_toolbar_append_element (GtkToolbar *toolbar,
GtkToolbarChildType type,
GtkWidget *widget,
toolbar->num_children);
}
+/**
+ * gtk_toolbar_prepend_element:
+ * @toolbar: a #GtkToolbar.
+ * @type: a value of type #GtkToolbarChildType that determines what @widget will be.
+ * @widget: a #GtkWidget, or %NULL
+ * @text: the element's label.
+ * @tooltip_text: the element's tooltip.
+ * @tooltip_private_text: used for context-sensitive help about this toolbar element.
+ * @icon: a #GtkWidget that provides pictorial representation of the element's function.
+ * @callback: the function to be executed when the button is pressed.
+ * @user_data: any data you wish to pass to the callback.
+ *
+ * Adds a new element to the beginning of a toolbar.
+ *
+ * If @type == %GTK_TOOLBAR_CHILD_WIDGET, @widget is used as the new element.
+ * If @type == %GTK_TOOLBAR_CHILD_RADIOBUTTON, @widget is used to determine
+ * the radio group for the new element. In all other cases, @widget must
+ * be %NULL.
+ *
+ * @callback must be a pointer to a function taking a #GtkWidget and a gpointer as
+ * arguments. Use the GTK_SIGNAL_FUNC() to cast the function to #GtkSignalFunc.
+ *
+ * Return value: the new toolbar element as a #GtkWidget.
+ **/
GtkWidget *
gtk_toolbar_prepend_element (GtkToolbar *toolbar,
GtkToolbarChildType type,
icon, callback, user_data, 0);
}
+/**
+ * gtk_toolbar_insert_element:
+ * @toolbar: a #GtkToolbar.
+ * @type: a value of type #GtkToolbarChildType that determines what @widget
+ * will be.
+ * @widget: a #GtkWidget, or %NULL.
+ * @text: the element's label.
+ * @tooltip_text: the element's tooltip.
+ * @tooltip_private_text: used for context-sensitive help about this toolbar element.
+ * @icon: a #GtkWidget that provides pictorial representation of the element's function.
+ * @callback: the function to be executed when the button is pressed.
+ * @user_data: any data you wish to pass to the callback.
+ * @position: the number of widgets to insert this element after.
+ *
+ * Inserts a new element in the toolbar at the given position.
+ *
+ * If @type == %GTK_TOOLBAR_CHILD_WIDGET, @widget is used as the new element.
+ * If @type == %GTK_TOOLBAR_CHILD_RADIOBUTTON, @widget is used to determine
+ * the radio group for the new element. In all other cases, @widget must
+ * be %NULL.
+ *
+ * @callback must be a pointer to a function taking a #GtkWidget and a gpointer as
+ * arguments. Use the GTK_SIGNAL_FUNC() to cast the function to #GtkSignalFunc.
+ *
+ * Return value: the new toolbar element as a #GtkWidget.
+ **/
GtkWidget *
gtk_toolbar_insert_element (GtkToolbar *toolbar,
GtkToolbarChildType type,
gpointer user_data,
gint position)
{
- GtkToolbarChild *child;
- GtkWidget *vbox;
+ return gtk_toolbar_internal_insert_element (toolbar, type, widget, text,
+ tooltip_text, tooltip_private_text,
+ icon, callback, user_data, position, FALSE);
+}
- g_return_val_if_fail (toolbar != NULL, NULL);
- g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), NULL);
- if (type == GTK_TOOLBAR_CHILD_WIDGET)
+gchar *
+_gtk_toolbar_elide_underscores (const gchar *original)
+{
+ gchar *q, *result;
+ const gchar *p;
+ gboolean last_underscore;
+
+ q = result = g_malloc (strlen (original) + 1);
+ last_underscore = FALSE;
+
+ for (p = original; *p; p++)
{
- g_return_val_if_fail (widget != NULL, NULL);
- g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+ if (!last_underscore && *p == '_')
+ last_underscore = TRUE;
+ else
+ {
+ last_underscore = FALSE;
+ *q++ = *p;
+ }
}
+
+ *q = '\0';
+
+ return result;
+}
+
+static GtkWidget *
+gtk_toolbar_internal_insert_element (GtkToolbar *toolbar,
+ GtkToolbarChildType type,
+ GtkWidget *widget,
+ const char *text,
+ const char *tooltip_text,
+ const char *tooltip_private_text,
+ GtkWidget *icon,
+ GtkSignalFunc callback,
+ gpointer user_data,
+ gint position,
+ gboolean use_stock)
+{
+ GtkToolbarChild *child;
+ GtkToolItem *item = NULL;
+
+ g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), NULL);
+
+ if (!gtk_toolbar_check_old_api (toolbar))
+ return NULL;
+
+ if (type == GTK_TOOLBAR_CHILD_WIDGET)
+ g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
else if (type != GTK_TOOLBAR_CHILD_RADIOBUTTON)
g_return_val_if_fail (widget == NULL, NULL);
child = g_new (GtkToolbarChild, 1);
+
child->type = type;
child->icon = NULL;
child->label = NULL;
switch (type)
{
case GTK_TOOLBAR_CHILD_SPACE:
+ item = gtk_separator_tool_item_new ();
child->widget = NULL;
break;
case GTK_TOOLBAR_CHILD_WIDGET:
+ item = gtk_tool_item_new ();
child->widget = widget;
+ gtk_container_add (GTK_CONTAINER (item), child->widget);
break;
case GTK_TOOLBAR_CHILD_BUTTON:
+ item = gtk_tool_button_new (NULL, NULL);
+ child->widget = _gtk_tool_button_get_button (GTK_TOOL_BUTTON (item));
+ break;
+
case GTK_TOOLBAR_CHILD_TOGGLEBUTTON:
- case GTK_TOOLBAR_CHILD_RADIOBUTTON:
- if (type == GTK_TOOLBAR_CHILD_BUTTON)
- {
- child->widget = gtk_button_new ();
- gtk_button_set_relief (GTK_BUTTON (child->widget), toolbar->relief);
- }
- else if (type == GTK_TOOLBAR_CHILD_TOGGLEBUTTON)
- {
- child->widget = gtk_toggle_button_new ();
- gtk_button_set_relief (GTK_BUTTON (child->widget), toolbar->relief);
- gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (child->widget),
- FALSE);
- }
- else
- {
- child->widget = gtk_radio_button_new (widget
- ? gtk_radio_button_group (GTK_RADIO_BUTTON (widget))
- : NULL);
- gtk_button_set_relief (GTK_BUTTON (child->widget), toolbar->relief);
- gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (child->widget), FALSE);
- }
-
- GTK_WIDGET_UNSET_FLAGS (child->widget, GTK_CAN_FOCUS);
-
- if (callback)
- gtk_signal_connect (GTK_OBJECT (child->widget), "clicked",
- callback, user_data);
+ item = gtk_toggle_tool_button_new ();
+ child->widget = _gtk_tool_button_get_button (GTK_TOOL_BUTTON (item));
+ break;
- vbox = gtk_vbox_new (FALSE, 0);
- gtk_container_add (GTK_CONTAINER (child->widget), vbox);
- gtk_widget_show (vbox);
+ case GTK_TOOLBAR_CHILD_RADIOBUTTON:
+ item = gtk_radio_tool_button_new (widget
+ ? gtk_radio_button_get_group (GTK_RADIO_BUTTON (widget))
+ : NULL);
+ child->widget = _gtk_tool_button_get_button (GTK_TOOL_BUTTON (item));
+ break;
+ }
+ gtk_widget_show (GTK_WIDGET (item));
+
+ if (type == GTK_TOOLBAR_CHILD_BUTTON ||
+ type == GTK_TOOLBAR_CHILD_RADIOBUTTON ||
+ type == GTK_TOOLBAR_CHILD_TOGGLEBUTTON)
+ {
if (text)
{
- child->label = gtk_label_new (text);
- gtk_box_pack_end (GTK_BOX (vbox), child->label, FALSE, FALSE, 0);
- if (toolbar->style != GTK_TOOLBAR_ICONS)
- gtk_widget_show (child->label);
+ if (use_stock)
+ {
+ GtkStockItem stock_item;
+ gchar *label_text;
+
+ gtk_tool_button_set_stock_id (GTK_TOOL_BUTTON (item), text);
+
+ gtk_stock_lookup (text, &stock_item);
+ label_text = _gtk_toolbar_elide_underscores (stock_item.label);
+ child->label = GTK_WIDGET (gtk_label_new (label_text));
+ g_free (label_text);
+ }
+ else
+ {
+ child->label = gtk_label_new (text);
+ }
+ gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (item), child->label);
+ gtk_widget_show (child->label);
}
if (icon)
{
- child->icon = GTK_WIDGET (icon);
- gtk_box_pack_end (GTK_BOX (vbox), child->icon, FALSE, FALSE, 0);
- if (toolbar->style != GTK_TOOLBAR_TEXT)
- gtk_widget_show (child->icon);
- }
+ child->icon = icon;
+ gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (item), icon);
- gtk_widget_show (child->widget);
- break;
+ /* Applications depend on the toolbar showing the widget for them */
+ gtk_widget_show (GTK_WIDGET (icon));
+ }
- default:
- g_assert_not_reached ();
+ /*
+ * We need to connect to the button's clicked callback because some
+ * programs may rely on that the widget in the callback is a GtkButton
+ */
+ if (callback)
+ g_signal_connect (child->widget, "clicked",
+ callback, user_data);
}
if ((type != GTK_TOOLBAR_CHILD_SPACE) && tooltip_text)
- gtk_tooltips_set_tip (toolbar->tooltips, child->widget,
- tooltip_text, tooltip_private_text);
-
+ gtk_tool_item_set_tooltip (item, toolbar->tooltips,
+ tooltip_text, tooltip_private_text);
+
toolbar->children = g_list_insert (toolbar->children, child, position);
- toolbar->num_children++;
-
- if (type != GTK_TOOLBAR_CHILD_SPACE)
- gtk_widget_set_parent (child->widget, GTK_WIDGET (toolbar));
-
- if ((type != GTK_TOOLBAR_CHILD_SPACE) && GTK_WIDGET_VISIBLE (toolbar))
- {
- if (GTK_WIDGET_REALIZED (toolbar)
- && !GTK_WIDGET_REALIZED (child->widget))
- gtk_widget_realize (child->widget);
-
- if (GTK_WIDGET_MAPPED (toolbar)
- && !GTK_WIDGET_MAPPED (child->widget))
- gtk_widget_map (child->widget);
- }
- if (GTK_WIDGET_VISIBLE (toolbar) &&
- ((type == GTK_TOOLBAR_CHILD_SPACE) ||
- GTK_WIDGET_VISIBLE (child->widget)))
- gtk_widget_queue_resize (GTK_WIDGET (toolbar));
+ gtk_toolbar_insert_tool_item (toolbar, item, position, FALSE);
return child->widget;
}
-void
-gtk_toolbar_set_orientation (GtkToolbar *toolbar,
- GtkOrientation orientation)
-{
- g_return_if_fail (toolbar != NULL);
- g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
-
- gtk_signal_emit (GTK_OBJECT (toolbar), toolbar_signals[ORIENTATION_CHANGED], orientation);
-}
-
-void
-gtk_toolbar_set_style (GtkToolbar *toolbar,
- GtkToolbarStyle style)
-{
- g_return_if_fail (toolbar != NULL);
- g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
-
- gtk_signal_emit (GTK_OBJECT (toolbar), toolbar_signals[STYLE_CHANGED], style);
-}
-
-void
-gtk_toolbar_set_space_size (GtkToolbar *toolbar,
- gint space_size)
-{
- g_return_if_fail (toolbar != NULL);
- g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
-
- if (toolbar->space_size != space_size)
- {
- toolbar->space_size = space_size;
- gtk_widget_queue_resize (GTK_WIDGET (toolbar));
- }
-}
-
-void
-gtk_toolbar_set_tooltips (GtkToolbar *toolbar,
- gint enable)
-{
- g_return_if_fail (toolbar != NULL);
- g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
-
- if (enable)
- gtk_tooltips_enable (toolbar->tooltips);
- else
- gtk_tooltips_disable (toolbar->tooltips);
-}
-
-void
-gtk_toolbar_set_button_relief (GtkToolbar *toolbar,
- GtkReliefStyle relief)
-{
- GList *children;
- GtkToolbarChild *child;
-
- g_return_if_fail (toolbar != NULL);
- g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
-
- if (toolbar->relief != relief)
- {
- toolbar->relief = relief;
-
- for (children = toolbar->children; children; children = children->next)
- {
- child = children->data;
- if (child->type == GTK_TOOLBAR_CHILD_BUTTON ||
- child->type == GTK_TOOLBAR_CHILD_RADIOBUTTON ||
- child->type == GTK_TOOLBAR_CHILD_TOGGLEBUTTON)
- gtk_button_set_relief (GTK_BUTTON (child->widget), relief);
- }
-
- gtk_widget_queue_resize (GTK_WIDGET (toolbar));
- }
-}
-
-GtkReliefStyle
-gtk_toolbar_get_button_relief (GtkToolbar *toolbar)
-{
- g_return_val_if_fail (toolbar != NULL, GTK_RELIEF_NORMAL);
- g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), GTK_RELIEF_NORMAL);
-
- return toolbar->relief;
-}
-
-static void
-gtk_real_toolbar_orientation_changed (GtkToolbar *toolbar,
- GtkOrientation orientation)
-{
- g_return_if_fail (toolbar != NULL);
- g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
-
- if (toolbar->orientation != orientation)
- {
- toolbar->orientation = orientation;
- gtk_widget_queue_resize (GTK_WIDGET (toolbar));
- }
-}
-
static void
-gtk_real_toolbar_style_changed (GtkToolbar *toolbar,
- GtkToolbarStyle style)
+gtk_toolbar_finalize (GObject *object)
{
- GList *children;
- GtkToolbarChild *child;
-
- g_return_if_fail (toolbar != NULL);
- g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
-
- if (toolbar->style != style)
- {
- toolbar->style = style;
-
- for (children = toolbar->children; children; children = children->next)
- {
- child = children->data;
-
- if (child->type == GTK_TOOLBAR_CHILD_BUTTON ||
- child->type == GTK_TOOLBAR_CHILD_RADIOBUTTON ||
- child->type == GTK_TOOLBAR_CHILD_TOGGLEBUTTON)
- switch (style)
- {
- case GTK_TOOLBAR_ICONS:
- if (child->icon && !GTK_WIDGET_VISIBLE (child->icon))
- gtk_widget_show (child->icon);
-
- if (child->label && GTK_WIDGET_VISIBLE (child->label))
- gtk_widget_hide (child->label);
-
- break;
-
- case GTK_TOOLBAR_TEXT:
- if (child->icon && GTK_WIDGET_VISIBLE (child->icon))
- gtk_widget_hide (child->icon);
+ GList *list;
+ GtkToolbar *toolbar = GTK_TOOLBAR (object);
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
+ if (toolbar->tooltips)
+ g_object_unref (toolbar->tooltips);
- if (child->label && !GTK_WIDGET_VISIBLE (child->label))
- gtk_widget_show (child->label);
+ for (list = toolbar->children; list != NULL; list = list->next)
+ g_free (list->data);
- break;
+ g_list_free (toolbar->children);
- case GTK_TOOLBAR_BOTH:
- if (child->icon && !GTK_WIDGET_VISIBLE (child->icon))
- gtk_widget_show (child->icon);
+ for (list = priv->content; list != NULL; list = list->next)
+ g_free (list->data);
- if (child->label && !GTK_WIDGET_VISIBLE (child->label))
- gtk_widget_show (child->label);
+ g_list_free (priv->content);
- break;
+ g_timer_destroy (priv->timer);
- default:
- g_assert_not_reached ();
- }
- }
-
- gtk_widget_queue_resize (GTK_WIDGET (toolbar));
- }
+ if (priv->idle_id)
+ g_source_remove (priv->idle_id);
+
+ G_OBJECT_CLASS (parent_class)->finalize (object);
}
projects / ~andy / gtk / blobdiff