#include "gtkintl.h"
#include "gtkprivate.h"
#include <gdk/gdkkeysyms.h>
+#include "gtkdnd.h"
+#include "gtkalias.h"
#define GTK_EXPANDER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_EXPANDER, GtkExpanderPrivate))
PROP_LABEL,
PROP_USE_UNDERLINE,
PROP_USE_MARKUP,
- PROP_PADDING,
+ PROP_SPACING,
PROP_LABEL_WIDGET
};
GtkExpanderStyle expander_style;
guint animation_timeout;
+ guint expand_timer;
guint expanded : 1;
guint use_underline : 1;
guint prelight : 1;
};
-static void gtk_expander_class_init (GtkExpanderClass *klass);
-static void gtk_expander_init (GtkExpander *expander);
-
static void gtk_expander_set_property (GObject *object,
guint prop_id,
const GValue *value,
gboolean was_grabbed);
static void gtk_expander_state_changed (GtkWidget *widget,
GtkStateType previous_state);
+static gboolean gtk_expander_drag_motion (GtkWidget *widget,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ guint time);
+static void gtk_expander_drag_leave (GtkWidget *widget,
+ GdkDragContext *context,
+ guint time);
static void gtk_expander_add (GtkContainer *container,
GtkWidget *widget);
static void gtk_expander_activate (GtkExpander *expander);
-static GtkBinClass *parent_class = NULL;
+static void get_expander_bounds (GtkExpander *expander,
+ GdkRectangle *rect);
-GType
-gtk_expander_get_type (void)
-{
- static GType expander_type = 0;
-
- if (!expander_type)
- {
- static const GTypeInfo expander_info =
- {
- sizeof (GtkExpanderClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) gtk_expander_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GtkExpander),
- 0, /* n_preallocs */
- (GInstanceInitFunc) gtk_expander_init,
- };
-
- expander_type = g_type_register_static (GTK_TYPE_BIN,
- "GtkExpander",
- &expander_info, 0);
- }
-
- return expander_type;
-}
+G_DEFINE_TYPE (GtkExpander, gtk_expander, GTK_TYPE_BIN)
static void
gtk_expander_class_init (GtkExpanderClass *klass)
GtkWidgetClass *widget_class;
GtkContainerClass *container_class;
- parent_class = g_type_class_peek_parent (klass);
-
gobject_class = (GObjectClass *) klass;
object_class = (GtkObjectClass *) klass;
widget_class = (GtkWidgetClass *) klass;
widget_class->focus = gtk_expander_focus;
widget_class->grab_notify = gtk_expander_grab_notify;
widget_class->state_changed = gtk_expander_state_changed;
+ widget_class->drag_motion = gtk_expander_drag_motion;
+ widget_class->drag_leave = gtk_expander_drag_leave;
container_class->add = gtk_expander_add;
container_class->remove = gtk_expander_remove;
P_("Expanded"),
P_("Whether the expander has been opened to reveal the child widget"),
FALSE,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (gobject_class,
PROP_LABEL,
P_("Label"),
P_("Text of the expander's label"),
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_MARKUP,
- g_param_spec_boolean ("use_markup",
+ g_param_spec_boolean ("use-markup",
P_("Use markup"),
P_("The text of the label includes XML markup. See pango_parse_markup()"),
FALSE,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (gobject_class,
- PROP_PADDING,
+ PROP_SPACING,
g_param_spec_int ("spacing",
P_("Spacing"),
P_("Space to put between the label and the child"),
0,
G_MAXINT,
0,
- G_PARAM_READWRITE));
+ GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_LABEL_WIDGET,
- g_param_spec_object ("label_widget",
+ g_param_spec_object ("label-widget",
P_("Label widget"),
P_("A widget to display in place of the usual expander label"),
GTK_TYPE_WIDGET,
- G_PARAM_READWRITE));
+ GTK_PARAM_READWRITE));
gtk_widget_class_install_style_property (widget_class,
g_param_spec_int ("expander-size",
0,
G_MAXINT,
DEFAULT_EXPANDER_SIZE,
- G_PARAM_READABLE));
+ GTK_PARAM_READABLE));
gtk_widget_class_install_style_property (widget_class,
g_param_spec_int ("expander-spacing",
0,
G_MAXINT,
DEFAULT_EXPANDER_SPACING,
- G_PARAM_READABLE));
+ GTK_PARAM_READABLE));
widget_class->activate_signal =
- g_signal_new ("activate",
+ g_signal_new (I_("activate"),
G_TYPE_FROM_CLASS (gobject_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkExpanderClass, activate),
priv->use_markup = FALSE;
priv->button_down = FALSE;
priv->prelight = FALSE;
+ priv->expand_timer = 0;
+
+ gtk_drag_dest_set (GTK_WIDGET (expander), 0, NULL, 0, 0);
+ gtk_drag_dest_set_track_motion (GTK_WIDGET (expander), TRUE);
}
static void
case PROP_USE_MARKUP:
gtk_expander_set_use_markup (expander, g_value_get_boolean (value));
break;
- case PROP_PADDING:
+ case PROP_SPACING:
gtk_expander_set_spacing (expander, g_value_get_int (value));
break;
case PROP_LABEL_WIDGET:
case PROP_USE_MARKUP:
g_value_set_boolean (value, priv->use_markup);
break;
- case PROP_PADDING:
+ case PROP_SPACING:
g_value_set_int (value, priv->spacing);
break;
case PROP_LABEL_WIDGET:
priv->animation_timeout = 0;
}
- GTK_OBJECT_CLASS (parent_class)->destroy (object);
+ GTK_OBJECT_CLASS (gtk_expander_parent_class)->destroy (object);
}
static void
GdkWindowAttr attributes;
gint attributes_mask;
gint border_width;
+ GdkRectangle expander_rect;
priv = GTK_EXPANDER (widget)->priv;
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
border_width = GTK_CONTAINER (widget)->border_width;
-
+
+ get_expander_bounds (GTK_EXPANDER (widget), &expander_rect);
+
attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = widget->allocation.x + border_width;
- attributes.y = widget->allocation.y + border_width;
- attributes.width = widget->allocation.width - 2 * border_width;
- attributes.height = widget->allocation.height - 2 * border_width;
+ attributes.y = expander_rect.y;
+ attributes.width = MAX (widget->allocation.width - 2 * border_width, 1);
+ attributes.height = expander_rect.width;
attributes.wclass = GDK_INPUT_ONLY;
attributes.event_mask = gtk_widget_get_events (widget) |
GDK_BUTTON_PRESS_MASK |
priv->event_window = NULL;
}
- GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
+ GTK_WIDGET_CLASS (gtk_expander_parent_class)->unrealize (widget);
}
static void
GdkRectangle *rect)
{
GtkWidget *widget;
- GtkBin *bin;
GtkExpanderPrivate *priv;
gint border_width;
gint expander_size;
gboolean ltr;
widget = GTK_WIDGET (expander);
- bin = GTK_BIN (expander);
priv = expander->priv;
border_width = GTK_CONTAINER (expander)->border_width;
ltr = gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL;
- label_allocation.x = widget->allocation.x + border_width + focus_width + focus_pad;
if (ltr)
- label_allocation.x += expander_size + 2 * expander_spacing;
+ label_allocation.x = (widget->allocation.x +
+ border_width + focus_width + focus_pad +
+ expander_size + 2 * expander_spacing);
+ else
+ label_allocation.x = (widget->allocation.x + widget->allocation.width -
+ (label_requisition.width +
+ border_width + focus_width + focus_pad +
+ expander_size + 2 * expander_spacing));
+
label_allocation.y = widget->allocation.y + border_width + focus_width + focus_pad;
label_allocation.width = MIN (label_requisition.width,
if (priv->label_widget)
gtk_widget_map (priv->label_widget);
- GTK_WIDGET_CLASS (parent_class)->map (widget);
+ GTK_WIDGET_CLASS (gtk_expander_parent_class)->map (widget);
if (priv->event_window)
gdk_window_show (priv->event_window);
if (priv->event_window)
gdk_window_hide (priv->event_window);
- GTK_WIDGET_CLASS (parent_class)->unmap (widget);
+ GTK_WIDGET_CLASS (gtk_expander_parent_class)->unmap (widget);
if (priv->label_widget)
gtk_widget_unmap (priv->label_widget);
ltr = gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL;
- x = widget->allocation.x + border_width;
- y = widget->allocation.y + border_width;
-
- if (ltr && interior_focus)
- x += expander_spacing * 2 + expander_size;
-
width = height = 0;
if (priv->label_widget && GTK_WIDGET_VISIBLE (priv->label_widget))
height = label_allocation.height;
}
+ width += 2 * focus_pad + 2 * focus_width;
+ height += 2 * focus_pad + 2 * focus_width;
+
+ x = widget->allocation.x + border_width;
+ y = widget->allocation.y + border_width;
+
+ if (ltr)
+ {
+ if (interior_focus)
+ x += expander_spacing * 2 + expander_size;
+ }
+ else
+ {
+ x += widget->allocation.width - 2 * border_width
+ - expander_spacing * 2 - expander_size - width;
+ }
+
if (!interior_focus)
{
width += expander_size + 2 * expander_spacing;
height = MAX (height, expander_size + 2 * expander_spacing);
}
- width += 2 * focus_pad + 2 * focus_width;
- height += 2 * focus_pad + 2 * focus_width;
-
gtk_paint_focus (widget->style, widget->window, GTK_WIDGET_STATE (widget),
area, widget, "expander",
x, y, width, height);
if (GTK_WIDGET_HAS_FOCUS (expander))
gtk_expander_paint_focus (expander, &event->area);
- if (expander->priv->label_widget)
- gtk_container_propagate_expose (GTK_CONTAINER (widget),
- expander->priv->label_widget,
- event);
-
- GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
+ GTK_WIDGET_CLASS (gtk_expander_parent_class)->expose_event (widget, event);
}
return FALSE;
return FALSE;
}
+static gboolean
+expand_timeout (gpointer data)
+{
+ GtkExpander *expander = GTK_EXPANDER (data);
+ GtkExpanderPrivate *priv = expander->priv;
+
+ priv->expand_timer = 0;
+ gtk_expander_set_expanded (expander, TRUE);
+
+ return FALSE;
+}
+
+static gboolean
+gtk_expander_drag_motion (GtkWidget *widget,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ guint time)
+{
+ GtkExpander *expander = GTK_EXPANDER (widget);
+ GtkExpanderPrivate *priv = expander->priv;
+
+ if (!priv->expanded && !priv->expand_timer)
+ {
+ GtkSettings *settings;
+ guint timeout;
+
+ settings = gtk_widget_get_settings (widget);
+ g_object_get (settings, "gtk-timeout-expand", &timeout, NULL);
+
+ priv->expand_timer = g_timeout_add (timeout, (GSourceFunc) expand_timeout, expander);
+ }
+
+ return TRUE;
+}
+
+static void
+gtk_expander_drag_leave (GtkWidget *widget,
+ GdkDragContext *context,
+ guint time)
+{
+ GtkExpander *expander = GTK_EXPANDER (widget);
+ GtkExpanderPrivate *priv = expander->priv;
+
+ if (priv->expand_timer)
+ {
+ g_source_remove (priv->expand_timer);
+ priv->expand_timer = 0;
+ }
+}
+
typedef enum
{
FOCUS_NONE,
gtk_expander_add (GtkContainer *container,
GtkWidget *widget)
{
- GTK_CONTAINER_CLASS (parent_class)->add (container, widget);
+ GTK_CONTAINER_CLASS (gtk_expander_parent_class)->add (container, widget);
gtk_widget_set_child_visible (widget, GTK_EXPANDER (container)->priv->expanded);
gtk_widget_queue_resize (GTK_WIDGET (container));
if (GTK_EXPANDER (expander)->priv->label_widget == widget)
gtk_expander_set_label_widget (expander, NULL);
else
- GTK_CONTAINER_CLASS (parent_class)->remove (container, widget);
+ GTK_CONTAINER_CLASS (gtk_expander_parent_class)->remove (container, widget);
}
static void
gtk_expander_set_expanded (expander, !expander->priv->expanded);
}
-
/**
* gtk_expander_new:
* @label: the text of the label
{
return g_object_new (GTK_TYPE_EXPANDER,
"label", label,
- "use_underline", TRUE,
+ "use-underline", TRUE,
NULL);
}
if (priv->expanded != expanded)
{
+ GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (expander));
+ gboolean enable_animations;
+
priv->expanded = expanded;
- if (GTK_WIDGET_REALIZED (expander))
+ g_object_get (settings, "gtk-enable-animations", &enable_animations, NULL);
+
+ if (enable_animations && GTK_WIDGET_REALIZED (expander))
{
gtk_expander_start_animation (expander);
}
- else
+ else
{
priv->expander_style = expanded ? GTK_EXPANDER_EXPANDED :
GTK_EXPANDER_COLLAPSED;
if (priv->label_widget && GTK_IS_LABEL (priv->label_widget))
gtk_label_set_use_underline (GTK_LABEL (priv->label_widget), use_underline);
- g_object_notify (G_OBJECT (expander), "use_underline");
+ g_object_notify (G_OBJECT (expander), "use-underline");
}
}
if (priv->label_widget && GTK_IS_LABEL (priv->label_widget))
gtk_label_set_use_markup (GTK_LABEL (priv->label_widget), use_markup);
- g_object_notify (G_OBJECT (expander), "use_markup");
+ g_object_notify (G_OBJECT (expander), "use-markup");
}
}
gtk_widget_queue_resize (GTK_WIDGET (expander));
g_object_freeze_notify (G_OBJECT (expander));
- g_object_notify (G_OBJECT (expander), "label_widget");
+ g_object_notify (G_OBJECT (expander), "label-widget");
g_object_notify (G_OBJECT (expander), "label");
g_object_thaw_notify (G_OBJECT (expander));
}
return expander->priv->label_widget;
}
+
+#define __GTK_EXPANDER_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff