* 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 Anders Carlsson <andersca@gnome.org>
* Copyright (C) 2002 James Henstridge <james@daa.com.au>
- * Copyright (C) 2003 Soeren Sandmann <sandmann@daimi.au.dk>
+ * Copyright (C) 2003, 2004 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 Lesser General Public
#undef GTK_DISABLE_DEPRECATED
+#include <config.h>
#include "gtkarrow.h"
#include "gtktoolbar.h"
#include "gtkradiotoolbutton.h"
#include "gtkseparatortoolitem.h"
#include "gtkmenu.h"
#include "gtkradiobutton.h"
-#include "gtktoolbar.h"
#include "gtkbindings.h"
#include <gdk/gdkkeysyms.h>
#include "gtkmarshalers.h"
#include "gtkprivate.h"
#include "gtkintl.h"
#include <string.h>
+#include "gtkhbox.h"
+#include "gtkvbox.h"
+#include "gtkimage.h"
+#include "gtkseparatormenuitem.h"
+#include "gtkalias.h"
+#include <math.h>
+
+typedef struct _ToolbarContent ToolbarContent;
-#define DEFAULT_IPADDING 0
+#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_SIZE 12
#define DEFAULT_SPACE_STYLE GTK_TOOLBAR_SPACE_LINE
+#define SPACE_LINE_DIVISION 10.0
+#define SPACE_LINE_START 2.0
+#define SPACE_LINE_END 8.0
#define DEFAULT_ICON_SIZE GTK_ICON_SIZE_LARGE_TOOLBAR
#define DEFAULT_TOOLBAR_STYLE GTK_TOOLBAR_BOTH
+#define DEFAULT_ANIMATION_STATE TRUE
#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().
*/
+#define SLIDE_SPEED 600.0 /* How fast the items slide, in pixels per second */
+#define ACCEL_THRESHOLD 0.18 /* After how much time in seconds will items start speeding up */
+
+#define MIXED_API_WARNING \
+ "Mixing deprecated and non-deprecated GtkToolbar API is not allowed"
+
+/* Properties */
enum {
PROP_0,
PROP_ORIENTATION,
PROP_TOOLBAR_STYLE,
- PROP_SHOW_ARROW
+ PROP_SHOW_ARROW,
+ PROP_TOOLTIPS,
+ PROP_ICON_SIZE,
+ PROP_ICON_SIZE_SET
};
+/* Child properties */
enum {
CHILD_PROP_0,
CHILD_PROP_EXPAND,
CHILD_PROP_HOMOGENEOUS
};
+/* Signals */
enum {
ORIENTATION_CHANGED,
STYLE_CHANGED,
LAST_SIGNAL
};
-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_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);
-
-typedef struct _ToolbarContent ToolbarContent;
-
-static ToolbarContent *gtk_toolbar_insert_tool_item (GtkToolbar *toolbar,
- GtkToolItem *item,
- gint pos,
- gboolean is_placeholder);
-
-
+/* API mode */
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 enum {
+ TOOL_ITEM,
+ COMPATIBILITY
+} ContentType;
typedef enum {
NOT_ALLOCATED,
NORMAL,
HIDDEN,
- OVERFLOWN,
+ OVERFLOWN
} ItemState;
-struct _ToolbarContent
-{
- GtkToolItem * item;
- guint is_placeholder : 1;
- gint start_width;
- gint goal_width;
- gint start_height;
- gint goal_height;
- GtkAllocation start_allocation;
- ItemState state;
-};
-
struct _GtkToolbarPrivate
{
- GList *content;
+ GList * content;
+
+ GtkWidget * arrow;
+ GtkWidget * arrow_button;
+ GtkMenu * menu;
- GtkWidget *arrow;
- GtkWidget *arrow_button;
+ GdkWindow * event_window;
+ ApiMode api_mode;
+ GtkSettings * settings;
+ int idle_id;
+ GtkToolItem * highlight_tool_item;
+ gint max_homogeneous_pixels;
- gboolean show_arrow;
+ GTimer * timer;
- GtkMenu *menu;
+ gulong settings_connection;
- GdkWindow *event_window;
- ApiMode api_mode;
- GtkSettings *settings;
- int idle_id;
- gboolean need_sync;
- gboolean leaving_dnd;
- gboolean in_dnd;
- gint n_overflow_items_when_dnd_started;
- GtkToolItem *highlight_tool_item;
- gint max_homogeneous_pixels;
-
- GTimer *timer;
- gboolean is_sliding;
+ guint show_arrow : 1;
+ guint need_sync : 1;
+ guint is_sliding : 1;
+ guint need_rebuild : 1; /* whether the overflow menu should be regenerated */
+ guint animation : 1;
};
-static GtkContainerClass *parent_class = NULL;
-static guint toolbar_signals [LAST_SIGNAL] = { 0 };
-
-GType
-gtk_toolbar_get_type (void)
-{
- static GtkType type = 0;
-
- if (!type)
- {
- 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;
-}
+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 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_show_all (GtkWidget *widget);
+static void gtk_toolbar_hide_all (GtkWidget *widget);
+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_orientation_changed (GtkToolbar *toolbar,
+ GtkOrientation orientation);
+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 gboolean gtk_toolbar_popup_menu (GtkWidget *toolbar);
+static GtkWidget *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_reconfigured (GtkToolbar *toolbar);
+static gboolean gtk_toolbar_check_new_api (GtkToolbar *toolbar);
+static gboolean gtk_toolbar_check_old_api (GtkToolbar *toolbar);
+
+static GtkReliefStyle get_button_relief (GtkToolbar *toolbar);
+static gint get_internal_padding (GtkToolbar *toolbar);
+static gint get_max_child_expand (GtkToolbar *toolbar);
+static GtkShadowType get_shadow_type (GtkToolbar *toolbar);
+static gint get_space_size (GtkToolbar *toolbar);
+static GtkToolbarSpaceStyle get_space_style (GtkToolbar *toolbar);
+
+/* methods on ToolbarContent 'class' */
+static ToolbarContent *toolbar_content_new_tool_item (GtkToolbar *toolbar,
+ GtkToolItem *item,
+ gboolean is_placeholder,
+ gint pos);
+static void toolbar_content_remove (ToolbarContent *content,
+ GtkToolbar *toolbar);
+static void toolbar_content_free (ToolbarContent *content);
+static void toolbar_content_expose (ToolbarContent *content,
+ GtkContainer *container,
+ GdkEventExpose *expose);
+static gboolean toolbar_content_visible (ToolbarContent *content,
+ GtkToolbar *toolbar);
+static void toolbar_content_size_request (ToolbarContent *content,
+ GtkToolbar *toolbar,
+ GtkRequisition *requisition);
+static gboolean toolbar_content_is_homogeneous (ToolbarContent *content,
+ GtkToolbar *toolbar);
+static gboolean toolbar_content_is_placeholder (ToolbarContent *content);
+static gboolean toolbar_content_disappearing (ToolbarContent *content);
+static ItemState toolbar_content_get_state (ToolbarContent *content);
+static gboolean toolbar_content_child_visible (ToolbarContent *content);
+static void toolbar_content_get_goal_allocation (ToolbarContent *content,
+ GtkAllocation *allocation);
+static void toolbar_content_get_allocation (ToolbarContent *content,
+ GtkAllocation *allocation);
+static void toolbar_content_set_start_allocation (ToolbarContent *content,
+ GtkAllocation *new_start_allocation);
+static void toolbar_content_get_start_allocation (ToolbarContent *content,
+ GtkAllocation *start_allocation);
+static gboolean toolbar_content_get_expand (ToolbarContent *content);
+static void toolbar_content_set_goal_allocation (ToolbarContent *content,
+ GtkAllocation *allocation);
+static void toolbar_content_set_child_visible (ToolbarContent *content,
+ GtkToolbar *toolbar,
+ gboolean visible);
+static void toolbar_content_size_allocate (ToolbarContent *content,
+ GtkAllocation *allocation);
+static void toolbar_content_set_state (ToolbarContent *content,
+ ItemState new_state);
+static GtkWidget * toolbar_content_get_widget (ToolbarContent *content);
+static void toolbar_content_set_disappearing (ToolbarContent *content,
+ gboolean disappearing);
+static void toolbar_content_set_size_request (ToolbarContent *content,
+ gint width,
+ gint height);
+static void toolbar_content_toolbar_reconfigured (ToolbarContent *content,
+ GtkToolbar *toolbar);
+static GtkWidget * toolbar_content_retrieve_menu_item (ToolbarContent *content);
+static gboolean toolbar_content_has_proxy_menu_item (ToolbarContent *content);
+static gboolean toolbar_content_is_separator (ToolbarContent *content);
+static void toolbar_content_show_all (ToolbarContent *content);
+static void toolbar_content_hide_all (ToolbarContent *content);
+static void toolbar_content_set_expand (ToolbarContent *content,
+ gboolean expand);
+
+#define GTK_TOOLBAR_GET_PRIVATE(o) \
+ (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_TOOLBAR, GtkToolbarPrivate))
+
+static guint toolbar_signals [LAST_SIGNAL] = { 0 };
+
+G_DEFINE_TYPE (GtkToolbar, gtk_toolbar, GTK_TYPE_CONTAINER)
static void
add_arrow_bindings (GtkBindingSet *binding_set,
GtkWidgetClass *widget_class;
GtkContainerClass *container_class;
GtkBindingSet *binding_set;
-
- parent_class = g_type_class_peek_parent (klass);
gobject_class = (GObjectClass *)klass;
widget_class = (GtkWidgetClass *)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->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;
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->map = gtk_toolbar_map;
widget_class->unmap = gtk_toolbar_unmap;
widget_class->popup_menu = gtk_toolbar_popup_menu;
+ widget_class->show_all = gtk_toolbar_show_all;
+ widget_class->hide_all = gtk_toolbar_hide_all;
container_class->add = gtk_toolbar_add;
container_class->remove = gtk_toolbar_remove;
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->orientation_changed = gtk_toolbar_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.
- */
+ /**
+ * 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_signal_new (I_("orientation-changed"),
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkToolbarClass, orientation_changed),
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.
- */
+ /**
+ * 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_signal_new (I_("style-changed"),
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkToolbarClass, style_changed),
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
- */
+ /**
+ * 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_signal_new (I_("popup_context_menu"),
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkToolbarClass, popup_context_menu),
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
- */
+ /**
+ * 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",
+ _gtk_binding_signal_new (I_("move_focus"),
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_CALLBACK (gtk_toolbar_move_focus),
_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
- */
+ /**
+ * 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",
+ _gtk_binding_signal_new (I_("focus_home_or_end"),
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_CALLBACK (gtk_toolbar_focus_home_or_end),
_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"),
+ P_("Orientation"),
+ P_("The orientation of the toolbar"),
GTK_TYPE_ORIENTATION,
GTK_ORIENTATION_HORIZONTAL,
- G_PARAM_READWRITE));
-
+ GTK_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"),
+ g_param_spec_enum ("toolbar-style",
+ P_("Toolbar Style"),
+ P_("How to draw the toolbar"),
GTK_TYPE_TOOLBAR_STYLE,
GTK_TOOLBAR_ICONS,
- G_PARAM_READWRITE));
+ GTK_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"),
+ g_param_spec_boolean ("show-arrow",
+ P_("Show Arrow"),
+ P_("If an arrow should be shown if the toolbar doesn't fit"),
+ TRUE,
+ GTK_PARAM_READWRITE));
+
+
+ /**
+ * GtkToolbar:tooltips:
+ *
+ * If the tooltips of the toolbar should be active or not.
+ *
+ * Since: 2.8
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_TOOLTIPS,
+ g_param_spec_boolean ("tooltips",
+ P_("Tooltips"),
+ P_("If the tooltips of the toolbar should be active or not"),
TRUE,
- G_PARAM_READWRITE));
+ GTK_PARAM_READWRITE));
+
+
+ /**
+ * GtkToolbar:icon-size:
+ *
+ * The size of the icons in a toolbar is normally determined by
+ * the toolbar-icon-size setting. When this property is set, it
+ * overrides the setting.
+ *
+ * This should only be used for special-purpose toolbars, normal
+ * application toolbars should respect the user preferences for the
+ * size of icons.
+ *
+ * Since: 2.10
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_ICON_SIZE,
+ g_param_spec_enum ("icon-size",
+ P_("Icon size"),
+ P_("Size of icons in this toolbar"),
+ GTK_TYPE_ICON_SIZE,
+ DEFAULT_ICON_SIZE,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkToolbar:icon-size-set:
+ *
+ * Is %TRUE if the icon-size property has been set.
+ *
+ * Since: 2.10
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_ICON_SIZE_SET,
+ g_param_spec_boolean ("icon-size-set",
+ P_("Icon size set"),
+ P_("Whether the icon-size property has been set"),
+ FALSE,
+ GTK_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"),
+ P_("Expand"),
+ P_("Whether the item should receive extra space when the toolbar grows"),
TRUE,
- G_PARAM_READWRITE));
-
+ GTK_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"),
+ P_("Homogeneous"),
+ P_("Whether the item should be the same size as other homogeneous items"),
TRUE,
- G_PARAM_READWRITE));
-
+ GTK_PARAM_READWRITE));
+
/* style properties */
gtk_widget_class_install_style_property (widget_class,
- g_param_spec_int ("space_size",
- _("Spacer size"),
- _("Size of spacers"),
+ g_param_spec_int ("space-size",
+ P_("Spacer size"),
+ P_("Size of spacers"),
0,
G_MAXINT,
DEFAULT_SPACE_SIZE,
- G_PARAM_READABLE));
+ GTK_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"),
+ g_param_spec_int ("internal-padding",
+ P_("Internal padding"),
+ P_("Amount of border space between the toolbar shadow and the buttons"),
0,
G_MAXINT,
DEFAULT_IPADDING,
- G_PARAM_READABLE));
+ GTK_PARAM_READABLE));
+
+ gtk_widget_class_install_style_property (widget_class,
+ g_param_spec_int ("max-child-expand",
+ P_("Maximum child expand"),
+ P_("Maximum amount of space an expandable item will be given"),
+ 0,
+ G_MAXINT,
+ G_MAXINT,
+ GTK_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"),
+ g_param_spec_enum ("space-style",
+ P_("Space style"),
+ P_("Whether spacers are vertical lines or just blank"),
GTK_TYPE_TOOLBAR_SPACE_STYLE,
DEFAULT_SPACE_STYLE,
- G_PARAM_READABLE));
+ GTK_PARAM_READABLE));
gtk_widget_class_install_style_property (widget_class,
- g_param_spec_enum ("button_relief",
- _("Button relief"),
- _("Type of bevel around toolbar buttons"),
+ g_param_spec_enum ("button-relief",
+ P_("Button relief"),
+ P_("Type of bevel around toolbar buttons"),
GTK_TYPE_RELIEF_STYLE,
GTK_RELIEF_NONE,
- G_PARAM_READABLE));
+ GTK_PARAM_READABLE));
gtk_widget_class_install_style_property (widget_class,
- g_param_spec_enum ("shadow_type",
- _("Shadow type"),
- _("Style of bevel around the toolbar"),
+ g_param_spec_enum ("shadow-type",
+ P_("Shadow type"),
+ P_("Style of bevel around the toolbar"),
GTK_TYPE_SHADOW_TYPE,
GTK_SHADOW_OUT,
- G_PARAM_READABLE));
-
+ GTK_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."),
+ P_("Toolbar style"),
+ P_("Whether default toolbars have text only, text and icons, icons only, etc."),
GTK_TYPE_TOOLBAR_STYLE,
DEFAULT_TOOLBAR_STYLE,
- G_PARAM_READWRITE));
-
+ GTK_PARAM_READWRITE));
+
gtk_settings_install_property (g_param_spec_enum ("gtk-toolbar-icon-size",
- _("Toolbar icon size"),
- _("Size of icons in default toolbars"),
+ P_("Toolbar icon size"),
+ P_("Size of icons in default toolbars"),
GTK_TYPE_ICON_SIZE,
DEFAULT_ICON_SIZE,
- G_PARAM_READWRITE));
+ GTK_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_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));
}
GTK_WIDGET_UNSET_FLAGS (toolbar, GTK_CAN_FOCUS);
GTK_WIDGET_SET_FLAGS (toolbar, GTK_NO_WINDOW);
-
+
priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
toolbar->orientation = GTK_ORIENTATION_HORIZONTAL;
toolbar->style = DEFAULT_TOOLBAR_STYLE;
toolbar->icon_size = DEFAULT_ICON_SIZE;
+ priv->animation = DEFAULT_ANIMATION_STATE;
toolbar->tooltips = gtk_tooltips_new ();
- g_object_ref (toolbar->tooltips);
- gtk_object_sink (GTK_OBJECT (toolbar->tooltips));
+ g_object_ref_sink (toolbar->tooltips);
priv->arrow_button = gtk_toggle_button_new ();
g_signal_connect (priv->arrow_button, "button_press_event",
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);
gtk_container_add (GTK_CONTAINER (priv->arrow_button), priv->arrow);
gtk_widget_set_parent (priv->arrow_button, GTK_WIDGET (toolbar));
-
+
/* which child position a drop will occur at */
priv->menu = NULL;
priv->show_arrow = TRUE;
priv->settings = NULL;
-
+
priv->max_homogeneous_pixels = -1;
priv->timer = g_timer_new ();
}
-static gboolean
-toolbar_item_visible (GtkToolbar *toolbar,
- GtkToolItem *item)
-{
- 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;
-}
-
-static gint
-calculate_max_homogeneous_pixels (GtkWidget *widget)
-{
- PangoContext *context;
- PangoFontMetrics *metrics;
- gint char_width;
-
- 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);
-
- return PANGO_PIXELS (MAX_HOMOGENEOUS_N_CHARS * char_width);
-}
-
-static gboolean
-toolbar_item_is_homogeneous (GtkToolbar *toolbar,
- GtkToolItem *item)
-{
- gboolean result;
- GtkRequisition requisition;
- GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
-
- if (priv->max_homogeneous_pixels < 0)
- {
- priv->max_homogeneous_pixels =
- calculate_max_homogeneous_pixels (GTK_WIDGET (toolbar));
- }
-
- result = gtk_tool_item_get_homogeneous (item) &&
- !GTK_IS_SEPARATOR_TOOL_ITEM (item);
-
- gtk_widget_size_request (GTK_WIDGET (item), &requisition);
-
- if ((gtk_tool_item_get_is_important (item) &&
- toolbar->style == GTK_TOOLBAR_BOTH_HORIZ &&
- toolbar->orientation == GTK_ORIENTATION_HORIZONTAL) ||
- requisition.width > priv->max_homogeneous_pixels)
- {
- result = FALSE;
- }
-
- return result;
-}
-
static void
-gtk_toolbar_set_property (GObject *object,
- guint prop_id,
+gtk_toolbar_set_property (GObject *object,
+ guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
GtkToolbar *toolbar = GTK_TOOLBAR (object);
-
+
switch (prop_id)
{
case PROP_ORIENTATION:
case PROP_SHOW_ARROW:
gtk_toolbar_set_show_arrow (toolbar, g_value_get_boolean (value));
break;
+ case PROP_TOOLTIPS:
+ gtk_toolbar_set_tooltips (toolbar, g_value_get_boolean (value));
+ break;
+ case PROP_ICON_SIZE:
+ gtk_toolbar_set_icon_size (toolbar, g_value_get_enum (value));
+ break;
+ case PROP_ICON_SIZE_SET:
+ if (g_value_get_boolean (value))
+ toolbar->icon_size_set = TRUE;
+ else
+ gtk_toolbar_unset_icon_size (toolbar);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
case PROP_SHOW_ARROW:
g_value_set_boolean (value, priv->show_arrow);
break;
+ case PROP_TOOLTIPS:
+ g_value_set_boolean (value, gtk_toolbar_get_tooltips (toolbar));
+ break;
+ case PROP_ICON_SIZE:
+ g_value_set_enum (value, gtk_toolbar_get_icon_size (toolbar));
+ break;
+ case PROP_ICON_SIZE_SET:
+ g_value_set_boolean (value, toolbar->icon_size_set);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
gtk_toolbar_map (GtkWidget *widget)
{
GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (widget);
-
- GTK_WIDGET_CLASS (parent_class)->map (widget);
-
+
+ GTK_WIDGET_CLASS (gtk_toolbar_parent_class)->map (widget);
+
if (priv->event_window)
gdk_window_show_unraised (priv->event_window);
}
gtk_toolbar_unmap (GtkWidget *widget)
{
GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (widget);
-
+
if (priv->event_window)
gdk_window_hide (priv->event_window);
-
- GTK_WIDGET_CLASS (parent_class)->unmap (widget);
+
+ GTK_WIDGET_CLASS (gtk_toolbar_parent_class)->unmap (widget);
}
static void
{
GtkToolbar *toolbar = GTK_TOOLBAR (widget);
GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
-
+
GdkWindowAttr attributes;
gint attributes_mask;
gint border_width;
-
+
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
-
+
border_width = GTK_CONTAINER (widget)->border_width;
-
+
attributes.wclass = GDK_INPUT_ONLY;
attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = widget->allocation.x + border_width;
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);
gtk_toolbar_unrealize (GtkWidget *widget)
{
GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (widget);
-
+
if (priv->event_window)
{
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);
+
+ if (GTK_WIDGET_CLASS (gtk_toolbar_parent_class)->unrealize)
+ (* GTK_WIDGET_CLASS (gtk_toolbar_parent_class)->unrealize) (widget);
}
static gint
widget->allocation.width - 2 * border_width,
widget->allocation.height - 2 * border_width);
}
-
+
for (list = priv->content; list != NULL; list = list->next)
{
ToolbarContent *content = list->data;
- GtkToolItem *item = content->item;
-
- if (!content->is_placeholder)
- gtk_container_propagate_expose (GTK_CONTAINER (widget),
- GTK_WIDGET (item),
- event);
+
+ toolbar_content_expose (content, GTK_CONTAINER (widget), event);
}
-
+
gtk_container_propagate_expose (GTK_CONTAINER (widget),
priv->arrow_button,
event);
-
+
return FALSE;
}
gint pack_front_size;
gint ipadding;
GtkRequisition arrow_requisition;
-
+
max_homogeneous_child_width = 0;
max_homogeneous_child_height = 0;
max_child_width = 0;
{
GtkRequisition requisition;
ToolbarContent *content = list->data;
- GtkToolItem *item = content->item;
- if (!toolbar_item_visible (toolbar, item))
+ if (!toolbar_content_visible (content, toolbar))
continue;
-
- gtk_widget_size_request (GTK_WIDGET (item), &requisition);
+ toolbar_content_size_request (content, toolbar, &requisition);
+
max_child_width = MAX (max_child_width, requisition.width);
max_child_height = MAX (max_child_height, requisition.height);
-
- if (toolbar_item_is_homogeneous (toolbar, item))
+
+ if (toolbar_content_is_homogeneous (content, toolbar))
{
max_homogeneous_child_width = MAX (max_homogeneous_child_width, requisition.width);
max_homogeneous_child_height = MAX (max_homogeneous_child_height, requisition.height);
for (list = priv->content; list != NULL; list = list->next)
{
ToolbarContent *content = list->data;
- GtkToolItem *item = content->item;
guint size;
- if (!toolbar_item_visible (toolbar, item))
+ if (!toolbar_content_visible (content, toolbar))
continue;
-
- if (toolbar_item_is_homogeneous (toolbar, item))
+
+ if (toolbar_content_is_homogeneous (content, toolbar))
{
size = homogeneous_size;
}
{
GtkRequisition requisition;
- gtk_widget_size_request (GTK_WIDGET (item), &requisition);
-
+ toolbar_content_size_request (content, toolbar, &requisition);
+
if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL)
size = requisition.width;
else
size = requisition.height;
}
-
+
pack_front_size += size;
}
long_req = arrow_requisition.width;
else
long_req = arrow_requisition.height;
-
+
/* There is no point requesting space for the arrow if that would take
* up more space than all the items combined
*/
/* Extra spacing */
ipadding = get_internal_padding (toolbar);
-
+
requisition->width += 2 * (ipadding + GTK_CONTAINER (toolbar)->border_width);
requisition->height += 2 * (ipadding + GTK_CONTAINER (toolbar)->border_width);
-
+
if (get_shadow_type (toolbar) != GTK_SHADOW_NONE)
{
requisition->width += 2 * widget->style->xthickness;
toolbar->button_maxh = max_homogeneous_child_height;
}
+static gint
+position (GtkToolbar *toolbar,
+ gint from,
+ gint to,
+ gdouble elapsed)
+{
+ gint n_pixels;
+
+ if (! GTK_TOOLBAR_GET_PRIVATE (toolbar)->animation)
+ return to;
+
+ if (elapsed <= ACCEL_THRESHOLD)
+ {
+ n_pixels = SLIDE_SPEED * elapsed;
+ }
+ else
+ {
+ /* The formula is a second degree polynomial in
+ * @elapsed that has the line SLIDE_SPEED * @elapsed
+ * as tangent for @elapsed == ACCEL_THRESHOLD.
+ * This makes @n_pixels a smooth function of elapsed time.
+ */
+ n_pixels = (SLIDE_SPEED / ACCEL_THRESHOLD) * elapsed * elapsed -
+ SLIDE_SPEED * elapsed + SLIDE_SPEED * ACCEL_THRESHOLD;
+ }
+
+ if (to > from)
+ return MIN (from + n_pixels, to);
+ else
+ return MAX (from - n_pixels, to);
+}
+
+static void
+compute_intermediate_allocation (GtkToolbar *toolbar,
+ const GtkAllocation *start,
+ const GtkAllocation *goal,
+ GtkAllocation *intermediate)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+ gdouble elapsed = g_timer_elapsed (priv->timer, NULL);
+
+ intermediate->x = position (toolbar, start->x, goal->x, elapsed);
+ intermediate->y = position (toolbar, start->y, goal->y, elapsed);
+ intermediate->width = position (toolbar, start->x + start->width,
+ goal->x + goal->width,
+ elapsed) - intermediate->x;
+ intermediate->height = position (toolbar, start->y + start->height,
+ goal->y + goal->height,
+ elapsed) - intermediate->y;
+}
+
static void
fixup_allocation_for_rtl (gint total_size,
GtkAllocation *allocation)
}
static gint
-get_item_size (GtkToolbar *toolbar,
- GtkWidget *child)
+get_item_size (GtkToolbar *toolbar,
+ ToolbarContent *content)
{
GtkRequisition requisition;
- GtkToolItem *item = GTK_TOOL_ITEM (child);
-
- gtk_widget_get_child_requisition (child, &requisition);
+
+ toolbar_content_size_request (content, toolbar, &requisition);
if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL)
{
- if (toolbar_item_is_homogeneous (toolbar, item))
+ if (toolbar_content_is_homogeneous (content, toolbar))
return toolbar->button_maxw;
else
return requisition.width;
}
else
{
- if (toolbar_item_is_homogeneous (toolbar, item))
+ if (toolbar_content_is_homogeneous (content, toolbar))
return toolbar->button_maxh;
else
return requisition.height;
}
}
-static void
-gtk_toolbar_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation)
+static gboolean
+slide_idle_handler (gpointer data)
{
- GtkToolbar *toolbar = GTK_TOOLBAR (widget);
- GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
- GtkAllocation *allocations;
- ItemState *new_states;
- GtkAllocation arrow_allocation;
- gint arrow_size;
- gint size, pos, short_size;
+ GtkToolbar *toolbar = data;
+ GtkToolbarPrivate *priv;
GList *list;
- gint i;
- gboolean need_arrow;
- gint n_expand_items;
- gint border_width;
+
+ priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
+ if (priv->need_sync)
+ {
+ gdk_flush ();
+ priv->need_sync = FALSE;
+ }
+
+ for (list = priv->content; list != NULL; list = list->next)
+ {
+ ToolbarContent *content = list->data;
+ ItemState state;
+ GtkAllocation goal_allocation;
+ GtkAllocation allocation;
+ gboolean cont;
+
+ state = toolbar_content_get_state (content);
+ toolbar_content_get_goal_allocation (content, &goal_allocation);
+ toolbar_content_get_allocation (content, &allocation);
+
+ cont = FALSE;
+
+ if (state == NOT_ALLOCATED)
+ {
+ /* an unallocated item means that size allocate has to
+ * called at least once more
+ */
+ cont = TRUE;
+ }
+
+ /* An invisible item with a goal allocation of
+ * 0 is already at its goal.
+ */
+ if ((state == NORMAL || state == OVERFLOWN) &&
+ ((goal_allocation.width != 0 &&
+ goal_allocation.height != 0) ||
+ toolbar_content_child_visible (content)))
+ {
+ if ((goal_allocation.x != allocation.x ||
+ goal_allocation.y != allocation.y ||
+ goal_allocation.width != allocation.width ||
+ goal_allocation.height != allocation.height))
+ {
+ /* An item is not in its right position yet. Note
+ * that OVERFLOWN items do get an allocation in
+ * gtk_toolbar_size_allocate(). This way you can see
+ * them slide back in when you drag an item off the
+ * toolbar.
+ */
+ cont = TRUE;
+ }
+ }
+
+ if (toolbar_content_is_placeholder (content) &&
+ toolbar_content_disappearing (content) &&
+ toolbar_content_child_visible (content))
+ {
+ /* A disappearing placeholder is still visible.
+ */
+
+ cont = TRUE;
+ }
+
+ if (cont)
+ {
+ gtk_widget_queue_resize_no_redraw (GTK_WIDGET (toolbar));
+
+ GDK_THREADS_LEAVE ();
+ return TRUE;
+ }
+ }
+
+ priv->is_sliding = FALSE;
+ priv->idle_id = 0;
+
+ return FALSE;
+}
+
+static gboolean
+rect_within (GtkAllocation *a1,
+ GtkAllocation *a2)
+{
+ return (a1->x >= a2->x &&
+ a1->x + a1->width <= a2->x + a2->width &&
+ a1->y >= a2->y &&
+ a1->y + a1->height <= a2->y + a2->height);
+}
+
+static void
+gtk_toolbar_begin_sliding (GtkToolbar *toolbar)
+{
+ GtkWidget *widget = GTK_WIDGET (toolbar);
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+ GList *list;
+ gint cur_x;
+ gint cur_y;
+ gint border_width;
+ gboolean rtl;
+ gboolean vertical;
+
+ /* Start the sliding. This function copies the allocation of every
+ * item into content->start_allocation. For items that haven't
+ * been allocated yet, we calculate their position and save that
+ * in start_allocatino along with zero width and zero height.
+ *
+ * FIXME: It would be nice if we could share this code with
+ * the equivalent in gtk_widget_size_allocate().
+ */
+ priv->is_sliding = TRUE;
+
+ if (!priv->idle_id)
+ priv->idle_id = gdk_threads_add_idle (slide_idle_handler, toolbar);
+
+ rtl = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);
+ vertical = (toolbar->orientation == GTK_ORIENTATION_VERTICAL);
+ border_width = get_internal_padding (toolbar) + GTK_CONTAINER (toolbar)->border_width;
+
+ if (rtl)
+ {
+ cur_x = widget->allocation.width - border_width - widget->style->xthickness;
+ cur_y = widget->allocation.height - border_width - widget->style->ythickness;
+ }
+ else
+ {
+ cur_x = border_width + widget->style->xthickness;
+ cur_y = border_width + widget->style->ythickness;
+ }
+
+ cur_x += widget->allocation.x;
+ cur_y += widget->allocation.y;
+
+ for (list = priv->content; list != NULL; list = list->next)
+ {
+ ToolbarContent *content = list->data;
+ GtkAllocation new_start_allocation;
+ GtkAllocation item_allocation;
+ ItemState state;
+
+ state = toolbar_content_get_state (content);
+ toolbar_content_get_allocation (content, &item_allocation);
+
+ if ((state == NORMAL &&
+ rect_within (&item_allocation, &(widget->allocation))) ||
+ state == OVERFLOWN)
+ {
+ new_start_allocation = item_allocation;
+ }
+ else
+ {
+ new_start_allocation.x = cur_x;
+ new_start_allocation.y = cur_y;
+
+ if (vertical)
+ {
+ new_start_allocation.width = widget->allocation.width -
+ 2 * border_width - 2 * widget->style->xthickness;
+ new_start_allocation.height = 0;
+ }
+ else
+ {
+ new_start_allocation.width = 0;
+ new_start_allocation.height = widget->allocation.height -
+ 2 * border_width - 2 * widget->style->ythickness;
+ }
+ }
+
+ if (vertical)
+ cur_y = new_start_allocation.y + new_start_allocation.height;
+ else if (rtl)
+ cur_x = new_start_allocation.x;
+ else
+ cur_x = new_start_allocation.x + new_start_allocation.width;
+
+ toolbar_content_set_start_allocation (content, &new_start_allocation);
+ }
+
+ /* This resize will run before the first idle handler. This
+ * will make sure that items get the right goal allocation
+ * so that the idle handler will not immediately return
+ * FALSE
+ */
+ gtk_widget_queue_resize_no_redraw (GTK_WIDGET (toolbar));
+ g_timer_reset (priv->timer);
+}
+
+static void
+gtk_toolbar_stop_sliding (GtkToolbar *toolbar)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
+ if (priv->is_sliding)
+ {
+ GList *list;
+
+ priv->is_sliding = FALSE;
+
+ if (priv->idle_id)
+ {
+ g_source_remove (priv->idle_id);
+ priv->idle_id = 0;
+ }
+
+ list = priv->content;
+ while (list)
+ {
+ ToolbarContent *content = list->data;
+ list = list->next;
+
+ if (toolbar_content_is_placeholder (content))
+ {
+ toolbar_content_remove (content, toolbar);
+ toolbar_content_free (content);
+ }
+ }
+
+ gtk_widget_queue_resize_no_redraw (GTK_WIDGET (toolbar));
+ }
+}
+
+static void
+remove_item (GtkWidget *menu_item,
+ gpointer data)
+{
+ gtk_container_remove (GTK_CONTAINER (menu_item->parent), menu_item);
+}
+
+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
+menu_detached (GtkWidget *toolbar,
+ GtkMenu *menu)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+ priv->menu = NULL;
+}
+
+static void
+rebuild_menu (GtkToolbar *toolbar)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+ GList *list, *children;
+
+ if (!priv->menu)
+ {
+ priv->menu = GTK_MENU (gtk_menu_new());
+ gtk_menu_attach_to_widget (priv->menu,
+ GTK_WIDGET (toolbar),
+ menu_detached);
+
+ g_signal_connect (priv->menu, "deactivate", G_CALLBACK (menu_deactivated), toolbar);
+ }
+
+ gtk_container_foreach (GTK_CONTAINER (priv->menu), remove_item, NULL);
+
+ for (list = priv->content; list != NULL; list = list->next)
+ {
+ ToolbarContent *content = list->data;
+
+ if (toolbar_content_get_state (content) == OVERFLOWN &&
+ !toolbar_content_is_placeholder (content))
+ {
+ GtkWidget *menu_item = toolbar_content_retrieve_menu_item (content);
+
+ if (menu_item)
+ {
+ g_assert (GTK_IS_MENU_ITEM (menu_item));
+ gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), menu_item);
+ }
+ }
+ }
+
+ /* Remove leading and trailing separator items */
+ children = gtk_container_get_children (GTK_CONTAINER (priv->menu));
+
+ list = children;
+ while (list && GTK_IS_SEPARATOR_MENU_ITEM (list->data))
+ {
+ GtkWidget *child = list->data;
+
+ gtk_container_remove (GTK_CONTAINER (priv->menu), child);
+ list = list->next;
+ }
+ g_list_free (children);
+
+ /* Regenerate the list of children so we don't try to remove items twice */
+ children = gtk_container_get_children (GTK_CONTAINER (priv->menu));
+
+ list = g_list_last (children);
+ while (list && GTK_IS_SEPARATOR_MENU_ITEM (list->data))
+ {
+ GtkWidget *child = list->data;
+
+ gtk_container_remove (GTK_CONTAINER (priv->menu), child);
+ list = list->prev;
+ }
+ g_list_free (children);
+
+ priv->need_rebuild = FALSE;
+}
+
+static void
+gtk_toolbar_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation)
+{
+ GtkToolbar *toolbar = GTK_TOOLBAR (widget);
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+ GtkAllocation *allocations;
+ ItemState *new_states;
+ 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;
GtkRequisition arrow_requisition;
- gint n_overflowed;
gboolean overflowing;
-
+ gboolean size_changed;
+ GtkAllocation item_area;
+
+ size_changed = FALSE;
+ if (widget->allocation.x != allocation->x ||
+ widget->allocation.y != allocation->y ||
+ widget->allocation.width != allocation->width ||
+ widget->allocation.height != allocation->height)
+ {
+ size_changed = TRUE;
+ }
+
+ if (size_changed)
+ gtk_toolbar_stop_sliding (toolbar);
+
widget->allocation = *allocation;
-
+
border_width = GTK_CONTAINER (toolbar)->border_width;
-
+
if (GTK_WIDGET_REALIZED (widget))
{
gdk_window_move_resize (priv->event_window,
available_size = size = allocation->width - 2 * border_width;
short_size = allocation->height - 2 * border_width;
arrow_size = arrow_requisition.width;
-
+
if (get_shadow_type (toolbar) != GTK_SHADOW_NONE)
{
available_size -= 2 * widget->style->xthickness;
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);
new_states = g_new0 (ItemState, n_items);
-
+
needed_size = 0;
+ need_arrow = FALSE;
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 (toolbar_content_visible (content, toolbar))
+ {
+ needed_size += get_item_size (toolbar, content);
+ /* Do we need an arrow?
+ *
+ * Assume we don't, and see if any non-separator item with a
+ * proxy menu item is then going to overflow.
+ */
+ if (needed_size > available_size &&
+ !need_arrow &&
+ priv->show_arrow &&
+ priv->api_mode == NEW_API &&
+ toolbar_content_has_proxy_menu_item (content) &&
+ !toolbar_content_is_separator (content))
+ {
+ need_arrow = TRUE;
+ }
+ }
+ }
+
if (need_arrow)
size = available_size - arrow_size;
else
size = available_size;
-
- n_overflowed = 0;
-
- /* calculate widths of items */
+
+ /* calculate widths and states of items */
overflowing = FALSE;
for (list = priv->content, i = 0; list != NULL; list = list->next, ++i)
{
ToolbarContent *content = list->data;
- GtkToolItem *item = content->item;
gint item_size;
-
- if (!toolbar_item_visible (toolbar, item))
+
+ if (!toolbar_content_visible (content, toolbar))
{
new_states[i] = HIDDEN;
continue;
}
-
- item_size = get_item_size (toolbar, GTK_WIDGET (item));
+
+ item_size = get_item_size (toolbar, content);
if (item_size <= size && !overflowing)
{
size -= item_size;
}
else
{
- ++n_overflowed;
overflowing = TRUE;
new_states[i] = OVERFLOWN;
+ allocations[i].width = item_size;
}
}
-
+
/* calculate width of arrow */
if (need_arrow)
{
arrow_allocation.width = arrow_size;
- arrow_allocation.height = short_size;
+ arrow_allocation.height = MAX (short_size, 1);
}
/* 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
+
+ /* We don't expand when there is an overflow menu, because that leads to
+ * weird jumps when items get moved to the overflow menu and the expanding
+ * items suddenly get a lot of extra space
*/
- if (!(priv->in_dnd && n_overflowed > priv->n_overflow_items_when_dnd_started))
+ if (!overflowing)
{
+ gint max_child_expand;
n_expand_items = 0;
+
for (i = 0, list = priv->content; list != NULL; list = list->next, ++i)
{
ToolbarContent *content = list->data;
- GtkToolItem *item = content->item;
- if (gtk_tool_item_get_expand (item) && new_states[i] == NORMAL)
+ if (toolbar_content_get_expand (content) && new_states[i] == NORMAL)
n_expand_items++;
}
+ max_child_expand = get_max_child_expand (toolbar);
for (list = priv->content, i = 0; list != NULL; list = list->next, ++i)
{
ToolbarContent *content = list->data;
- GtkToolItem *item = content->item;
- if (gtk_tool_item_get_expand (item) && new_states[i] == NORMAL)
+ if (toolbar_content_get_expand (content) && new_states[i] == NORMAL)
{
gint extra = size / n_expand_items;
if (size % n_expand_items != 0)
extra++;
-
+
+ if (extra > max_child_expand)
+ extra = max_child_expand;
+
allocations[i].width += extra;
size -= extra;
n_expand_items--;
pos = border_width;
for (list = priv->content, i = 0; list != NULL; list = list->next, ++i)
{
- if (new_states[i] == NORMAL)
+ /* both NORMAL and OVERFLOWN items get a position. This ensures
+ * that sliding will work for OVERFLOWN items too
+ */
+ if (new_states[i] == NORMAL ||
+ new_states[i] == OVERFLOWN)
{
allocations[i].x = pos;
allocations[i].y = border_width;
allocations[i].height = short_size;
-
+
pos += allocations[i].width;
}
}
-
+
/* position arrow */
if (need_arrow)
{
arrow_allocation.y = border_width;
}
+ item_area.x = border_width;
+ item_area.y = border_width;
+ item_area.width = available_size - (need_arrow? arrow_size : 0);
+ item_area.height = short_size;
+
/* fix up allocations in the vertical or RTL cases */
if (toolbar->orientation == GTK_ORIENTATION_VERTICAL)
{
if (need_arrow)
fixup_allocation_for_vertical (&arrow_allocation);
+
+ fixup_allocation_for_vertical (&item_area);
}
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);
+
+ fixup_allocation_for_rtl (available_size, &item_area);
}
/* translate the items by allocation->(x,y) */
{
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 */
+
+ item_area.x += allocation->x;
+ item_area.y += allocation->y;
+ if (get_shadow_type (toolbar) != GTK_SHADOW_NONE)
+ {
+ item_area.x += widget->style->xthickness;
+ item_area.y += widget->style->ythickness;
+ }
+
+ /* did anything change? */
for (list = priv->content, i = 0; list != NULL; list = list->next, i++)
{
ToolbarContent *content = list->data;
- GtkToolItem *item = content->item;
- if (new_states[i] == NORMAL)
+ if (toolbar_content_get_state (content) == NORMAL &&
+ new_states[i] != NORMAL)
{
- gtk_widget_size_allocate (GTK_WIDGET (item), &(allocations[i]));
- gtk_widget_set_child_visible (GTK_WIDGET (item), TRUE);
+ /* an item disappeared and we didn't change size, so begin sliding */
+ if (!size_changed && priv->api_mode == NEW_API)
+ gtk_toolbar_begin_sliding (toolbar);
}
- else
+ }
+
+ /* finally allocate the items */
+ if (priv->is_sliding)
+ {
+ for (list = priv->content, i = 0; list != NULL; list = list->next, i++)
{
- gtk_widget_set_child_visible (GTK_WIDGET (item), FALSE);
+ ToolbarContent *content = list->data;
+
+ toolbar_content_set_goal_allocation (content, &(allocations[i]));
}
-
- content->state = new_states[i];
}
+ for (list = priv->content, i = 0; list != NULL; list = list->next, ++i)
+ {
+ ToolbarContent *content = list->data;
+
+ if (new_states[i] == OVERFLOWN ||
+ new_states[i] == NORMAL)
+ {
+ GtkAllocation alloc;
+ GtkAllocation start_allocation = { 0, };
+ GtkAllocation goal_allocation;
+
+ if (priv->is_sliding)
+ {
+ toolbar_content_get_start_allocation (content, &start_allocation);
+ toolbar_content_get_goal_allocation (content, &goal_allocation);
+
+ compute_intermediate_allocation (toolbar,
+ &start_allocation,
+ &goal_allocation,
+ &alloc);
+
+ priv->need_sync = TRUE;
+ }
+ else
+ {
+ alloc = allocations[i];
+ }
+
+ if (alloc.width <= 0 || alloc.height <= 0)
+ {
+ toolbar_content_set_child_visible (content, toolbar, FALSE);
+ }
+ else
+ {
+ if (!rect_within (&alloc, &item_area))
+ {
+ toolbar_content_set_child_visible (content, toolbar, FALSE);
+ toolbar_content_size_allocate (content, &alloc);
+ }
+ else
+ {
+ toolbar_content_set_child_visible (content, toolbar, TRUE);
+ toolbar_content_size_allocate (content, &alloc);
+ }
+ }
+ }
+ else
+ {
+ toolbar_content_set_child_visible (content, toolbar, FALSE);
+ }
+
+ toolbar_content_set_state (content, new_states[i]);
+ }
+
+ if (priv->menu && priv->need_rebuild)
+ rebuild_menu (toolbar);
+
if (need_arrow)
{
gtk_widget_size_allocate (GTK_WIDGET (priv->arrow_button),
else
{
gtk_widget_hide (GTK_WIDGET (priv->arrow_button));
+
+ if (priv->menu && GTK_WIDGET_VISIBLE (priv->menu))
+ gtk_menu_shell_deactivate (GTK_MENU_SHELL (priv->menu));
}
-
+
g_free (allocations);
g_free (new_states);
}
+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 void
gtk_toolbar_style_set (GtkWidget *widget,
GtkStyle *prev_style)
{
GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (widget);
-
+
priv->max_homogeneous_pixels = -1;
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)
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;
+ GtkWidget *widget;
+
+ widget = toolbar_content_get_widget (content);
- result = g_list_prepend (result, item);
+ if (widget)
+ result = g_list_prepend (result, widget);
}
-
+
result = g_list_prepend (result, priv->arrow_button);
-
+
rtl = (gtk_widget_get_direction (GTK_WIDGET (toolbar)) == GTK_TEXT_DIR_RTL);
/* move in logical order when
{
result = g_list_reverse (result);
}
-
+
return result;
}
{
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;
gboolean try_focus = FALSE;
GList *children;
GtkContainer *container = GTK_CONTAINER (toolbar);
-
+
if (container->focus_child &&
gtk_widget_child_focus (container->focus_child, dir))
{
}
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;
}
{
GtkToolbar *toolbar = GTK_TOOLBAR (widget);
GList *children, *list;
-
+ gboolean result = FALSE;
+
/* 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
GtkWidget *child = list->data;
if (GTK_WIDGET_MAPPED (child) && gtk_widget_child_focus (child, dir))
- return TRUE;
+ {
+ result = TRUE;
+ break;
+ }
}
g_list_free (children);
-
- return FALSE;
+
+ return result;
+}
+
+static GtkSettings *
+toolbar_get_settings (GtkToolbar *toolbar)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+ return priv->settings;
}
static void
if (!toolbar->style_set)
{
/* pretend it was set, then unset, thus reverting to new default */
- toolbar->style_set = TRUE;
+ 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;
+ toolbar->icon_size_set = TRUE;
gtk_toolbar_unset_icon_size (toolbar);
}
}
-static GtkSettings *
-toolbar_get_settings (GtkToolbar *toolbar)
+static void
+animation_change_notify (GtkToolbar *toolbar)
{
GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
- return priv->settings;
+ GtkSettings *settings = toolbar_get_settings (toolbar);
+ gboolean animation;
+
+ if (settings)
+ g_object_get (settings,
+ "gtk-enable-animations", &animation,
+ NULL);
+ else
+ animation = DEFAULT_ANIMATION_STATE;
+
+ priv->animation = animation;
+}
+
+static void
+settings_change_notify (GtkSettings *settings,
+ const GParamSpec *pspec,
+ GtkToolbar *toolbar)
+{
+ if (! strcmp (pspec->name, "gtk-toolbar-style"))
+ style_change_notify (toolbar);
+ else if (! strcmp (pspec->name, "gtk-toolbar-icon-size"))
+ icon_size_change_notify (toolbar);
+ else if (! strcmp (pspec->name, "gtk-enable-animations"))
+ animation_change_notify (toolbar);
}
static void
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_signal_handler_disconnect (old_settings, priv->settings_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);
+ priv->settings_connection =
+ g_signal_connect (settings, "notify",
+ G_CALLBACK (settings_change_notify),
+ toolbar);
- g_object_ref (settings);
- priv->settings = settings;
+ priv->settings = g_object_ref (settings);
}
else
priv->settings = NULL;
style_change_notify (toolbar);
icon_size_change_notify (toolbar);
+ animation_change_notify (toolbar);
}
static int
gint cursor;
gint pos;
ToolbarContent *best_content;
+ GtkAllocation allocation;
/* 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;
-
- if (content->state == NORMAL)
+
+ if (toolbar_content_get_state (content) == NORMAL)
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;
-
+ toolbar_content_get_allocation (best_content, &allocation);
+
if (orientation == GTK_ORIENTATION_HORIZONTAL)
{
cursor = x;
if (direction == GTK_TEXT_DIR_LTR)
- pos = GTK_WIDGET (best_content->item)->allocation.x;
+ pos = allocation.x;
else
- pos = GTK_WIDGET (best_content->item)->allocation.x +
- GTK_WIDGET (best_content->item)->allocation.width;
+ pos = allocation.x + allocation.width;
}
else
{
cursor = y;
- pos = GTK_WIDGET (best_content->item)->allocation.y;
+ pos = 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);
-
+
+ toolbar_content_get_allocation (content, &allocation);
+
if (orientation == GTK_ORIENTATION_HORIZONTAL)
{
if (direction == GTK_TEXT_DIR_LTR)
- pos = widget->allocation.x + widget->allocation.width;
+ pos = allocation.x + allocation.width;
else
- pos = widget->allocation.x;
+ pos = allocation.x;
}
else
{
- pos = widget->allocation.y + widget->allocation.height;
+ pos = allocation.y + allocation.height;
}
distance = ABS (pos - cursor);
best_content = content;
}
}
-
+
g_list_free (interesting_content);
-
+
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));
-
- 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;
- }
-
- GDK_THREADS_LEAVE();
-
- return FALSE;
- }
-
- GDK_THREADS_LEAVE();
-
- 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;
- }
+ if (toolbar_content_is_placeholder (content))
+ toolbar_content_set_disappearing (content, TRUE);
}
-
- g_timer_reset (priv->timer);
}
static gint
-physical_to_logical (GtkToolbar *toolbar, gint physical)
+physical_to_logical (GtkToolbar *toolbar,
+ gint physical)
{
GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
GList *list;
int logical;
-
+
g_assert (physical >= 0);
logical = 0;
{
ToolbarContent *content = list->data;
- if (!content->is_placeholder)
+ if (!toolbar_content_is_placeholder (content))
logical++;
physical--;
}
-
+
g_assert (physical == 0);
return logical;
}
static gint
-logical_to_physical (GtkToolbar *toolbar, gint logical)
+logical_to_physical (GtkToolbar *toolbar,
+ gint logical)
{
GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
GList *list;
gint physical;
-
+
g_assert (logical >= 0);
physical = 0;
for (list = priv->content; list; list = list->next)
{
ToolbarContent *content = list->data;
-
- if (!content->is_placeholder)
+
+ if (!toolbar_content_is_placeholder (content))
{
if (logical == 0)
break;
physical++;
}
-
+
g_assert (logical == 0);
return physical;
/**
* gtk_toolbar_set_drop_highlight_item:
* @toolbar: a #GtkToolbar
- * @item: a #GtkToolItem, or %NULL to turn of highlighting
- * @index: a position on @toolbar
+ * @tool_item: a #GtkToolItem, or %NULL to turn of highlighting
+ * @index_: a position on @toolbar
*
* Highlights @toolbar to give an idea of what it would look like
- * if @item was added to @toolbar at position indicated by @index. If @item
- * is %NULL, highlighting is turned off. In that case @index is ignored.
+ * if @item was added to @toolbar at the position indicated by @index_.
+ * If @item is %NULL, highlighting is turned off. In that case @index_
+ * is ignored.
*
* The @tool_item passed to this function must not be part of any widget
* hierarchy. When an item is set as drop highlight item it can not
void
gtk_toolbar_set_drop_highlight_item (GtkToolbar *toolbar,
GtkToolItem *tool_item,
- gint index)
+ gint index_)
{
ToolbarContent *content;
GtkToolbarPrivate *priv;
- gint start_width, start_height;
- GList *list;
gint n_items;
GtkRequisition requisition;
-
+ GtkRequisition old_requisition;
+ gboolean restart_sliding;
+
g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
g_return_if_fail (tool_item == NULL || GTK_IS_TOOL_ITEM (tool_item));
-
+
+ gtk_toolbar_check_new_api (toolbar);
+
priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
-
+
if (!tool_item)
{
- if (priv->in_dnd)
+ if (priv->highlight_tool_item)
{
- priv->leaving_dnd = TRUE;
- reset_all_placeholders (toolbar);
- ensure_idle_handler (toolbar);
-
- if (priv->highlight_tool_item)
- {
- gtk_widget_unparent (GTK_WIDGET (priv->highlight_tool_item));
- g_object_unref (priv->highlight_tool_item);
- priv->highlight_tool_item = NULL;
- }
+ gtk_widget_unparent (GTK_WIDGET (priv->highlight_tool_item));
+ g_object_unref (priv->highlight_tool_item);
+ priv->highlight_tool_item = NULL;
}
+ reset_all_placeholders (toolbar);
+ gtk_toolbar_begin_sliding (toolbar);
return;
}
-
+
+ n_items = gtk_toolbar_get_n_items (toolbar);
+ if (index_ < 0 || index_ > n_items)
+ index_ = n_items;
+
if (tool_item != priv->highlight_tool_item)
{
if (priv->highlight_tool_item)
g_object_unref (priv->highlight_tool_item);
-
- g_object_ref (tool_item);
- gtk_object_sink (GTK_OBJECT (tool_item));
-
+
+ g_object_ref_sink (tool_item);
+
priv->highlight_tool_item = tool_item;
gtk_widget_set_parent (GTK_WIDGET (priv->highlight_tool_item),
GTK_WIDGET (toolbar));
}
-
- 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->state == OVERFLOWN)
- priv->n_overflow_items_when_dnd_started++;
- }
- }
- priv->in_dnd = TRUE;
- priv->leaving_dnd = FALSE;
-
- n_items = gtk_toolbar_get_n_items (toolbar);
- if (index < 0 || index > n_items)
- index = n_items;
+ index_ = logical_to_physical (toolbar, index_);
- index = logical_to_physical (toolbar, index);
+ content = g_list_nth_data (priv->content, index_);
- content = g_list_nth_data (priv->content, index);
-
- if (index > 0)
+ if (index_ > 0)
{
ToolbarContent *prev_content;
-
- prev_content = g_list_nth_data (priv->content, index - 1);
-
- if (prev_content && prev_content->is_placeholder)
+
+ prev_content = g_list_nth_data (priv->content, index_ - 1);
+
+ if (prev_content && toolbar_content_is_placeholder (prev_content))
content = prev_content;
}
- if (!content || !content->is_placeholder)
+ if (!content || !toolbar_content_is_placeholder (content))
{
GtkWidget *placeholder;
-
+
placeholder = GTK_WIDGET (gtk_separator_tool_item_new ());
- gtk_widget_set_size_request (placeholder, 0, 0);
- content = gtk_toolbar_insert_tool_item (toolbar,
- GTK_TOOL_ITEM (placeholder),
- index, TRUE);
- start_width = start_height = 0;
- }
- else
- {
- get_size (content->item, &start_width, &start_height);
- }
+ content = toolbar_content_new_tool_item (toolbar,
+ GTK_TOOL_ITEM (placeholder),
+ TRUE, index_);
+ gtk_widget_show (placeholder);
+ }
+
g_assert (content);
- g_assert (content->is_placeholder);
-
+ g_assert (toolbar_content_is_placeholder (content));
+
gtk_widget_size_request (GTK_WIDGET (priv->highlight_tool_item),
&requisition);
+
+ toolbar_content_set_expand (content, gtk_tool_item_get_expand (tool_item));
- if (content->start_width != start_width ||
- content->start_height != start_height ||
- content->goal_width != requisition.width ||
- content->goal_height != requisition.height)
+ restart_sliding = FALSE;
+ toolbar_content_size_request (content, toolbar, &old_requisition);
+ if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL)
{
- reset_all_placeholders (toolbar);
-
- content->start_width = start_width;
- content->goal_width = requisition.width;
- content->start_height = start_height;
- content->goal_height = requisition.height;
-
- ensure_idle_handler (toolbar);
+ requisition.height = -1;
+ if (requisition.width != old_requisition.width)
+ restart_sliding = TRUE;
+ }
+ else
+ {
+ requisition.width = -1;
+ if (requisition.height != old_requisition.height)
+ restart_sliding = TRUE;
}
-}
-void
-gtk_toolbar_unhighlight_drop_location (GtkToolbar *toolbar)
-{
+ if (toolbar_content_disappearing (content))
+ restart_sliding = TRUE;
+
+ reset_all_placeholders (toolbar);
+ toolbar_content_set_disappearing (content, FALSE);
+
+ toolbar_content_set_size_request (content,
+ requisition.width, requisition.height);
+
+ if (restart_sliding)
+ gtk_toolbar_begin_sliding (toolbar);
}
static void
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;
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));
+ gtk_tool_item_set_expand (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_show_all (GtkWidget *widget)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (widget);
+ GList *list;
+
+ for (list = priv->content; list != NULL; list = list->next)
+ {
+ ToolbarContent *content = list->data;
+
+ toolbar_content_show_all (content);
+ }
+
+ gtk_widget_show (widget);
+}
+
+static void
+gtk_toolbar_hide_all (GtkWidget *widget)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (widget);
+ GList *list;
+
+ for (list = priv->content; list != NULL; list = list->next)
+ {
+ ToolbarContent *content = list->data;
+
+ toolbar_content_hide_all (content);
+ }
+
+ gtk_widget_hide (widget);
+}
+
static void
gtk_toolbar_add (GtkContainer *container,
GtkWidget *widget)
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);
+ gtk_toolbar_insert (toolbar, GTK_TOOL_ITEM (widget), -1);
else
gtk_toolbar_append_widget (toolbar, widget, NULL, NULL);
}
GtkWidget *widget)
{
GtkToolbar *toolbar;
- GtkToolItem *item = NULL;
+ GtkToolbarPrivate *priv;
+ ToolbarContent *content_to_remove;
+ GList *list;
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
+ priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
+ content_to_remove = NULL;
+ for (list = priv->content; list != NULL; list = list->next)
{
- GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
- GList *list;
+ ToolbarContent *content = list->data;
+ GtkWidget *child;
- for (list = priv->content; list != NULL; list = list->next)
+ child = toolbar_content_get_widget (content);
+ if (child && child == widget)
{
- ToolbarContent *content = list->data;
-
- if (GTK_BIN (content->item)->child == widget)
- {
- item = content->item;
- break;
- }
+ content_to_remove = content;
+ break;
}
}
-
- g_return_if_fail (item != NULL);
-
- gtk_toolbar_remove_tool_item (GTK_TOOLBAR (container), item);
+
+ g_return_if_fail (content_to_remove != NULL);
+
+ toolbar_content_remove (content_to_remove, toolbar);
+ toolbar_content_free (content_to_remove);
}
static void
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;
-
- if (!content->is_placeholder || include_internals)
- (*callback) (GTK_WIDGET (content->item), callback_data);
+
+ if (include_internals || !toolbar_content_is_placeholder (content))
+ {
+ GtkWidget *child = toolbar_content_get_widget (content);
+
+ if (child)
+ (*callback) (child, callback_data);
+ }
list = next;
}
{
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);
+ toolbar_content_toolbar_reconfigured (content, toolbar);
list = next;
}
}
static void
-gtk_toolbar_real_orientation_changed (GtkToolbar *toolbar,
- GtkOrientation orientation)
+gtk_toolbar_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)
+ else
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");
}
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");
+ g_object_notify (G_OBJECT (toolbar), "toolbar-style");
}
}
GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
GtkRequisition req;
GtkRequisition menu_req;
+ GdkRectangle monitor;
+ gint monitor_num;
+ GdkScreen *screen;
- 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);
+ screen = gtk_widget_get_screen (GTK_WIDGET (menu));
+ monitor_num = gdk_screen_get_monitor_at_window (screen, priv->arrow_button->window);
+ if (monitor_num < 0)
+ monitor_num = 0;
+ gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+
+ gdk_window_get_origin (GTK_BUTTON (priv->arrow_button)->event_window, x, y);
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;
+
+ if ((*y + priv->arrow_button->allocation.height + menu_req.height) <= monitor.y + monitor.height)
+ *y += priv->arrow_button->allocation.height;
+ else if ((*y - menu_req.height) >= monitor.y)
+ *y -= menu_req.height;
+ else if (monitor.y + monitor.height - (*y + priv->arrow_button->allocation.height) > *y)
+ *y += priv->arrow_button->allocation.height;
+ else
+ *y -= menu_req.height;
}
else
{
*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);
-}
+ if (*y + menu_req.height > monitor.y + monitor.height &&
+ *y + priv->arrow_button->allocation.height - monitor.y > monitor.y + monitor.height - *y)
+ *y += priv->arrow_button->allocation.height - menu_req.height;
+ }
-static void
-remove_item (GtkWidget *menu_item,
- gpointer data)
-{
- gtk_container_remove (GTK_CONTAINER (menu_item->parent), menu_item);
+ *push_in = FALSE;
}
static void
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 (content->state == OVERFLOWN)
- {
- 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);
- }
- }
- }
+ rebuild_menu (toolbar);
gtk_widget_show_all (GTK_WIDGET (priv->menu));
- gtk_menu_popup (GTK_MENU (priv->menu), NULL, NULL,
+ gtk_menu_popup (priv->menu, NULL, NULL,
menu_position_func, toolbar,
- event? event->button : 0, event? event->time : gtk_get_current_event_time());
+ event? event->button : 0,
+ event? event->time : gtk_get_current_event_time());
}
static void
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))))
+ (!priv->menu || !GTK_WIDGET_VISIBLE (priv->menu)))
{
- /* We only get here when the button is clicked with the keybaord,
+ /* We only get here when the button is clicked with the keyboard,
* because mouse button presses result in the menu being shown so
* that priv->menu would be non-NULL and visible.
*/
{
show_menu (toolbar, event);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
-
+
return TRUE;
}
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;
}
*/
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)
+/**
+ * gtk_toolbar_new:
+ *
+ * Creates a new toolbar.
+
+ * Return Value: the newly-created toolbar.
+ **/
+GtkWidget *
+gtk_toolbar_new (void)
{
- GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
-
- gtk_toolbar_reconfigured (toolbar);
-
- gtk_button_set_relief (GTK_BUTTON (priv->arrow_button), get_button_relief (toolbar));
+ GtkToolbar *toolbar;
+
+ toolbar = g_object_new (GTK_TYPE_TOOLBAR, NULL);
+
+ return GTK_WIDGET (toolbar);
}
-static GtkReliefStyle
-get_button_relief (GtkToolbar *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)
{
- GtkReliefStyle button_relief = GTK_RELIEF_NORMAL;
-
- gtk_widget_ensure_style (GTK_WIDGET (toolbar));
+ g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
+ g_return_if_fail (GTK_IS_TOOL_ITEM (item));
- gtk_widget_style_get (GTK_WIDGET (toolbar),
- "button_relief", &button_relief,
- NULL);
+ if (!gtk_toolbar_check_new_api (toolbar))
+ return;
+
+ if (pos >= 0)
+ pos = logical_to_physical (toolbar, pos);
- return button_relief;
+ toolbar_content_new_tool_item (toolbar, item, FALSE, pos);
}
-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 ToolbarContent *
-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_placeholder = is_placeholder;
- content->item = item;
- content->state = NOT_ALLOCATED;
- toolbar->num_children++;
-
- priv->content = g_list_insert (priv->content, content, pos);
-
- gtk_widget_set_parent (GTK_WIDGET (item), GTK_WIDGET (toolbar));
- return content;
-}
-
-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;
-
- if (pos >= 0)
- pos = logical_to_physical (toolbar, pos);
-
- gtk_toolbar_insert_tool_item (toolbar, item, 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)
+/**
+ * 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)
+ GtkWidget *widget;
+
+ widget = toolbar_content_get_widget (content);
+
+ if (item == GTK_TOOL_ITEM (widget))
break;
++n;
}
-
+
return physical_to_logical (toolbar, n);
}
GtkOrientation orientation)
{
g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
-
+
g_signal_emit (toolbar, toolbar_signals[ORIENTATION_CHANGED], 0, orientation);
}
gtk_toolbar_get_orientation (GtkToolbar *toolbar)
{
g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), GTK_ORIENTATION_HORIZONTAL);
-
+
return toolbar->orientation;
}
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 (GtkToolbar *toolbar)
{
g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), DEFAULT_TOOLBAR_STYLE);
-
+
return toolbar->style;
}
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;
}
}
gboolean enable)
{
g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
-
+
if (enable)
gtk_tooltips_enable (toolbar->tooltips);
else
gtk_tooltips_disable (toolbar->tooltips);
+
+ g_object_notify (G_OBJECT (toolbar), "tooltips");
}
/**
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 (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);
-
+
return physical_to_logical (toolbar, g_list_length (priv->content));
}
* @toolbar: a #GtkToolbar
* @n: A position on the toolbar
*
- * Returns the @n<!-- -->'s item on @toolbar, or %NULL if the
+ * Returns the @n<!-- -->'th 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.
+ * isn't an @n<!-- -->'th item.
*
* Since: 2.4
**/
gint n_items;
g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), NULL);
-
+
if (!gtk_toolbar_check_new_api (toolbar))
return NULL;
-
+
n_items = gtk_toolbar_get_n_items (toolbar);
-
+
if (n < 0 || n >= n_items)
return NULL;
priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
-
+
content = g_list_nth_data (priv->content, logical_to_physical (toolbar, n));
-
+
g_assert (content);
- g_assert (!content->is_placeholder);
-
- return content->item;
-}
-
-/**
- * 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));
-
- toolbar->icon_size_set = TRUE;
-
- if (toolbar->icon_size == icon_size)
- return;
-
- toolbar->icon_size = icon_size;
-
- gtk_toolbar_reconfigured (toolbar);
-
- gtk_widget_queue_resize (GTK_WIDGET (toolbar));
+ g_assert (!toolbar_content_is_placeholder (content));
+
+ return GTK_TOOL_ITEM (toolbar_content_get_widget (content));
}
/**
* gtk_toolbar_get_icon_size:
* @toolbar: a #GtkToolbar
*
- * Retrieves the icon size fo the toolbar. See gtk_toolbar_set_icon_size().
+ * Retrieves the icon size for the toolbar. See gtk_toolbar_set_icon_size().
*
* Return value: the current icon size for the icons on the toolbar.
**/
gtk_toolbar_get_icon_size (GtkToolbar *toolbar)
{
g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), DEFAULT_ICON_SIZE);
-
+
return toolbar->icon_size;
}
* @toolbar: a #GtkToolbar
*
* Returns the relief style of buttons on @toolbar. See
- * gtk_button_set_relief_style().
+ * gtk_button_set_relief().
*
* Return value: The relief style of buttons on @toolbar.
*
gtk_toolbar_get_relief_style (GtkToolbar *toolbar)
{
g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), GTK_RELIEF_NONE);
-
+
return get_button_relief (toolbar);
}
/**
- * gtk_toolbar_unset_icon_size:
+ * gtk_toolbar_set_show_arrow:
* @toolbar: a #GtkToolbar
+ * @show_arrow: Whether to show an overflow menu
*
- * Unsets toolbar icon size set with gtk_toolbar_set_icon_size(), so that
- * user preferences will be used to determine the icon size.
+ * 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_unset_icon_size (GtkToolbar *toolbar)
+gtk_toolbar_set_show_arrow (GtkToolbar *toolbar,
+ gboolean show_arrow)
{
- GtkIconSize size;
-
+ GtkToolbarPrivate *priv;
+
g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
- if (toolbar->icon_size_set)
- {
- GtkSettings *settings = toolbar_get_settings (toolbar);
-
- if (settings)
- {
- 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);
-
- toolbar->icon_size_set = FALSE;
- }
-}
-
-/**
- * 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));
-
- priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
- show_arrow = show_arrow != FALSE;
-
- if (priv->show_arrow != show_arrow)
+ priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+ show_arrow = show_arrow != FALSE;
+
+ if (priv->show_arrow != show_arrow)
{
priv->show_arrow = show_arrow;
gtk_widget_hide (priv->arrow_button);
gtk_widget_queue_resize (GTK_WIDGET (toolbar));
- g_object_notify (G_OBJECT (toolbar), "show_arrow");
+ g_object_notify (G_OBJECT (toolbar), "show-arrow");
}
}
* @toolbar: a #GtkToolbar
*
* Returns whether the toolbar has an overflow menu.
- * See gtk_toolbar_set_show_arrow()
+ * See gtk_toolbar_set_show_arrow().
*
- * Return value:
+ * Return value: %TRUE if the toolbar has an overflow menu.
*
* Since: 2.4
**/
gtk_toolbar_get_show_arrow (GtkToolbar *toolbar)
{
GtkToolbarPrivate *priv;
-
+
g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), FALSE);
-
+
if (!gtk_toolbar_check_new_api (toolbar))
return FALSE;
gint x,
gint y)
{
- g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), FALSE);
-
+ g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), -1);
+
if (!gtk_toolbar_check_new_api (toolbar))
return -1;
-
+
return physical_to_logical (toolbar, find_drop_index (toolbar, x, y));
}
+static void
+gtk_toolbar_finalize (GObject *object)
+{
+ GList *list;
+ GtkToolbar *toolbar = GTK_TOOLBAR (object);
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
+ if (toolbar->tooltips)
+ g_object_unref (toolbar->tooltips);
+
+ if (priv->arrow_button)
+ gtk_widget_unparent (priv->arrow_button);
+
+ for (list = priv->content; list != NULL; list = list->next)
+ {
+ ToolbarContent *content = list->data;
+
+ toolbar_content_free (content);
+ }
+
+ g_list_free (priv->content);
+ g_list_free (toolbar->children);
+
+ g_timer_destroy (priv->timer);
+
+ if (priv->menu)
+ gtk_widget_destroy (GTK_WIDGET (priv->menu));
+
+ if (priv->idle_id)
+ g_source_remove (priv->idle_id);
+
+ G_OBJECT_CLASS (gtk_toolbar_parent_class)->finalize (object);
+}
+
+/**
+ * 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.
+ *
+ * This should only be used for special-purpose toolbars, normal
+ * application toolbars should respect the user preferences for the
+ * size of icons.
+ **/
+void
+gtk_toolbar_set_icon_size (GtkToolbar *toolbar,
+ GtkIconSize icon_size)
+{
+ g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
+ g_return_if_fail (icon_size != GTK_ICON_SIZE_INVALID);
+
+ if (!toolbar->icon_size_set)
+ {
+ toolbar->icon_size_set = TRUE;
+ g_object_notify (G_OBJECT (toolbar), "icon-size-set");
+ }
+
+ if (toolbar->icon_size == icon_size)
+ return;
+
+ toolbar->icon_size = icon_size;
+ g_object_notify (G_OBJECT (toolbar), "icon-size");
+
+ gtk_toolbar_reconfigured (toolbar);
+
+ gtk_widget_queue_resize (GTK_WIDGET (toolbar));
+}
+
+/**
+ * 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;
+
+ g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
+
+ if (toolbar->icon_size_set)
+ {
+ GtkSettings *settings = toolbar_get_settings (toolbar);
+
+ if (settings)
+ {
+ 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);
+ g_object_notify (G_OBJECT (toolbar), "icon-size");
+ }
+
+ toolbar->icon_size_set = FALSE;
+ g_object_notify (G_OBJECT (toolbar), "icon-size-set");
+ }
+}
+
+/*
+ * Deprecated API
+ */
+
/**
* gtk_toolbar_append_item:
* @toolbar: a #GtkToolbar.
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);
+ return internal_insert_element (toolbar, GTK_TOOLBAR_CHILD_BUTTON,
+ NULL, stock_id,
+ tooltip_text, tooltip_private_text,
+ NULL, callback, user_data,
+ position, TRUE);
}
/**
gtk_toolbar_remove_space (GtkToolbar *toolbar,
gint position)
{
- GtkToolItem *item;
-
+ GtkToolbarPrivate *priv;
+ ToolbarContent *content;
+
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)
+ priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
+ content = g_list_nth_data (priv->content, position);
+
+ if (!content)
{
g_warning ("Toolbar position %d doesn't exist", position);
return;
}
-
- if (!GTK_IS_SEPARATOR_TOOL_ITEM (item))
+
+ if (!toolbar_content_is_separator (content))
{
g_warning ("Toolbar position %d is not a space", position);
return;
}
-
- gtk_toolbar_remove_tool_item (toolbar, item);
+
+ toolbar_content_remove (content, toolbar);
+ toolbar_content_free (content);
}
/**
gpointer user_data,
gint position)
{
- return gtk_toolbar_internal_insert_element (toolbar, type, widget, text,
- tooltip_text, tooltip_private_text,
- icon, callback, user_data, position, FALSE);
+ return internal_insert_element (toolbar, type, widget, text,
+ tooltip_text, tooltip_private_text,
+ icon, callback, user_data, position, FALSE);
}
-gchar *
-_gtk_toolbar_elide_underscores (const gchar *original)
+static void
+set_child_packing_and_visibility(GtkToolbar *toolbar,
+ GtkToolbarChild *child)
{
- gchar *q, *result;
- const gchar *p;
- gboolean last_underscore;
+ GtkWidget *box;
+ gboolean expand;
- q = result = g_malloc (strlen (original) + 1);
- last_underscore = FALSE;
+ box = gtk_bin_get_child (GTK_BIN (child->widget));
- for (p = original; *p; p++)
+ g_return_if_fail (GTK_IS_BOX (box));
+
+ if (child->label)
{
- if (!last_underscore && *p == '_')
- last_underscore = TRUE;
+ expand = (toolbar->style != GTK_TOOLBAR_BOTH);
+
+ gtk_box_set_child_packing (GTK_BOX (box), child->label,
+ expand, expand, 0, GTK_PACK_END);
+
+ if (toolbar->style != GTK_TOOLBAR_ICONS)
+ gtk_widget_show (child->label);
else
- {
- last_underscore = FALSE;
- *q++ = *p;
- }
+ gtk_widget_hide (child->label);
}
- *q = '\0';
-
- return result;
+ if (child->icon)
+ {
+ expand = (toolbar->style != GTK_TOOLBAR_BOTH_HORIZ);
+
+ gtk_box_set_child_packing (GTK_BOX (box), child->icon,
+ expand, expand, 0, GTK_PACK_END);
+
+ if (toolbar->style != GTK_TOOLBAR_TEXT)
+ gtk_widget_show (child->icon);
+ else
+ gtk_widget_hide (child->icon);
+ }
}
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)
+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;
-
+ GtkWidget *box;
+ char *free_me = NULL;
+
+ GtkWidget *child_widget;
+ GtkWidget *child_label;
+ GtkWidget *child_icon;
+
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;
-
+ if (GTK_IS_TOOL_ITEM (widget))
+ g_warning (MIXED_API_WARNING);
+
+ if (!gtk_toolbar_check_old_api (toolbar))
+ return NULL;
+
+ child_widget = NULL;
+ child_label = NULL;
+ child_icon = 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));
+ child_widget = widget;
break;
+ case GTK_TOOLBAR_CHILD_BUTTON:
case GTK_TOOLBAR_CHILD_TOGGLEBUTTON:
- item = gtk_toggle_tool_button_new ();
- child->widget = _gtk_tool_button_get_button (GTK_TOOL_BUTTON (item));
- break;
-
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;
- }
+ if (type == GTK_TOOLBAR_CHILD_BUTTON)
+ {
+ child_widget = gtk_button_new ();
+ }
+ else if (type == GTK_TOOLBAR_CHILD_TOGGLEBUTTON)
+ {
+ child_widget = gtk_toggle_button_new ();
+ gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (child_widget), FALSE);
+ }
+ else /* type == GTK_TOOLBAR_CHILD_RADIOBUTTON */
+ {
+ GSList *group = NULL;
- /*
- * When we are using the old API, consider all items "is_important". That
- * way BOTH_HORIZ will continue to show both icon and label in old API mode
- */
- gtk_tool_item_set_is_important (item, TRUE);
+ if (widget)
+ group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (widget));
+
+ child_widget = gtk_radio_button_new (group);
+ gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (child_widget), FALSE);
+ }
- gtk_widget_show (GTK_WIDGET (item));
-
- if (type == GTK_TOOLBAR_CHILD_BUTTON ||
- type == GTK_TOOLBAR_CHILD_RADIOBUTTON ||
- type == GTK_TOOLBAR_CHILD_TOGGLEBUTTON)
- {
- if (text)
+ gtk_button_set_relief (GTK_BUTTON (child_widget), get_button_relief (toolbar));
+ gtk_button_set_focus_on_click (GTK_BUTTON (child_widget), FALSE);
+
+ if (callback)
{
- if (use_stock)
- {
- GtkStockItem stock_item;
- gchar *label_text;
-
- gtk_tool_button_set_stock_id (GTK_TOOL_BUTTON (item), text);
+ g_signal_connect (child_widget, "clicked",
+ callback, user_data);
+ }
+
+ if (toolbar->style == GTK_TOOLBAR_BOTH_HORIZ)
+ box = gtk_hbox_new (FALSE, 0);
+ else
+ box = gtk_vbox_new (FALSE, 0);
- 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
+ gtk_container_add (GTK_CONTAINER (child_widget), box);
+ gtk_widget_show (box);
+
+ if (text && use_stock)
+ {
+ GtkStockItem stock_item;
+ if (gtk_stock_lookup (text, &stock_item))
{
- child->label = gtk_label_new (text);
+ if (!icon)
+ icon = gtk_image_new_from_stock (text, toolbar->icon_size);
+
+ text = free_me = _gtk_toolbar_elide_underscores (stock_item.label);
}
- gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (item), child->label);
- gtk_widget_show (child->label);
}
-
+
+ if (text)
+ {
+ child_label = gtk_label_new (text);
+
+ gtk_container_add (GTK_CONTAINER (box), child_label);
+ }
+
if (icon)
{
- child->icon = icon;
- gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (item), icon);
-
- /* Applications depend on the toolbar showing the widget for them */
- gtk_widget_show (GTK_WIDGET (icon));
+ child_icon = GTK_WIDGET (icon);
+ gtk_container_add (GTK_CONTAINER (box), child_icon);
}
-
- /*
- * 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);
+
+ gtk_widget_show (child_widget);
+ break;
+
+ default:
+ g_assert_not_reached ();
+ break;
}
-
+
if ((type != GTK_TOOLBAR_CHILD_SPACE) && tooltip_text)
- gtk_tool_item_set_tooltip (item, toolbar->tooltips,
- tooltip_text, tooltip_private_text);
+ {
+ gtk_tooltips_set_tip (toolbar->tooltips, child_widget,
+ tooltip_text, tooltip_private_text);
+ }
- toolbar->children = g_list_insert (toolbar->children, child, position);
-
- gtk_toolbar_insert_tool_item (toolbar, item, position, FALSE);
-
- return child->widget;
+ if (free_me)
+ g_free (free_me);
+
+ return child_widget;
}
-static void
-gtk_toolbar_finalize (GObject *object)
-{
- GList *list;
- GtkToolbar *toolbar = GTK_TOOLBAR (object);
+/*
+ * ToolbarContent methods
+ */
+typedef enum {
+ UNKNOWN,
+ YES,
+ NO,
+} TriState;
+
+struct _ToolbarContent
+{
+ ContentType type;
+ ItemState state;
+
+ union
+ {
+ struct
+ {
+ GtkToolItem * item;
+ GtkAllocation start_allocation;
+ GtkAllocation goal_allocation;
+ guint is_placeholder : 1;
+ guint disappearing : 1;
+ TriState has_menu : 2;
+ } tool_item;
+
+ struct
+ {
+ GtkToolbarChild child;
+ GtkAllocation space_allocation;
+ guint space_visible : 1;
+ } compatibility;
+ } u;
+};
+
+static ToolbarContent *
+toolbar_content_new_tool_item (GtkToolbar *toolbar,
+ GtkToolItem *item,
+ gboolean is_placeholder,
+ gint pos)
+{
+ ToolbarContent *content;
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
+ content = g_new0 (ToolbarContent, 1);
+
+ content->type = TOOL_ITEM;
+ content->state = NOT_ALLOCATED;
+ content->u.tool_item.item = item;
+ content->u.tool_item.is_placeholder = is_placeholder;
+
+ gtk_widget_set_parent (GTK_WIDGET (item), GTK_WIDGET (toolbar));
+
+ priv->content = g_list_insert (priv->content, content, pos);
+
+ if (!is_placeholder)
+ {
+ toolbar->num_children++;
+
+ gtk_toolbar_stop_sliding (toolbar);
+ }
+
+ gtk_widget_queue_resize (GTK_WIDGET (toolbar));
+ priv->need_rebuild = TRUE;
+
+ return content;
+}
+
+static void
+toolbar_content_remove (ToolbarContent *content,
+ GtkToolbar *toolbar)
+{
+ GtkToolbarChild *child;
+ GtkToolbarPrivate *priv;
+
+ priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
+ switch (content->type)
+ {
+ case TOOL_ITEM:
+ gtk_widget_unparent (GTK_WIDGET (content->u.tool_item.item));
+ break;
+
+ case COMPATIBILITY:
+ child = &(content->u.compatibility.child);
+
+ if (child->type != GTK_TOOLBAR_CHILD_SPACE)
+ {
+ g_object_ref (child->widget);
+ gtk_widget_unparent (child->widget);
+ gtk_widget_destroy (child->widget);
+ g_object_unref (child->widget);
+ }
+
+ toolbar->children = g_list_remove (toolbar->children, child);
+ break;
+ }
+
+ priv->content = g_list_remove (priv->content, content);
+
+ if (!toolbar_content_is_placeholder (content))
+ toolbar->num_children--;
+
+ gtk_widget_queue_resize (GTK_WIDGET (toolbar));
+ priv->need_rebuild = TRUE;
+}
+
+static void
+toolbar_content_free (ToolbarContent *content)
+{
+ g_free (content);
+}
+
+static gint
+calculate_max_homogeneous_pixels (GtkWidget *widget)
+{
+ PangoContext *context;
+ PangoFontMetrics *metrics;
+ gint char_width;
+
+ 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);
+
+ return PANGO_PIXELS (MAX_HOMOGENEOUS_N_CHARS * char_width);
+}
+
+static void
+toolbar_content_expose (ToolbarContent *content,
+ GtkContainer *container,
+ GdkEventExpose *expose)
+{
+ GtkToolbar *toolbar = GTK_TOOLBAR (container);
+ GtkToolbarChild *child;
+ GtkWidget *widget = NULL; /* quiet gcc */
+
+ switch (content->type)
+ {
+ case TOOL_ITEM:
+ if (!content->u.tool_item.is_placeholder)
+ widget = GTK_WIDGET (content->u.tool_item.item);
+ break;
+
+ case COMPATIBILITY:
+ child = &(content->u.compatibility.child);
+
+ if (child->type == GTK_TOOLBAR_CHILD_SPACE)
+ {
+ if (get_space_style (toolbar) == GTK_TOOLBAR_SPACE_LINE &&
+ content->u.compatibility.space_visible)
+ {
+ _gtk_toolbar_paint_space_line (GTK_WIDGET (toolbar), toolbar,
+ &expose->area,
+ &content->u.compatibility.space_allocation);
+ }
+ return;
+ }
+
+ widget = child->widget;
+ break;
+ }
+
+ if (widget)
+ gtk_container_propagate_expose (container, widget, expose);
+}
+
+static gboolean
+toolbar_content_visible (ToolbarContent *content,
+ GtkToolbar *toolbar)
+{
+ GtkToolItem *item;
+
+ switch (content->type)
+ {
+ case TOOL_ITEM:
+ item = content->u.tool_item.item;
+
+ if (!GTK_WIDGET_VISIBLE (item))
+ return FALSE;
+
+ if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL &&
+ gtk_tool_item_get_visible_horizontal (item))
+ {
+ return TRUE;
+ }
+
+ if ((toolbar->orientation == GTK_ORIENTATION_VERTICAL &&
+ gtk_tool_item_get_visible_vertical (item)))
+ {
+ return TRUE;
+ }
+
+ return FALSE;
+ break;
+
+ case COMPATIBILITY:
+ if (content->u.compatibility.child.type != GTK_TOOLBAR_CHILD_SPACE)
+ return GTK_WIDGET_VISIBLE (content->u.compatibility.child.widget);
+ else
+ return TRUE;
+ break;
+ }
+
+ g_assert_not_reached ();
+ return FALSE;
+}
+
+static void
+toolbar_content_size_request (ToolbarContent *content,
+ GtkToolbar *toolbar,
+ GtkRequisition *requisition)
+{
+ gint space_size;
+
+ switch (content->type)
+ {
+ case TOOL_ITEM:
+ gtk_widget_size_request (GTK_WIDGET (content->u.tool_item.item),
+ requisition);
+ if (content->u.tool_item.is_placeholder &&
+ content->u.tool_item.disappearing)
+ {
+ requisition->width = 0;
+ requisition->height = 0;
+ }
+ break;
+
+ case COMPATIBILITY:
+ space_size = get_space_size (toolbar);
+
+ if (content->u.compatibility.child.type != GTK_TOOLBAR_CHILD_SPACE)
+ {
+ gtk_widget_size_request (content->u.compatibility.child.widget,
+ requisition);
+ }
+ else
+ {
+ if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ requisition->width = space_size;
+ requisition->height = 0;
+ }
+ else
+ {
+ requisition->height = space_size;
+ requisition->width = 0;
+ }
+ }
+
+ break;
+ }
+}
+
+static gboolean
+toolbar_content_is_homogeneous (ToolbarContent *content,
+ GtkToolbar *toolbar)
+{
+ gboolean result = FALSE; /* quiet gcc */
+ GtkRequisition requisition;
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
+ if (priv->max_homogeneous_pixels < 0)
+ {
+ priv->max_homogeneous_pixels =
+ calculate_max_homogeneous_pixels (GTK_WIDGET (toolbar));
+ }
+
+ toolbar_content_size_request (content, toolbar, &requisition);
+
+ if (requisition.width > priv->max_homogeneous_pixels)
+ return FALSE;
+
+ switch (content->type)
+ {
+ case TOOL_ITEM:
+ result = gtk_tool_item_get_homogeneous (content->u.tool_item.item) &&
+ !GTK_IS_SEPARATOR_TOOL_ITEM (content->u.tool_item.item);
+
+ if (gtk_tool_item_get_is_important (content->u.tool_item.item) &&
+ toolbar->style == GTK_TOOLBAR_BOTH_HORIZ &&
+ toolbar->orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ result = FALSE;
+ }
+ break;
+
+ case COMPATIBILITY:
+ if (content->u.compatibility.child.type == GTK_TOOLBAR_CHILD_BUTTON ||
+ content->u.compatibility.child.type == GTK_TOOLBAR_CHILD_RADIOBUTTON ||
+ content->u.compatibility.child.type == GTK_TOOLBAR_CHILD_TOGGLEBUTTON)
+ {
+ result = TRUE;
+ }
+ else
+ {
+ result = FALSE;
+ }
+ break;
+ }
+
+ return result;
+}
+
+static gboolean
+toolbar_content_is_placeholder (ToolbarContent *content)
+{
+ if (content->type == TOOL_ITEM && content->u.tool_item.is_placeholder)
+ return TRUE;
+
+ return FALSE;
+}
+
+static gboolean
+toolbar_content_disappearing (ToolbarContent *content)
+{
+ if (content->type == TOOL_ITEM && content->u.tool_item.disappearing)
+ return TRUE;
+
+ return FALSE;
+}
+
+static ItemState
+toolbar_content_get_state (ToolbarContent *content)
+{
+ return content->state;
+}
+
+static gboolean
+toolbar_content_child_visible (ToolbarContent *content)
+{
+ switch (content->type)
+ {
+ case TOOL_ITEM:
+ return GTK_WIDGET_CHILD_VISIBLE (content->u.tool_item.item);
+ break;
+
+ case COMPATIBILITY:
+ if (content->u.compatibility.child.type != GTK_TOOLBAR_CHILD_SPACE)
+ {
+ return GTK_WIDGET_CHILD_VISIBLE (content->u.compatibility.child.widget);
+ }
+ else
+ {
+ return content->u.compatibility.space_visible;
+ }
+ break;
+ }
+
+ return FALSE; /* quiet gcc */
+}
+
+static void
+toolbar_content_get_goal_allocation (ToolbarContent *content,
+ GtkAllocation *allocation)
+{
+ switch (content->type)
+ {
+ case TOOL_ITEM:
+ *allocation = content->u.tool_item.goal_allocation;
+ break;
+
+ case COMPATIBILITY:
+ /* Goal allocations are only relevant when we are
+ * using the new API, so we should never get here
+ */
+ g_assert_not_reached ();
+ break;
+ }
+}
+
+static void
+toolbar_content_get_allocation (ToolbarContent *content,
+ GtkAllocation *allocation)
+{
+ GtkToolbarChild *child;
+
+ switch (content->type)
+ {
+ case TOOL_ITEM:
+ *allocation = GTK_WIDGET (content->u.tool_item.item)->allocation;
+ break;
+
+ case COMPATIBILITY:
+ child = &(content->u.compatibility.child);
+
+ if (child->type == GTK_TOOLBAR_CHILD_SPACE)
+ *allocation = content->u.compatibility.space_allocation;
+ else
+ *allocation = child->widget->allocation;
+ break;
+ }
+}
+
+static void
+toolbar_content_set_start_allocation (ToolbarContent *content,
+ GtkAllocation *allocation)
+{
+ switch (content->type)
+ {
+ case TOOL_ITEM:
+ content->u.tool_item.start_allocation = *allocation;
+ break;
+
+ case COMPATIBILITY:
+ /* start_allocation is only relevant when using the new API */
+ g_assert_not_reached ();
+ break;
+ }
+}
+
+static gboolean
+toolbar_content_get_expand (ToolbarContent *content)
+{
+ if (content->type == TOOL_ITEM &&
+ gtk_tool_item_get_expand (content->u.tool_item.item) &&
+ !content->u.tool_item.disappearing)
+ {
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static void
+toolbar_content_set_goal_allocation (ToolbarContent *content,
+ GtkAllocation *allocation)
+{
+ switch (content->type)
+ {
+ case TOOL_ITEM:
+ content->u.tool_item.goal_allocation = *allocation;
+ break;
+
+ case COMPATIBILITY:
+ /* Only relevant when using new API */
+ g_assert_not_reached ();
+ break;
+ }
+}
+
+static void
+toolbar_content_set_child_visible (ToolbarContent *content,
+ GtkToolbar *toolbar,
+ gboolean visible)
+{
+ GtkToolbarChild *child;
+
+ switch (content->type)
+ {
+ case TOOL_ITEM:
+ gtk_widget_set_child_visible (GTK_WIDGET (content->u.tool_item.item),
+ visible);
+ break;
+
+ case COMPATIBILITY:
+ child = &(content->u.compatibility.child);
+
+ if (child->type != GTK_TOOLBAR_CHILD_SPACE)
+ {
+ gtk_widget_set_child_visible (child->widget, visible);
+ }
+ else
+ {
+ if (content->u.compatibility.space_visible != visible)
+ {
+ content->u.compatibility.space_visible = visible;
+ gtk_widget_queue_draw (GTK_WIDGET (toolbar));
+ }
+ }
+ break;
+ }
+}
+
+static void
+toolbar_content_get_start_allocation (ToolbarContent *content,
+ GtkAllocation *start_allocation)
+{
+ switch (content->type)
+ {
+ case TOOL_ITEM:
+ *start_allocation = content->u.tool_item.start_allocation;
+ break;
+
+ case COMPATIBILITY:
+ /* Only relevant for new API */
+ g_assert_not_reached ();
+ break;
+ }
+}
+
+static void
+toolbar_content_size_allocate (ToolbarContent *content,
+ GtkAllocation *allocation)
+{
+ switch (content->type)
+ {
+ case TOOL_ITEM:
+ gtk_widget_size_allocate (GTK_WIDGET (content->u.tool_item.item),
+ allocation);
+ break;
+
+ case COMPATIBILITY:
+ if (content->u.compatibility.child.type != GTK_TOOLBAR_CHILD_SPACE)
+ {
+ gtk_widget_size_allocate (content->u.compatibility.child.widget,
+ allocation);
+ }
+ else
+ {
+ content->u.compatibility.space_allocation = *allocation;
+ }
+ break;
+ }
+}
+
+static void
+toolbar_content_set_state (ToolbarContent *content,
+ ItemState state)
+{
+ content->state = state;
+}
+
+static GtkWidget *
+toolbar_content_get_widget (ToolbarContent *content)
+{
+ GtkToolbarChild *child;
+
+ switch (content->type)
+ {
+ case TOOL_ITEM:
+ return GTK_WIDGET (content->u.tool_item.item);
+ break;
+
+ case COMPATIBILITY:
+ child = &(content->u.compatibility.child);
+ if (child->type != GTK_TOOLBAR_CHILD_SPACE)
+ return child->widget;
+ else
+ return NULL;
+ break;
+ }
+
+ return NULL;
+}
+
+static void
+toolbar_content_set_disappearing (ToolbarContent *content,
+ gboolean disappearing)
+{
+ switch (content->type)
+ {
+ case TOOL_ITEM:
+ content->u.tool_item.disappearing = disappearing;
+ break;
+
+ case COMPATIBILITY:
+ /* Only relevant for new API */
+ g_assert_not_reached ();
+ break;
+ }
+}
+
+static void
+toolbar_content_set_size_request (ToolbarContent *content,
+ gint width,
+ gint height)
+{
+ switch (content->type)
+ {
+ case TOOL_ITEM:
+ gtk_widget_set_size_request (GTK_WIDGET (content->u.tool_item.item),
+ width, height);
+ break;
+
+ case COMPATIBILITY:
+ /* Setting size requests only happens with sliding,
+ * so not relevant here
+ */
+ g_assert_not_reached ();
+ break;
+ }
+}
+
+static void
+toolbar_child_reconfigure (GtkToolbar *toolbar,
+ GtkToolbarChild *child)
+{
+ GtkWidget *box;
+ GtkImage *image;
+ GtkToolbarStyle style;
+ GtkIconSize icon_size;
+ GtkReliefStyle relief;
+ gchar *stock_id;
+
+ style = gtk_toolbar_get_style (toolbar);
+ icon_size = gtk_toolbar_get_icon_size (toolbar);
+ relief = gtk_toolbar_get_relief_style (toolbar);
+
+ /* style */
+ if (child->type == GTK_TOOLBAR_CHILD_BUTTON ||
+ child->type == GTK_TOOLBAR_CHILD_RADIOBUTTON ||
+ child->type == GTK_TOOLBAR_CHILD_TOGGLEBUTTON)
+ {
+ box = gtk_bin_get_child (GTK_BIN (child->widget));
+
+ if (style == GTK_TOOLBAR_BOTH && GTK_IS_HBOX (box))
+ {
+ GtkWidget *vbox;
+
+ vbox = gtk_vbox_new (FALSE, 0);
+
+ if (child->label)
+ gtk_widget_reparent (child->label, vbox);
+ if (child->icon)
+ gtk_widget_reparent (child->icon, vbox);
+
+ gtk_widget_destroy (box);
+ gtk_container_add (GTK_CONTAINER (child->widget), vbox);
+
+ gtk_widget_show (vbox);
+ }
+ else if (style == GTK_TOOLBAR_BOTH_HORIZ && GTK_IS_VBOX (box))
+ {
+ GtkWidget *hbox;
+
+ hbox = gtk_hbox_new (FALSE, 0);
+
+ if (child->label)
+ gtk_widget_reparent (child->label, hbox);
+ if (child->icon)
+ gtk_widget_reparent (child->icon, hbox);
+
+ gtk_widget_destroy (box);
+ gtk_container_add (GTK_CONTAINER (child->widget), hbox);
+
+ gtk_widget_show (hbox);
+ }
+
+ set_child_packing_and_visibility (toolbar, child);
+ }
+
+ /* icon size */
+
+ if ((child->type == GTK_TOOLBAR_CHILD_BUTTON ||
+ child->type == GTK_TOOLBAR_CHILD_TOGGLEBUTTON ||
+ child->type == GTK_TOOLBAR_CHILD_RADIOBUTTON) &&
+ GTK_IS_IMAGE (child->icon))
+ {
+ image = GTK_IMAGE (child->icon);
+ if (gtk_image_get_storage_type (image) == GTK_IMAGE_STOCK)
+ {
+ gtk_image_get_stock (image, &stock_id, NULL);
+ stock_id = g_strdup (stock_id);
+ gtk_image_set_from_stock (image,
+ stock_id,
+ icon_size);
+ g_free (stock_id);
+ }
+ }
+
+ /* relief */
+ 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);
+ }
+}
+
+static void
+toolbar_content_toolbar_reconfigured (ToolbarContent *content,
+ GtkToolbar *toolbar)
+{
+ switch (content->type)
+ {
+ case TOOL_ITEM:
+ _gtk_tool_item_toolbar_reconfigured (content->u.tool_item.item);
+ break;
+
+ case COMPATIBILITY:
+ toolbar_child_reconfigure (toolbar, &(content->u.compatibility.child));
+ break;
+ }
+}
+
+static GtkWidget *
+toolbar_content_retrieve_menu_item (ToolbarContent *content)
+{
+ if (content->type == TOOL_ITEM)
+ return gtk_tool_item_retrieve_proxy_menu_item (content->u.tool_item.item);
+
+ /* FIXME - we might actually be able to do something meaningful here */
+ return NULL;
+}
+
+static gboolean
+toolbar_content_has_proxy_menu_item (ToolbarContent *content)
+{
+ if (content->type == TOOL_ITEM)
+ {
+ GtkWidget *menu_item;
+
+ if (content->u.tool_item.has_menu == YES)
+ return TRUE;
+ else if (content->u.tool_item.has_menu == NO)
+ return FALSE;
+
+ menu_item = toolbar_content_retrieve_menu_item (content);
+
+ content->u.tool_item.has_menu = menu_item? YES : NO;
+
+ return menu_item != NULL;
+ }
+ else
+ {
+ return FALSE;
+ }
+}
+
+static void
+toolbar_content_set_unknown_menu_status (ToolbarContent *content)
+{
+ if (content->type == TOOL_ITEM)
+ content->u.tool_item.has_menu = UNKNOWN;
+}
+
+static gboolean
+toolbar_content_is_separator (ToolbarContent *content)
+{
+ GtkToolbarChild *child;
+
+ switch (content->type)
+ {
+ case TOOL_ITEM:
+ return GTK_IS_SEPARATOR_TOOL_ITEM (content->u.tool_item.item);
+ break;
+
+ case COMPATIBILITY:
+ child = &(content->u.compatibility.child);
+ return (child->type == GTK_TOOLBAR_CHILD_SPACE);
+ break;
+ }
+
+ return FALSE;
+}
+
+static void
+toolbar_content_set_expand (ToolbarContent *content,
+ gboolean expand)
+{
+ if (content->type == TOOL_ITEM)
+ gtk_tool_item_set_expand (content->u.tool_item.item, expand);
+}
+
+static gboolean
+ignore_show_and_hide_all (ToolbarContent *content)
+{
+ if (content->type == COMPATIBILITY)
+ {
+ GtkToolbarChildType type = content->u.compatibility.child.type;
+
+ if (type == GTK_TOOLBAR_CHILD_BUTTON ||
+ type == GTK_TOOLBAR_CHILD_TOGGLEBUTTON ||
+ type == GTK_TOOLBAR_CHILD_RADIOBUTTON)
+ {
+ return TRUE;
+ }
+ }
+
+ return FALSE;
+}
+
+static void
+toolbar_content_show_all (ToolbarContent *content)
+{
+ GtkWidget *widget;
+
+ if (ignore_show_and_hide_all (content))
+ return;
+
+ widget = toolbar_content_get_widget (content);
+ if (widget)
+ gtk_widget_show_all (widget);
+}
+
+static void
+toolbar_content_hide_all (ToolbarContent *content)
+{
+ GtkWidget *widget;
+
+ if (ignore_show_and_hide_all (content))
+ return;
+
+ widget = toolbar_content_get_widget (content);
+ if (widget)
+ gtk_widget_hide_all (widget);
+}
+
+/*
+ * Getters
+ */
+static gint
+get_space_size (GtkToolbar *toolbar)
+{
+ gint space_size = DEFAULT_SPACE_SIZE;
+
+ if (toolbar)
+ {
+ gtk_widget_style_get (GTK_WIDGET (toolbar),
+ "space-size", &space_size,
+ NULL);
+ }
+
+ return space_size;
+}
+
+static GtkToolbarSpaceStyle
+get_space_style (GtkToolbar *toolbar)
+{
+ GtkToolbarSpaceStyle space_style = DEFAULT_SPACE_STYLE;
+
+ if (toolbar)
+ {
+ gtk_widget_style_get (GTK_WIDGET (toolbar),
+ "space-style", &space_style,
+ NULL);
+ }
+
+ return space_style;
+}
+
+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 gint
+get_max_child_expand (GtkToolbar *toolbar)
+{
+ gint mexpand = G_MAXINT;
+
+ gtk_widget_style_get (GTK_WIDGET (toolbar),
+ "max-child-expand", &mexpand,
+ NULL);
+ return mexpand;
+}
+
+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;
+}
+
+/*
+ * API checks
+ */
+static gboolean
+gtk_toolbar_check_old_api (GtkToolbar *toolbar)
+{
GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
- if (toolbar->tooltips)
- g_object_unref (toolbar->tooltips);
+ if (priv->api_mode == NEW_API)
+ {
+ g_warning (MIXED_API_WARNING);
+ return FALSE;
+ }
+
+ priv->api_mode = OLD_API;
+ return TRUE;
+}
- for (list = toolbar->children; list != NULL; list = list->next)
- g_free (list->data);
+static gboolean
+gtk_toolbar_check_new_api (GtkToolbar *toolbar)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
+ if (priv->api_mode == OLD_API)
+ {
+ g_warning (MIXED_API_WARNING);
+ return FALSE;
+ }
+
+ priv->api_mode = NEW_API;
+ return TRUE;
+}
- g_list_free (toolbar->children);
+/* GTK+ internal methods */
- for (list = priv->content; list != NULL; list = list->next)
- g_free (list->data);
+gint
+_gtk_toolbar_get_default_space_size (void)
+{
+ return DEFAULT_SPACE_SIZE;
+}
- g_list_free (priv->content);
+void
+_gtk_toolbar_paint_space_line (GtkWidget *widget,
+ GtkToolbar *toolbar,
+ GdkRectangle *area,
+ GtkAllocation *allocation)
+{
+ const double start_fraction = (SPACE_LINE_START / SPACE_LINE_DIVISION);
+ const double end_fraction = (SPACE_LINE_END / SPACE_LINE_DIVISION);
+
+ GtkOrientation orientation;
- g_timer_destroy (priv->timer);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+
+ orientation = toolbar? toolbar->orientation : GTK_ORIENTATION_HORIZONTAL;
- if (priv->idle_id)
- g_source_remove (priv->idle_id);
+ if (orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ gboolean wide_separators;
+ gint separator_width;
+
+ gtk_widget_style_get (widget,
+ "wide-separators", &wide_separators,
+ "separator-width", &separator_width,
+ NULL);
+
+ if (wide_separators)
+ gtk_paint_box (widget->style, widget->window,
+ GTK_WIDGET_STATE (widget), GTK_SHADOW_ETCHED_OUT,
+ area, widget, "vseparator",
+ allocation->x + (allocation->width - separator_width) / 2,
+ allocation->y + allocation->height * start_fraction,
+ separator_width,
+ allocation->height * (end_fraction - start_fraction));
+ else
+ gtk_paint_vline (widget->style, widget->window,
+ GTK_WIDGET_STATE (widget), area, widget,
+ "toolbar",
+ allocation->y + allocation->height * start_fraction,
+ allocation->y + allocation->height * end_fraction,
+ allocation->x + (allocation->width - widget->style->xthickness) / 2);
+ }
+ else
+ {
+ gboolean wide_separators;
+ gint separator_height;
+
+ gtk_widget_style_get (widget,
+ "wide-separators", &wide_separators,
+ "separator-height", &separator_height,
+ NULL);
+
+ if (wide_separators)
+ gtk_paint_box (widget->style, widget->window,
+ GTK_WIDGET_STATE (widget), GTK_SHADOW_ETCHED_OUT,
+ area, widget, "hseparator",
+ allocation->x + allocation->width * start_fraction,
+ allocation->y + (allocation->height - separator_height) / 2,
+ allocation->width * (end_fraction - start_fraction),
+ separator_height);
+ else
+ gtk_paint_hline (widget->style, widget->window,
+ GTK_WIDGET_STATE (widget), area, widget,
+ "toolbar",
+ allocation->x + allocation->width * start_fraction,
+ allocation->x + allocation->width * end_fraction,
+ allocation->y + (allocation->height - widget->style->ythickness) / 2);
+ }
+}
+
+gchar *
+_gtk_toolbar_elide_underscores (const gchar *original)
+{
+ gchar *q, *result;
+ const gchar *p, *end;
+ gsize len;
+ gboolean last_underscore;
+
+ if (!original)
+ return NULL;
+
+ len = strlen (original);
+ q = result = g_malloc (len + 1);
+ last_underscore = FALSE;
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ end = original + len;
+ for (p = original; p < end; p++)
+ {
+ if (!last_underscore && *p == '_')
+ last_underscore = TRUE;
+ else
+ {
+ last_underscore = FALSE;
+ if (*p != '_' && original + 2 <= p && p + 1 <= end && p[-2] == '(' && p[1] == ')')
+ {
+ q--;
+ *q = '\0';
+ p++;
+ }
+ else
+ *q++ = *p;
+ }
+ }
+
+ if (last_underscore)
+ *q++ = '_';
+
+ *q = '\0';
+
+ return result;
}
+
+void
+_gtk_toolbar_rebuild_menu (GtkToolbar *toolbar)
+{
+ GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+ GList *list;
+
+ priv->need_rebuild = TRUE;
+
+ for (list = priv->content; list != NULL; list = list->next)
+ {
+ ToolbarContent *content = list->data;
+
+ toolbar_content_set_unknown_menu_status (content);
+ }
+
+ gtk_widget_queue_resize (GTK_WIDGET (toolbar));
+}
+
+#define __GTK_TOOLBAR_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff