* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include <config.h>
+#include "config.h"
#include <string.h>
#include "gtkalignment.h"
#include "gtkbutton.h"
#include "gtkmarshalers.h"
#include "gtkimage.h"
#include "gtkhbox.h"
+#include "gtkvbox.h"
#include "gtkstock.h"
#include "gtkiconfactory.h"
+#include "gtkactivatable.h"
+#include "gtkprivate.h"
#include "gtkintl.h"
-
-#define CHILD_SPACING 1
+#include "gtkalias.h"
static const GtkBorder default_default_border = { 1, 1, 1, 1 };
static const GtkBorder default_default_outside_border = { 0, 0, 0, 0 };
+static const GtkBorder default_inner_border = { 1, 1, 1, 1 };
/* Time out before giving up on getting a key release when animating
* the close button.
enum {
PROP_0,
PROP_LABEL,
+ PROP_IMAGE,
PROP_RELIEF,
PROP_USE_UNDERLINE,
PROP_USE_STOCK,
PROP_FOCUS_ON_CLICK,
PROP_XALIGN,
- PROP_YALIGN
+ PROP_YALIGN,
+ PROP_IMAGE_POSITION,
+
+ /* activatable properties */
+ PROP_ACTIVATABLE_RELATED_ACTION,
+ PROP_ACTIVATABLE_USE_ACTION_APPEARANCE
};
#define GTK_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_BUTTON, GtkButtonPrivate))
struct _GtkButtonPrivate
{
- gfloat xalign;
- gfloat yalign;
- GtkSettings *settings;
- guint show_image_connection;
- GtkWidget *image;
+ gfloat xalign;
+ gfloat yalign;
+ GtkWidget *image;
+ guint align_set : 1;
+ guint image_is_stock : 1;
+ guint has_grab : 1;
+ guint use_action_appearance : 1;
+ guint32 grab_time;
+ GtkPositionType image_position;
+ GtkAction *action;
};
-static void gtk_button_class_init (GtkButtonClass *klass);
-static void gtk_button_init (GtkButton *button);
-static void gtk_button_destroy (GtkObject *object);
-static void gtk_button_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void gtk_button_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-static void gtk_button_screen_changed (GtkWidget *widget,
- GdkScreen *previous_screen);
-static void gtk_button_realize (GtkWidget *widget);
-static void gtk_button_unrealize (GtkWidget *widget);
-static void gtk_button_map (GtkWidget *widget);
-static void gtk_button_unmap (GtkWidget *widget);
-static void gtk_button_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
-static void gtk_button_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation);
-static gint gtk_button_expose (GtkWidget *widget,
- GdkEventExpose *event);
-static gint gtk_button_button_press (GtkWidget *widget,
- GdkEventButton *event);
-static gint gtk_button_button_release (GtkWidget *widget,
- GdkEventButton *event);
-static gint gtk_button_key_release (GtkWidget *widget,
- GdkEventKey *event);
-static gint gtk_button_enter_notify (GtkWidget *widget,
- GdkEventCrossing *event);
-static gint gtk_button_leave_notify (GtkWidget *widget,
- GdkEventCrossing *event);
-static void gtk_real_button_pressed (GtkButton *button);
-static void gtk_real_button_released (GtkButton *button);
-static void gtk_real_button_activate (GtkButton *button);
-static void gtk_button_update_state (GtkButton *button);
-static void gtk_button_add (GtkContainer *container,
- GtkWidget *widget);
-static GType gtk_button_child_type (GtkContainer *container);
-static void gtk_button_finish_activate (GtkButton *button,
- gboolean do_it);
-
-static GObject* gtk_button_constructor (GType type,
- guint n_construct_properties,
- GObjectConstructParam *construct_params);
+static void gtk_button_destroy (GtkObject *object);
+static void gtk_button_dispose (GObject *object);
+static void gtk_button_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gtk_button_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void gtk_button_screen_changed (GtkWidget *widget,
+ GdkScreen *previous_screen);
+static void gtk_button_realize (GtkWidget * widget);
+static void gtk_button_unrealize (GtkWidget * widget);
+static void gtk_button_map (GtkWidget * widget);
+static void gtk_button_unmap (GtkWidget * widget);
+static void gtk_button_style_set (GtkWidget * widget, GtkStyle * prev_style);
+static void gtk_button_size_request (GtkWidget * widget,
+ GtkRequisition * requisition);
+static void gtk_button_size_allocate (GtkWidget * widget,
+ GtkAllocation * allocation);
+static gint gtk_button_expose (GtkWidget * widget, GdkEventExpose * event);
+static gint gtk_button_button_press (GtkWidget * widget,
+ GdkEventButton * event);
+static gint gtk_button_button_release (GtkWidget * widget,
+ GdkEventButton * event);
+static gint gtk_button_grab_broken (GtkWidget * widget,
+ GdkEventGrabBroken * event);
+static gint gtk_button_key_release (GtkWidget * widget, GdkEventKey * event);
+static gint gtk_button_enter_notify (GtkWidget * widget,
+ GdkEventCrossing * event);
+static gint gtk_button_leave_notify (GtkWidget * widget,
+ GdkEventCrossing * event);
+static void gtk_real_button_pressed (GtkButton * button);
+static void gtk_real_button_released (GtkButton * button);
+static void gtk_real_button_clicked (GtkButton * button);
+static void gtk_real_button_activate (GtkButton *button);
+static void gtk_button_update_state (GtkButton *button);
+static void gtk_button_add (GtkContainer *container,
+ GtkWidget *widget);
+static GType gtk_button_child_type (GtkContainer *container);
+static void gtk_button_finish_activate (GtkButton *button,
+ gboolean do_it);
+
+static GObject* gtk_button_constructor (GType type,
+ guint n_construct_properties,
+ GObjectConstructParam *construct_params);
static void gtk_button_construct_child (GtkButton *button);
+static void gtk_button_state_changed (GtkWidget *widget,
+ GtkStateType previous_state);
+static void gtk_button_grab_notify (GtkWidget *widget,
+ gboolean was_grabbed);
+
+
+static void gtk_button_activatable_interface_init (GtkActivatableIface *iface);
+static void gtk_button_update (GtkActivatable *activatable,
+ GtkAction *action,
+ const gchar *property_name);
+static void gtk_button_sync_action_properties (GtkActivatable *activatable,
+ GtkAction *action);
+static void gtk_button_set_related_action (GtkButton *button,
+ GtkAction *action);
+static void gtk_button_set_use_action_appearance (GtkButton *button,
+ gboolean use_appearance);
-
-static GtkBinClass *parent_class = NULL;
static guint button_signals[LAST_SIGNAL] = { 0 };
-
-GType
-gtk_button_get_type (void)
-{
- static GType button_type = 0;
-
- if (!button_type)
- {
- static const GTypeInfo button_info =
- {
- sizeof (GtkButtonClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) gtk_button_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GtkButton),
- 16, /* n_preallocs */
- (GInstanceInitFunc) gtk_button_init,
- };
-
- button_type = g_type_register_static (GTK_TYPE_BIN, "GtkButton",
- &button_info, 0);
- }
-
- return button_type;
-}
+G_DEFINE_TYPE_WITH_CODE (GtkButton, gtk_button, GTK_TYPE_BIN,
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_ACTIVATABLE,
+ gtk_button_activatable_interface_init))
static void
gtk_button_class_init (GtkButtonClass *klass)
widget_class = (GtkWidgetClass*) klass;
container_class = (GtkContainerClass*) klass;
- parent_class = g_type_class_peek_parent (klass);
-
- gobject_class->constructor = gtk_button_constructor;
+ gobject_class->constructor = gtk_button_constructor;
+ gobject_class->dispose = gtk_button_dispose;
gobject_class->set_property = gtk_button_set_property;
gobject_class->get_property = gtk_button_get_property;
widget_class->unrealize = gtk_button_unrealize;
widget_class->map = gtk_button_map;
widget_class->unmap = gtk_button_unmap;
+ widget_class->style_set = gtk_button_style_set;
widget_class->size_request = gtk_button_size_request;
widget_class->size_allocate = gtk_button_size_allocate;
widget_class->expose_event = gtk_button_expose;
widget_class->button_press_event = gtk_button_button_press;
widget_class->button_release_event = gtk_button_button_release;
+ widget_class->grab_broken_event = gtk_button_grab_broken;
widget_class->key_release_event = gtk_button_key_release;
widget_class->enter_notify_event = gtk_button_enter_notify;
widget_class->leave_notify_event = gtk_button_leave_notify;
+ widget_class->state_changed = gtk_button_state_changed;
+ widget_class->grab_notify = gtk_button_grab_notify;
container_class->child_type = gtk_button_child_type;
+ container_class->add = gtk_button_add;
klass->pressed = gtk_real_button_pressed;
klass->released = gtk_real_button_released;
P_("Label"),
P_("Text of the label widget inside the button, if the button contains a label widget"),
NULL,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (gobject_class,
PROP_USE_UNDERLINE,
- g_param_spec_boolean ("use_underline",
+ g_param_spec_boolean ("use-underline",
P_("Use underline"),
P_("If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"),
FALSE,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (gobject_class,
PROP_USE_STOCK,
- g_param_spec_boolean ("use_stock",
+ g_param_spec_boolean ("use-stock",
P_("Use stock"),
P_("If set, the label is used to pick a stock item instead of being displayed"),
FALSE,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (gobject_class,
PROP_FOCUS_ON_CLICK,
- g_param_spec_boolean ("focus_on_click",
+ g_param_spec_boolean ("focus-on-click",
P_("Focus on click"),
P_("Whether the button grabs focus when it is clicked with the mouse"),
TRUE,
- G_PARAM_READWRITE));
+ GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_RELIEF,
P_("The border relief style"),
GTK_TYPE_RELIEF_STYLE,
GTK_RELIEF_NORMAL,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
+ GTK_PARAM_READWRITE));
/**
* GtkButton:xalign:
0.0,
1.0,
0.5,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
+ GTK_PARAM_READWRITE));
/**
* GtkButton:yalign:
0.0,
1.0,
0.5,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkButton::image:
+ *
+ * The child widget to appear next to the button text.
+ *
+ * Since: 2.6
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_IMAGE,
+ g_param_spec_object ("image",
+ P_("Image widget"),
+ P_("Child widget to appear next to the button text"),
+ GTK_TYPE_WIDGET,
+ GTK_PARAM_READWRITE));
+ /**
+ * GtkButton:image-position:
+ *
+ * The position of the image relative to the text inside the button.
+ *
+ * Since: 2.10
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_IMAGE_POSITION,
+ g_param_spec_enum ("image-position",
+ P_("Image position"),
+ P_("The position of the image relative to the text"),
+ GTK_TYPE_POSITION_TYPE,
+ GTK_POS_LEFT,
+ GTK_PARAM_READWRITE));
+
+ g_object_class_override_property (gobject_class, PROP_ACTIVATABLE_RELATED_ACTION, "related-action");
+ g_object_class_override_property (gobject_class, PROP_ACTIVATABLE_USE_ACTION_APPEARANCE, "use-action-appearance");
+
+ /**
+ * GtkButton::pressed:
+ * @button: the object that received the signal
+ *
+ * Emitted when the button is pressed.
+ *
+ * Deprecated: 2.8: Use the #GtkWidget::button-press-event signal.
+ */
button_signals[PRESSED] =
- g_signal_new ("pressed",
+ g_signal_new (I_("pressed"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkButtonClass, pressed),
NULL, NULL,
_gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+
+ /**
+ * GtkButton::released:
+ * @button: the object that received the signal
+ *
+ * Emitted when the button is released.
+ *
+ * Deprecated: 2.8: Use the #GtkWidget::button-release-event signal.
+ */
button_signals[RELEASED] =
- g_signal_new ("released",
+ g_signal_new (I_("released"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkButtonClass, released),
NULL, NULL,
_gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+
+ /**
+ * GtkButton::clicked:
+ * @button: the object that received the signal
+ *
+ * Emitted when the button has been activated (pressed and released).
+ */
button_signals[CLICKED] =
- g_signal_new ("clicked",
+ g_signal_new (I_("clicked"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkButtonClass, clicked),
NULL, NULL,
_gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+
+ /**
+ * GtkButton::enter:
+ * @button: the object that received the signal
+ *
+ * Emitted when the pointer enters the button.
+ *
+ * Deprecated: 2.8: Use the #GtkWidget::enter-notify-event signal.
+ */
button_signals[ENTER] =
- g_signal_new ("enter",
+ g_signal_new (I_("enter"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkButtonClass, enter),
NULL, NULL,
_gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+
+ /**
+ * GtkButton::leave:
+ * @button: the object that received the signal
+ *
+ * Emitted when the pointer leaves the button.
+ *
+ * Deprecated: 2.8: Use the #GtkWidget::leave-notify-event signal.
+ */
button_signals[LEAVE] =
- g_signal_new ("leave",
+ g_signal_new (I_("leave"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkButtonClass, leave),
/**
* GtkButton::activate:
+ * @widget: the object which received the signal.
*
- * The "activate" signal on GtkButton is an action signal and
+ * The ::activate signal on GtkButton is an action signal and
* emitting it causes the button to animate press then release.
* Applications should never connect to this signal, but use the
- * "clicked" signal.
+ * #GtkButton::clicked signal.
*/
button_signals[ACTIVATE] =
- g_signal_new ("activate",
+ g_signal_new (I_("activate"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkButtonClass, activate),
G_TYPE_NONE, 0);
widget_class->activate_signal = button_signals[ACTIVATE];
+ /**
+ * GtkButton:default-border:
+ *
+ * The "default-border" style property defines the extra space to add
+ * around a button that can become the default widget of its window.
+ * For more information about default widgets, see gtk_widget_grab_default().
+ */
+
gtk_widget_class_install_style_property (widget_class,
- g_param_spec_boxed ("default_border",
+ g_param_spec_boxed ("default-border",
P_("Default Spacing"),
- P_("Extra space to add for CAN_DEFAULT buttons"),
+ P_("Extra space to add for GTK_CAN_DEFAULT buttons"),
GTK_TYPE_BORDER,
- G_PARAM_READABLE));
+ GTK_PARAM_READABLE));
+ /**
+ * GtkButton:default-outside-border:
+ *
+ * The "default-outside-border" style property defines the extra outside
+ * space to add around a button that can become the default widget of its
+ * window. Extra outside space is always drawn outside the button border.
+ * For more information about default widgets, see gtk_widget_grab_default().
+ */
gtk_widget_class_install_style_property (widget_class,
- g_param_spec_boxed ("default_outside_border",
+ g_param_spec_boxed ("default-outside-border",
P_("Default Outside Spacing"),
- P_("Extra space to add for CAN_DEFAULT buttons that is always drawn outside the border"),
+ P_("Extra space to add for GTK_CAN_DEFAULT buttons that is always drawn outside the border"),
GTK_TYPE_BORDER,
- G_PARAM_READABLE));
+ GTK_PARAM_READABLE));
gtk_widget_class_install_style_property (widget_class,
- g_param_spec_int ("child_displacement_x",
+ g_param_spec_int ("child-displacement-x",
P_("Child X Displacement"),
P_("How far in the x direction to move the child when the button is depressed"),
G_MININT,
G_MAXINT,
0,
- G_PARAM_READABLE));
+ GTK_PARAM_READABLE));
gtk_widget_class_install_style_property (widget_class,
- g_param_spec_int ("child_displacement_y",
+ g_param_spec_int ("child-displacement-y",
P_("Child Y Displacement"),
P_("How far in the y direction to move the child when the button is depressed"),
G_MININT,
G_MAXINT,
0,
- G_PARAM_READABLE));
+ GTK_PARAM_READABLE));
+
+ /**
+ * GtkButton:displace-focus:
+ *
+ * Whether the child_displacement_x/child_displacement_y properties
+ * should also affect the focus rectangle.
+ *
+ * Since: 2.6
+ */
+ gtk_widget_class_install_style_property (widget_class,
+ g_param_spec_boolean ("displace-focus",
+ P_("Displace focus"),
+ P_("Whether the child_displacement_x/_y properties should also affect the focus rectangle"),
+ FALSE,
+ GTK_PARAM_READABLE));
+
+ /**
+ * GtkButton:inner-border:
+ *
+ * Sets the border between the button edges and child.
+ *
+ * Since: 2.10
+ */
+ gtk_widget_class_install_style_property (widget_class,
+ g_param_spec_boxed ("inner-border",
+ P_("Inner Border"),
+ P_("Border between button edges and child."),
+ GTK_TYPE_BORDER,
+ GTK_PARAM_READABLE));
+
+ /**
+ * GtkButton::image-spacing:
+ *
+ * Spacing in pixels between the image and label.
+ *
+ * Since: 2.10
+ */
+ gtk_widget_class_install_style_property (widget_class,
+ g_param_spec_int ("image-spacing",
+ P_("Image spacing"),
+ P_("Spacing in pixels between the image and label"),
+ 0,
+ G_MAXINT,
+ 2,
+ GTK_PARAM_READABLE));
+ /**
+ * GtkSettings::gtk-button-images:
+ *
+ * Whether images should be shown on buttons
+ *
+ * Since: 2.4
+ */
gtk_settings_install_property (g_param_spec_boolean ("gtk-button-images",
P_("Show button images"),
- P_("Whether stock icons should be shown in buttons"),
+ P_("Whether images should be shown on buttons"),
TRUE,
- G_PARAM_READWRITE));
-
- g_type_class_add_private (gobject_class, sizeof (GtkButtonPrivate));
+ GTK_PARAM_READWRITE));
+
+ g_type_class_add_private (gobject_class, sizeof (GtkButtonPrivate));
}
static void
priv->xalign = 0.5;
priv->yalign = 0.5;
+ priv->align_set = 0;
+ priv->image_is_stock = TRUE;
+ priv->image_position = GTK_POS_LEFT;
+ priv->use_action_appearance = TRUE;
}
static void
g_free (button->label_text);
button->label_text = NULL;
}
-
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+
+ GTK_OBJECT_CLASS (gtk_button_parent_class)->destroy (object);
}
static GObject*
GObject *object;
GtkButton *button;
- object = (* G_OBJECT_CLASS (parent_class)->constructor) (type,
- n_construct_properties,
- construct_params);
+ object = G_OBJECT_CLASS (gtk_button_parent_class)->constructor (type,
+ n_construct_properties,
+ construct_params);
button = GTK_BUTTON (object);
button->constructed = TRUE;
}
static void
-maybe_set_alignment (GtkWidget *widget,
- gfloat xalign,
- gfloat yalign)
+maybe_set_alignment (GtkButton *button,
+ GtkWidget *widget)
{
+ GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button);
+
if (GTK_IS_MISC (widget))
{
GtkMisc *misc = GTK_MISC (widget);
- gtk_misc_set_alignment (misc, xalign, yalign);
+
+ if (priv->align_set)
+ gtk_misc_set_alignment (misc, priv->xalign, priv->yalign);
}
else if (GTK_IS_ALIGNMENT (widget))
{
GtkAlignment *alignment = GTK_ALIGNMENT (widget);
- gtk_alignment_set (alignment, xalign, yalign, alignment->xscale, alignment->yscale);
+
+ if (priv->align_set)
+ gtk_alignment_set (alignment, priv->xalign, priv->yalign,
+ alignment->xscale, alignment->yscale);
}
}
gtk_button_add (GtkContainer *container,
GtkWidget *widget)
{
- GtkButton *button = GTK_BUTTON (container);
+ maybe_set_alignment (GTK_BUTTON (container), widget);
+
+ GTK_CONTAINER_CLASS (gtk_button_parent_class)->add (container, widget);
+}
+
+static void
+gtk_button_dispose (GObject *object)
+{
+ GtkButton *button = GTK_BUTTON (object);
GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button);
- maybe_set_alignment (widget, priv->xalign, priv->yalign);
- GTK_CONTAINER_CLASS (parent_class)->add (container, widget);
+ if (priv->action)
+ {
+ gtk_activatable_do_set_related_action (GTK_ACTIVATABLE (button), NULL);
+ priv->action = NULL;
+ }
+ G_OBJECT_CLASS (gtk_button_parent_class)->dispose (object);
}
static void
case PROP_LABEL:
gtk_button_set_label (button, g_value_get_string (value));
break;
+ case PROP_IMAGE:
+ gtk_button_set_image (button, (GtkWidget *) g_value_get_object (value));
+ break;
case PROP_RELIEF:
gtk_button_set_relief (button, g_value_get_enum (value));
break;
case PROP_YALIGN:
gtk_button_set_alignment (button, priv->xalign, g_value_get_float (value));
break;
+ case PROP_IMAGE_POSITION:
+ gtk_button_set_image_position (button, g_value_get_enum (value));
+ break;
+ case PROP_ACTIVATABLE_RELATED_ACTION:
+ gtk_button_set_related_action (button, g_value_get_object (value));
+ break;
+ case PROP_ACTIVATABLE_USE_ACTION_APPEARANCE:
+ gtk_button_set_use_action_appearance (button, g_value_get_boolean (value));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
case PROP_LABEL:
g_value_set_string (value, button->label_text);
break;
+ case PROP_IMAGE:
+ g_value_set_object (value, (GObject *)priv->image);
+ break;
case PROP_RELIEF:
g_value_set_enum (value, gtk_button_get_relief (button));
break;
case PROP_YALIGN:
g_value_set_float (value, priv->yalign);
break;
+ case PROP_IMAGE_POSITION:
+ g_value_set_enum (value, priv->image_position);
+ break;
+ case PROP_ACTIVATABLE_RELATED_ACTION:
+ g_value_set_object (value, priv->action);
+ break;
+ case PROP_ACTIVATABLE_USE_ACTION_APPEARANCE:
+ g_value_set_boolean (value, priv->use_action_appearance);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
+static void
+gtk_button_activatable_interface_init (GtkActivatableIface *iface)
+{
+ iface->update = gtk_button_update;
+ iface->sync_action_properties = gtk_button_sync_action_properties;
+}
+
+static void
+activatable_update_stock_id (GtkButton *button,
+ GtkAction *action)
+{
+ if (!gtk_button_get_use_stock (button))
+ return;
+
+ gtk_button_set_label (button, gtk_action_get_stock_id (action));
+}
+
+static void
+activatable_update_short_label (GtkButton *button,
+ GtkAction *action)
+{
+ GtkWidget *image;
+
+ if (gtk_button_get_use_stock (button))
+ return;
+
+ image = gtk_button_get_image (button);
+
+ /* Dont touch custom child... */
+ if (GTK_IS_IMAGE (image) ||
+ GTK_BIN (button)->child == NULL ||
+ GTK_IS_LABEL (GTK_BIN (button)->child))
+ {
+ gtk_button_set_label (button, gtk_action_get_short_label (action));
+ gtk_button_set_use_underline (button, TRUE);
+ }
+}
+
+static void
+activatable_update_icon_name (GtkButton *button,
+ GtkAction *action)
+{
+ GtkWidget *image;
+
+ if (gtk_button_get_use_stock (button))
+ return;
+
+ image = gtk_button_get_image (button);
+
+ if (GTK_IS_IMAGE (image) &&
+ (gtk_image_get_storage_type (GTK_IMAGE (image)) == GTK_IMAGE_EMPTY ||
+ gtk_image_get_storage_type (GTK_IMAGE (image)) == GTK_IMAGE_ICON_NAME))
+ gtk_image_set_from_icon_name (GTK_IMAGE (image),
+ gtk_action_get_icon_name (action), GTK_ICON_SIZE_MENU);
+}
+
+static void
+activatable_update_gicon (GtkButton *button,
+ GtkAction *action)
+{
+ GtkWidget *image = gtk_button_get_image (button);
+ GIcon *icon = gtk_action_get_gicon (action);
+
+ if (GTK_IS_IMAGE (image) &&
+ (gtk_image_get_storage_type (GTK_IMAGE (image)) == GTK_IMAGE_EMPTY ||
+ gtk_image_get_storage_type (GTK_IMAGE (image)) == GTK_IMAGE_GICON))
+ gtk_image_set_from_gicon (GTK_IMAGE (image), icon, GTK_ICON_SIZE_BUTTON);
+}
+
+static void
+gtk_button_update (GtkActivatable *activatable,
+ GtkAction *action,
+ const gchar *property_name)
+{
+ GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (activatable);
+
+ if (strcmp (property_name, "visible") == 0)
+ {
+ if (gtk_action_is_visible (action))
+ gtk_widget_show (GTK_WIDGET (activatable));
+ else
+ gtk_widget_hide (GTK_WIDGET (activatable));
+ }
+ else if (strcmp (property_name, "sensitive") == 0)
+ gtk_widget_set_sensitive (GTK_WIDGET (activatable), gtk_action_is_sensitive (action));
+
+ if (!priv->use_action_appearance)
+ return;
+
+ if (strcmp (property_name, "stock-id") == 0)
+ activatable_update_stock_id (GTK_BUTTON (activatable), action);
+ else if (strcmp (property_name, "gicon") == 0)
+ activatable_update_gicon (GTK_BUTTON (activatable), action);
+ else if (strcmp (property_name, "short-label") == 0)
+ activatable_update_short_label (GTK_BUTTON (activatable), action);
+ else if (strcmp (property_name, "icon-name") == 0)
+ activatable_update_icon_name (GTK_BUTTON (activatable), action);
+}
+
+static void
+gtk_button_sync_action_properties (GtkActivatable *activatable,
+ GtkAction *action)
+{
+ GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (activatable);
+
+ if (!action)
+ return;
+
+ if (gtk_action_is_visible (action))
+ gtk_widget_show (GTK_WIDGET (activatable));
+ else
+ gtk_widget_hide (GTK_WIDGET (activatable));
+
+ gtk_widget_set_sensitive (GTK_WIDGET (activatable), gtk_action_is_sensitive (action));
+
+ if (priv->use_action_appearance)
+ {
+ activatable_update_stock_id (GTK_BUTTON (activatable), action);
+ activatable_update_short_label (GTK_BUTTON (activatable), action);
+ activatable_update_gicon (GTK_BUTTON (activatable), action);
+ activatable_update_icon_name (GTK_BUTTON (activatable), action);
+ }
+}
+
+static void
+gtk_button_set_related_action (GtkButton *button,
+ GtkAction *action)
+{
+ GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button);
+
+ if (priv->action == action)
+ return;
+
+ /* This should be a default handler, but for compatibility reasons
+ * we need to support derived classes that don't chain up their
+ * clicked handler.
+ */
+ g_signal_handlers_disconnect_by_func (button, gtk_real_button_clicked, NULL);
+ if (action)
+ g_signal_connect_after (button, "clicked",
+ G_CALLBACK (gtk_real_button_clicked), NULL);
+
+ gtk_activatable_do_set_related_action (GTK_ACTIVATABLE (button), action);
+
+ priv->action = action;
+}
+
+static void
+gtk_button_set_use_action_appearance (GtkButton *button,
+ gboolean use_appearance)
+{
+ GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button);
+
+ if (priv->use_action_appearance != use_appearance)
+ {
+ priv->use_action_appearance = use_appearance;
+
+ gtk_activatable_sync_action_properties (GTK_ACTIVATABLE (button), priv->action);
+ }
+}
+
GtkWidget*
gtk_button_new (void)
{
static gboolean
show_image (GtkButton *button)
{
- GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (button));
gboolean show;
+
+ if (button->label_text)
+ {
+ GtkSettings *settings;
- g_object_get (settings, "gtk-button-images", &show, NULL);
+ settings = gtk_widget_get_settings (GTK_WIDGET (button));
+ g_object_get (settings, "gtk-button-images", &show, NULL);
+ }
+ else
+ show = TRUE;
return show;
}
GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button);
GtkStockItem item;
GtkWidget *label;
- GtkWidget *hbox;
+ GtkWidget *box;
GtkWidget *align;
-
+ GtkWidget *image = NULL;
+ gchar *label_text = NULL;
+ gint image_spacing;
+
if (!button->constructed)
return;
-
- if (button->label_text == NULL)
+
+ if (!button->label_text && !priv->image)
return;
- if (GTK_BIN (button)->child)
+ gtk_widget_style_get (GTK_WIDGET (button),
+ "image-spacing", &image_spacing,
+ NULL);
+
+ if (priv->image && !priv->image_is_stock)
{
- gtk_container_remove (GTK_CONTAINER (button),
- GTK_BIN (button)->child);
- priv->image = NULL;
+ image = g_object_ref (priv->image);
+ if (image->parent)
+ gtk_container_remove (GTK_CONTAINER (image->parent), image);
}
-
+
+ priv->image = NULL;
+
+ if (GTK_BIN (button)->child)
+ gtk_container_remove (GTK_CONTAINER (button),
+ GTK_BIN (button)->child);
+
if (button->use_stock &&
+ button->label_text &&
gtk_stock_lookup (button->label_text, &item))
{
- label = gtk_label_new_with_mnemonic (item.label);
+ if (!image)
+ image = g_object_ref (gtk_image_new_from_stock (button->label_text, GTK_ICON_SIZE_BUTTON));
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (button));
-
- priv->image = gtk_image_new_from_stock (button->label_text, GTK_ICON_SIZE_BUTTON);
- g_object_set (priv->image,
+ label_text = item.label;
+ }
+ else
+ label_text = button->label_text;
+
+ if (image)
+ {
+ priv->image = image;
+ g_object_set (priv->image,
"visible", show_image (button),
- "no_show_all", TRUE,
+ "no-show-all", TRUE,
NULL);
- hbox = gtk_hbox_new (FALSE, 2);
- align = gtk_alignment_new (priv->xalign, priv->yalign, 0.0, 0.0);
-
- gtk_box_pack_start (GTK_BOX (hbox), priv->image, FALSE, FALSE, 0);
- gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
+ if (priv->image_position == GTK_POS_LEFT ||
+ priv->image_position == GTK_POS_RIGHT)
+ box = gtk_hbox_new (FALSE, image_spacing);
+ else
+ box = gtk_vbox_new (FALSE, image_spacing);
+
+ if (priv->align_set)
+ align = gtk_alignment_new (priv->xalign, priv->yalign, 0.0, 0.0);
+ else
+ align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+
+ if (priv->image_position == GTK_POS_LEFT ||
+ priv->image_position == GTK_POS_TOP)
+ gtk_box_pack_start (GTK_BOX (box), priv->image, FALSE, FALSE, 0);
+ else
+ gtk_box_pack_end (GTK_BOX (box), priv->image, FALSE, FALSE, 0);
+
+ if (label_text)
+ {
+ if (button->use_underline || button->use_stock)
+ {
+ label = gtk_label_new_with_mnemonic (label_text);
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label),
+ GTK_WIDGET (button));
+ }
+ else
+ label = gtk_label_new (label_text);
+
+ if (priv->image_position == GTK_POS_RIGHT ||
+ priv->image_position == GTK_POS_BOTTOM)
+ gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
+ else
+ gtk_box_pack_end (GTK_BOX (box), label, FALSE, FALSE, 0);
+ }
+
gtk_container_add (GTK_CONTAINER (button), align);
- gtk_container_add (GTK_CONTAINER (align), hbox);
+ gtk_container_add (GTK_CONTAINER (align), box);
gtk_widget_show_all (align);
+ g_object_unref (image);
+
return;
}
- if (button->use_underline)
+ if (button->use_underline || button->use_stock)
{
label = gtk_label_new_with_mnemonic (button->label_text);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (button));
}
else
label = gtk_label_new (button->label_text);
-
- gtk_misc_set_alignment (GTK_MISC (label), priv->xalign, priv->yalign);
+
+ if (priv->align_set)
+ gtk_misc_set_alignment (GTK_MISC (label), priv->xalign, priv->yalign);
gtk_widget_show (label);
gtk_container_add (GTK_CONTAINER (button), label);
{
return g_object_new (GTK_TYPE_BUTTON,
"label", stock_id,
- "use_stock", TRUE,
- "use_underline", TRUE,
+ "use-stock", TRUE,
+ "use-underline", TRUE,
NULL);
}
GtkWidget*
gtk_button_new_with_mnemonic (const gchar *label)
{
- return g_object_new (GTK_TYPE_BUTTON, "label", label, "use_underline", TRUE, NULL);
+ return g_object_new (GTK_TYPE_BUTTON, "label", label, "use-underline", TRUE, NULL);
}
void
GtkReliefStyle
gtk_button_get_relief (GtkButton *button)
{
- g_return_val_if_fail (button != NULL, GTK_RELIEF_NORMAL);
g_return_val_if_fail (GTK_IS_BUTTON (button), GTK_RELIEF_NORMAL);
return button->relief;
button->event_window = NULL;
}
- GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
+ GTK_WIDGET_CLASS (gtk_button_parent_class)->unrealize (widget);
}
static void
{
GtkButton *button = GTK_BUTTON (widget);
- g_return_if_fail (GTK_IS_BUTTON (widget));
-
- GTK_WIDGET_CLASS (parent_class)->map (widget);
+ GTK_WIDGET_CLASS (gtk_button_parent_class)->map (widget);
if (button->event_window)
gdk_window_show (button->event_window);
{
GtkButton *button = GTK_BUTTON (widget);
- g_return_if_fail (GTK_IS_BUTTON (widget));
-
if (button->event_window)
gdk_window_hide (button->event_window);
- GTK_WIDGET_CLASS (parent_class)->unmap (widget);
+ GTK_WIDGET_CLASS (gtk_button_parent_class)->unmap (widget);
+}
+
+static void
+gtk_button_update_image_spacing (GtkButton *button)
+{
+ GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button);
+ GtkWidget *child;
+ gint spacing;
+
+ /* Keep in sync with gtk_button_construct_child,
+ * we only want to update the spacing if the box
+ * was constructed there.
+ */
+ if (!button->constructed || !priv->image)
+ return;
+
+ child = GTK_BIN (button)->child;
+ if (GTK_IS_ALIGNMENT (child))
+ {
+ child = GTK_BIN (child)->child;
+ if (GTK_IS_BOX (child))
+ {
+ gtk_widget_style_get (GTK_WIDGET (button),
+ "image-spacing", &spacing,
+ NULL);
+
+ gtk_box_set_spacing (GTK_BOX (child), spacing);
+ }
+ }
+}
+
+static void
+gtk_button_style_set (GtkWidget *widget,
+ GtkStyle *prev_style)
+{
+ gtk_button_update_image_spacing (GTK_BUTTON (widget));
}
static void
gtk_button_get_props (GtkButton *button,
GtkBorder *default_border,
GtkBorder *default_outside_border,
+ GtkBorder *inner_border,
gboolean *interior_focus)
{
GtkWidget *widget = GTK_WIDGET (button);
if (default_border)
{
- gtk_widget_style_get (widget, "default_border", &tmp_border, NULL);
+ gtk_widget_style_get (widget, "default-border", &tmp_border, NULL);
if (tmp_border)
{
*default_border = *tmp_border;
- g_free (tmp_border);
+ gtk_border_free (tmp_border);
}
else
*default_border = default_default_border;
if (default_outside_border)
{
- gtk_widget_style_get (widget, "default_outside_border", &tmp_border, NULL);
+ gtk_widget_style_get (widget, "default-outside-border", &tmp_border, NULL);
if (tmp_border)
{
*default_outside_border = *tmp_border;
- g_free (tmp_border);
+ gtk_border_free (tmp_border);
}
else
*default_outside_border = default_default_outside_border;
}
+ if (inner_border)
+ {
+ gtk_widget_style_get (widget, "inner-border", &tmp_border, NULL);
+
+ if (tmp_border)
+ {
+ *inner_border = *tmp_border;
+ gtk_border_free (tmp_border);
+ }
+ else
+ *inner_border = default_inner_border;
+ }
+
if (interior_focus)
- gtk_widget_style_get (widget, "interior_focus", interior_focus, NULL);
+ gtk_widget_style_get (widget, "interior-focus", interior_focus, NULL);
}
static void
{
GtkButton *button = GTK_BUTTON (widget);
GtkBorder default_border;
- gboolean interior_focus;
+ GtkBorder inner_border;
gint focus_width;
gint focus_pad;
- gtk_button_get_props (button, &default_border, NULL, &interior_focus);
+ gtk_button_get_props (button, &default_border, NULL, &inner_border, NULL);
gtk_widget_style_get (GTK_WIDGET (widget),
"focus-line-width", &focus_width,
"focus-padding", &focus_pad,
NULL);
- requisition->width = (GTK_CONTAINER (widget)->border_width + CHILD_SPACING +
- GTK_WIDGET (widget)->style->xthickness) * 2;
- requisition->height = (GTK_CONTAINER (widget)->border_width + CHILD_SPACING +
- GTK_WIDGET (widget)->style->ythickness) * 2;
-
- if (GTK_WIDGET_CAN_DEFAULT (widget))
+ requisition->width = ((GTK_CONTAINER (widget)->border_width +
+ GTK_WIDGET (widget)->style->xthickness) * 2 +
+ inner_border.left + inner_border.right);
+ requisition->height = ((GTK_CONTAINER (widget)->border_width +
+ GTK_WIDGET (widget)->style->ythickness) * 2 +
+ inner_border.top + inner_border.bottom);
+
+ if (gtk_widget_get_can_default (widget))
{
requisition->width += default_border.left + default_border.right;
requisition->height += default_border.top + default_border.bottom;
}
- if (GTK_BIN (button)->child && GTK_WIDGET_VISIBLE (GTK_BIN (button)->child))
+ if (GTK_BIN (button)->child && gtk_widget_get_visible (GTK_BIN (button)->child))
{
GtkRequisition child_requisition;
gint xthickness = GTK_WIDGET (widget)->style->xthickness;
gint ythickness = GTK_WIDGET (widget)->style->ythickness;
GtkBorder default_border;
+ GtkBorder inner_border;
+ gint focus_width;
+ gint focus_pad;
- gtk_button_get_props (button, &default_border, NULL, NULL);
+ gtk_button_get_props (button, &default_border, NULL, &inner_border, NULL);
+ gtk_widget_style_get (GTK_WIDGET (widget),
+ "focus-line-width", &focus_width,
+ "focus-padding", &focus_pad,
+ NULL);
+
widget->allocation = *allocation;
widget->allocation.width - border_width * 2,
widget->allocation.height - border_width * 2);
- if (GTK_BIN (button)->child && GTK_WIDGET_VISIBLE (GTK_BIN (button)->child))
+ if (GTK_BIN (button)->child && gtk_widget_get_visible (GTK_BIN (button)->child))
{
- child_allocation.x = widget->allocation.x + border_width + CHILD_SPACING + xthickness;
- child_allocation.y = widget->allocation.y + border_width + CHILD_SPACING + ythickness;
+ child_allocation.x = widget->allocation.x + border_width + inner_border.left + xthickness;
+ child_allocation.y = widget->allocation.y + border_width + inner_border.top + ythickness;
- child_allocation.width = MAX (1, widget->allocation.width - (CHILD_SPACING + xthickness) * 2 -
+ child_allocation.width = MAX (1, widget->allocation.width -
+ xthickness * 2 -
+ inner_border.left -
+ inner_border.right -
border_width * 2);
- child_allocation.height = MAX (1, widget->allocation.height - (CHILD_SPACING + ythickness) * 2 -
+ child_allocation.height = MAX (1, widget->allocation.height -
+ ythickness * 2 -
+ inner_border.top -
+ inner_border.bottom -
border_width * 2);
- if (GTK_WIDGET_CAN_DEFAULT (button))
+ if (gtk_widget_get_can_default (GTK_WIDGET (button)))
{
child_allocation.x += default_border.left;
child_allocation.y += default_border.top;
child_allocation.height = MAX (1, child_allocation.height - default_border.top - default_border.bottom);
}
+ if (gtk_widget_get_can_focus (GTK_WIDGET (button)))
+ {
+ child_allocation.x += focus_width + focus_pad;
+ child_allocation.y += focus_width + focus_pad;
+ child_allocation.width = MAX (1, child_allocation.width - (focus_width + focus_pad) * 2);
+ child_allocation.height = MAX (1, child_allocation.height - (focus_width + focus_pad) * 2);
+ }
+
if (button->depressed)
{
gint child_displacement_x;
gint child_displacement_y;
gtk_widget_style_get (widget,
- "child_displacement_x", &child_displacement_x,
- "child_displacement_y", &child_displacement_y,
+ "child-displacement-x", &child_displacement_x,
+ "child-displacement-y", &child_displacement_y,
NULL);
child_allocation.x += child_displacement_x;
child_allocation.y += child_displacement_y;
}
void
-_gtk_button_paint (GtkButton *button,
- GdkRectangle *area,
- GtkStateType state_type,
- GtkShadowType shadow_type,
- const gchar *main_detail,
- const gchar *default_detail)
+_gtk_button_paint (GtkButton *button,
+ const GdkRectangle *area,
+ GtkStateType state_type,
+ GtkShadowType shadow_type,
+ const gchar *main_detail,
+ const gchar *default_detail)
{
GtkWidget *widget;
gint width, height;
gboolean interior_focus;
gint focus_width;
gint focus_pad;
-
- if (GTK_WIDGET_DRAWABLE (button))
+
+ widget = GTK_WIDGET (button);
+
+ if (gtk_widget_is_drawable (widget))
{
- widget = GTK_WIDGET (button);
border_width = GTK_CONTAINER (widget)->border_width;
- gtk_button_get_props (button, &default_border, &default_outside_border, &interior_focus);
- gtk_widget_style_get (GTK_WIDGET (widget),
+ gtk_button_get_props (button, &default_border, &default_outside_border, NULL, &interior_focus);
+ gtk_widget_style_get (widget,
"focus-line-width", &focus_width,
"focus-padding", &focus_pad,
NULL);
width = widget->allocation.width - border_width * 2;
height = widget->allocation.height - border_width * 2;
- if (GTK_WIDGET_HAS_DEFAULT (widget) &&
+ if (gtk_widget_has_default (widget) &&
GTK_BUTTON (widget)->relief == GTK_RELIEF_NORMAL)
{
gtk_paint_box (widget->style, widget->window,
width -= default_border.left + default_border.right;
height -= default_border.top + default_border.bottom;
}
- else if (GTK_WIDGET_CAN_DEFAULT (widget))
+ else if (gtk_widget_get_can_default (widget))
{
x += default_outside_border.left;
y += default_outside_border.top;
height -= default_outside_border.top + default_outside_border.bottom;
}
- if (!interior_focus && GTK_WIDGET_HAS_FOCUS (widget))
+ if (!interior_focus && gtk_widget_has_focus (widget))
{
x += focus_width + focus_pad;
y += focus_width + focus_pad;
shadow_type, area, widget, "button",
x, y, width, height);
- if (GTK_WIDGET_HAS_FOCUS (widget))
+ if (gtk_widget_has_focus (widget))
{
+ gint child_displacement_x;
+ gint child_displacement_y;
+ gboolean displace_focus;
+
+ gtk_widget_style_get (widget,
+ "child-displacement-y", &child_displacement_y,
+ "child-displacement-x", &child_displacement_x,
+ "displace-focus", &displace_focus,
+ NULL);
+
if (interior_focus)
{
x += widget->style->xthickness + focus_pad;
y += widget->style->ythickness + focus_pad;
width -= 2 * (widget->style->xthickness + focus_pad);
- height -= 2 * (widget->style->xthickness + focus_pad);
+ height -= 2 * (widget->style->ythickness + focus_pad);
}
else
{
height += 2 * (focus_width + focus_pad);
}
+ if (button->depressed && displace_focus)
+ {
+ x += child_displacement_x;
+ y += child_displacement_y;
+ }
+
gtk_paint_focus (widget->style, widget->window, GTK_WIDGET_STATE (widget),
area, widget, "button",
x, y, width, height);
gtk_button_expose (GtkWidget *widget,
GdkEventExpose *event)
{
- if (GTK_WIDGET_DRAWABLE (widget))
+ if (gtk_widget_is_drawable (widget))
{
GtkButton *button = GTK_BUTTON (widget);
GTK_WIDGET_STATE (widget),
button->depressed ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
"button", "buttondefault");
-
- (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
+
+ GTK_WIDGET_CLASS (gtk_button_parent_class)->expose_event (widget, event);
}
-
+
return FALSE;
}
{
button = GTK_BUTTON (widget);
- if (button->focus_on_click && !GTK_WIDGET_HAS_FOCUS (widget))
+ if (button->focus_on_click && !gtk_widget_has_focus (widget))
gtk_widget_grab_focus (widget);
if (event->button == 1)
return TRUE;
}
+static gboolean
+gtk_button_grab_broken (GtkWidget *widget,
+ GdkEventGrabBroken *event)
+{
+ GtkButton *button = GTK_BUTTON (widget);
+ gboolean save_in;
+
+ /* Simulate a button release without the pointer in the button */
+ if (button->button_down)
+ {
+ save_in = button->in_button;
+ button->in_button = FALSE;
+ gtk_button_released (button);
+ if (save_in != button->in_button)
+ {
+ button->in_button = save_in;
+ gtk_button_update_state (button);
+ }
+ }
+
+ return TRUE;
+}
+
static gboolean
gtk_button_key_release (GtkWidget *widget,
GdkEventKey *event)
gtk_button_finish_activate (button, TRUE);
return TRUE;
}
- else if (GTK_WIDGET_CLASS (parent_class)->key_release_event)
- return GTK_WIDGET_CLASS (parent_class)->key_release_event (widget, event);
+ else if (GTK_WIDGET_CLASS (gtk_button_parent_class)->key_release_event)
+ return GTK_WIDGET_CLASS (gtk_button_parent_class)->key_release_event (widget, event);
else
return FALSE;
}
event_widget = gtk_get_event_widget ((GdkEvent*) event);
if ((event_widget == widget) &&
- (event->detail != GDK_NOTIFY_INFERIOR))
+ (event->detail != GDK_NOTIFY_INFERIOR) &&
+ (gtk_widget_get_sensitive (event_widget)))
{
button->in_button = FALSE;
gtk_button_leave (button);
}
}
+static void
+gtk_real_button_clicked (GtkButton *button)
+{
+ GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button);
+
+ if (priv->action)
+ gtk_action_activate (priv->action);
+}
+
static gboolean
button_activate_timeout (gpointer data)
{
- GDK_THREADS_ENTER ();
-
gtk_button_finish_activate (data, TRUE);
- GDK_THREADS_LEAVE ();
-
return FALSE;
}
gtk_real_button_activate (GtkButton *button)
{
GtkWidget *widget = GTK_WIDGET (button);
-
+ GtkButtonPrivate *priv;
+ guint32 time;
+
+ priv = GTK_BUTTON_GET_PRIVATE (button);
+
if (GTK_WIDGET_REALIZED (button) && !button->activate_timeout)
{
- if (gdk_keyboard_grab (button->event_window, TRUE,
- gtk_get_current_event_time ()) == 0)
+ time = gtk_get_current_event_time ();
+ if (gdk_keyboard_grab (button->event_window, TRUE, time) ==
+ GDK_GRAB_SUCCESS)
{
- gtk_grab_add (widget);
-
- button->activate_timeout = g_timeout_add (ACTIVATE_TIMEOUT,
- button_activate_timeout,
- button);
- button->button_down = TRUE;
- gtk_button_update_state (button);
- gtk_widget_queue_draw (GTK_WIDGET (button));
+ priv->has_grab = TRUE;
+ priv->grab_time = time;
}
+
+ gtk_grab_add (widget);
+
+ button->activate_timeout = gdk_threads_add_timeout (ACTIVATE_TIMEOUT,
+ button_activate_timeout,
+ button);
+ button->button_down = TRUE;
+ gtk_button_update_state (button);
+ gtk_widget_queue_draw (GTK_WIDGET (button));
}
}
gboolean do_it)
{
GtkWidget *widget = GTK_WIDGET (button);
+ GtkButtonPrivate *priv;
+ priv = GTK_BUTTON_GET_PRIVATE (button);
+
g_source_remove (button->activate_timeout);
button->activate_timeout = 0;
- gdk_display_keyboard_ungrab (gtk_widget_get_display (widget),
- gtk_get_current_event_time ());
+ if (priv->has_grab)
+ {
+ gdk_display_keyboard_ungrab (gtk_widget_get_display (widget),
+ priv->grab_time);
+ }
gtk_grab_remove (widget);
button->button_down = FALSE;
gtk_button_construct_child (button);
- g_object_notify (G_OBJECT (button), "use_underline");
+ g_object_notify (G_OBJECT (button), "use-underline");
}
}
* @button: a #GtkButton
* @use_stock: %TRUE if the button should use a stock item
*
- * If true, the label set on the button is used as a
+ * If %TRUE, the label set on the button is used as a
* stock id to select the stock item for the button.
*/
void
gtk_button_construct_child (button);
- g_object_notify (G_OBJECT (button), "use_stock");
+ g_object_notify (G_OBJECT (button), "use-stock");
}
}
/**
* gtk_button_set_focus_on_click:
* @button: a #GtkButton
- * @focus_on_click: whether the mouse grabs focus when clicked with the mouse
+ * @focus_on_click: whether the button grabs focus when clicked with the mouse
*
* Sets whether the button will grab focus when it is clicked with the mouse.
* Making mouse clicks not grab focus is useful in places like toolbars where
{
button->focus_on_click = focus_on_click;
- g_object_notify (G_OBJECT (button), "focus_on_click");
+ g_object_notify (G_OBJECT (button), "focus-on-click");
}
}
priv->xalign = xalign;
priv->yalign = yalign;
+ priv->align_set = 1;
- maybe_set_alignment (GTK_BIN (button)->child, xalign, yalign);
+ maybe_set_alignment (button, GTK_BIN (button)->child);
g_object_freeze_notify (G_OBJECT (button));
g_object_notify (G_OBJECT (button), "xalign");
GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button);
if (priv->image)
- g_object_set (priv->image, "visible", show_image (button), NULL);
+ {
+ if (show_image (button))
+ gtk_widget_show (priv->image);
+ else
+ gtk_widget_hide (priv->image);
+ }
+}
+
+static void
+traverse_container (GtkWidget *widget,
+ gpointer data)
+{
+ if (GTK_IS_BUTTON (widget))
+ show_image_change_notify (GTK_BUTTON (widget));
+ else if (GTK_IS_CONTAINER (widget))
+ gtk_container_forall (GTK_CONTAINER (widget), traverse_container, NULL);
}
+static void
+gtk_button_setting_changed (GtkSettings *settings)
+{
+ GList *list, *l;
+
+ list = gtk_window_list_toplevels ();
+
+ for (l = list; l; l = l->next)
+ gtk_container_forall (GTK_CONTAINER (l->data),
+ traverse_container, NULL);
+
+ g_list_free (list);
+}
+
+
static void
gtk_button_screen_changed (GtkWidget *widget,
GdkScreen *previous_screen)
{
- GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (widget);
+ GtkButton *button;
GtkSettings *settings;
+ guint show_image_connection;
- if (gtk_widget_has_screen (widget))
- settings = gtk_widget_get_settings (widget);
- else
- settings = NULL;
+ if (!gtk_widget_has_screen (widget))
+ return;
+
+ button = GTK_BUTTON (widget);
- if (settings == priv->settings)
+ /* If the button is being pressed while the screen changes the
+ release might never occur, so we reset the state. */
+ if (button->button_down)
+ {
+ button->button_down = FALSE;
+ gtk_button_update_state (button);
+ }
+
+ settings = gtk_widget_get_settings (widget);
+
+ show_image_connection =
+ GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (settings),
+ "gtk-button-connection"));
+
+ if (show_image_connection)
return;
- if (priv->settings)
+ show_image_connection =
+ g_signal_connect (settings, "notify::gtk-button-images",
+ G_CALLBACK (gtk_button_setting_changed), NULL);
+ g_object_set_data (G_OBJECT (settings),
+ I_("gtk-button-connection"),
+ GUINT_TO_POINTER (show_image_connection));
+
+ show_image_change_notify (button);
+}
+
+static void
+gtk_button_state_changed (GtkWidget *widget,
+ GtkStateType previous_state)
+{
+ GtkButton *button = GTK_BUTTON (widget);
+
+ if (!gtk_widget_is_sensitive (widget))
{
- g_signal_handler_disconnect (priv->settings, priv->show_image_connection);
- g_object_unref (priv->settings);
+ button->in_button = FALSE;
+ gtk_real_button_released (button);
}
+}
- if (settings)
+static void
+gtk_button_grab_notify (GtkWidget *widget,
+ gboolean was_grabbed)
+{
+ GtkButton *button = GTK_BUTTON (widget);
+ gboolean save_in;
+
+ if (!was_grabbed)
{
- priv->show_image_connection =
- g_signal_connect_swapped (settings,
- "notify::gtk-button-images",
- G_CALLBACK (show_image_change_notify),
- widget);
-
- g_object_ref (settings);
- priv->settings = settings;
+ save_in = button->in_button;
+ button->in_button = FALSE;
+ gtk_real_button_released (button);
+ if (save_in != button->in_button)
+ {
+ button->in_button = save_in;
+ gtk_button_update_state (button);
+ }
}
- else
- priv->settings = NULL;
+}
+
+/**
+ * gtk_button_set_image:
+ * @button: a #GtkButton
+ * @image: a widget to set as the image for the button
+ *
+ * Set the image of @button to the given widget. Note that
+ * it depends on the #GtkSettings:gtk-button-images setting whether the
+ * image will be displayed or not, you don't have to call
+ * gtk_widget_show() on @image yourself.
+ *
+ * Since: 2.6
+ */
+void
+gtk_button_set_image (GtkButton *button,
+ GtkWidget *image)
+{
+ GtkButtonPrivate *priv;
+
+ g_return_if_fail (GTK_IS_BUTTON (button));
+ g_return_if_fail (image == NULL || GTK_IS_WIDGET (image));
+
+ priv = GTK_BUTTON_GET_PRIVATE (button);
+
+ if (priv->image && priv->image->parent)
+ gtk_container_remove (GTK_CONTAINER (priv->image->parent), priv->image);
+
+ priv->image = image;
+ priv->image_is_stock = (image == NULL);
+
+ gtk_button_construct_child (button);
- show_image_change_notify (GTK_BUTTON (widget));
+ g_object_notify (G_OBJECT (button), "image");
}
+
+/**
+ * gtk_button_get_image:
+ * @button: a #GtkButton
+ *
+ * Gets the widget that is currenty set as the image of @button.
+ * This may have been explicitly set by gtk_button_set_image()
+ * or constructed by gtk_button_new_from_stock().
+ *
+ * Return value: a #GtkWidget or %NULL in case there is no image
+ *
+ * Since: 2.6
+ */
+GtkWidget *
+gtk_button_get_image (GtkButton *button)
+{
+ GtkButtonPrivate *priv;
+
+ g_return_val_if_fail (GTK_IS_BUTTON (button), NULL);
+
+ priv = GTK_BUTTON_GET_PRIVATE (button);
+
+ return priv->image;
+}
+
+/**
+ * gtk_button_set_image_position:
+ * @button: a #GtkButton
+ * @position: the position
+ *
+ * Sets the position of the image relative to the text
+ * inside the button.
+ *
+ * Since: 2.10
+ */
+void
+gtk_button_set_image_position (GtkButton *button,
+ GtkPositionType position)
+{
+
+ GtkButtonPrivate *priv;
+
+ g_return_if_fail (GTK_IS_BUTTON (button));
+ g_return_if_fail (position >= GTK_POS_LEFT && position <= GTK_POS_BOTTOM);
+
+ priv = GTK_BUTTON_GET_PRIVATE (button);
+
+ if (priv->image_position != position)
+ {
+ priv->image_position = position;
+
+ gtk_button_construct_child (button);
+
+ g_object_notify (G_OBJECT (button), "image-position");
+ }
+}
+
+/**
+ * gtk_button_get_image_position:
+ * @button: a #GtkButton
+ *
+ * Gets the position of the image relative to the text
+ * inside the button.
+ *
+ * Return value: the position
+ *
+ * Since: 2.10
+ */
+GtkPositionType
+gtk_button_get_image_position (GtkButton *button)
+{
+ GtkButtonPrivate *priv;
+
+ g_return_val_if_fail (GTK_IS_BUTTON (button), GTK_POS_LEFT);
+
+ priv = GTK_BUTTON_GET_PRIVATE (button);
+
+ return priv->image_position;
+}
+
+
+#define __GTK_BUTTON_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff