* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include "config.h"
#include "gdkconfig.h"
#include "gtklayout.h"
-#include "gtksignal.h"
#include "gtkprivate.h"
#include "gtkintl.h"
+#include "gtkmarshalers.h"
+
typedef struct _GtkLayoutChild GtkLayoutChild;
+struct _GtkLayoutPriv
+{
+ /* Properties */
+ guint width;
+ guint height;
+
+ GtkAdjustment *hadjustment;
+ GtkAdjustment *vadjustment;
+ /* Properties */
+
+ GdkVisibilityState visibility;
+ GdkWindow *bin_window;
+
+ GList *children;
+
+ gint scroll_x;
+ gint scroll_y;
+
+ guint freeze_count;
+};
+
struct _GtkLayoutChild {
GtkWidget *widget;
gint x;
CHILD_PROP_Y
};
-static void gtk_layout_class_init (GtkLayoutClass *class);
static void gtk_layout_get_property (GObject *object,
guint prop_id,
GValue *value,
guint prop_id,
const GValue *value,
GParamSpec *pspec);
-static void gtk_layout_init (GtkLayout *layout);
+static GObject *gtk_layout_constructor (GType type,
+ guint n_properties,
+ GObjectConstructParam *properties);
static void gtk_layout_finalize (GObject *object);
static void gtk_layout_realize (GtkWidget *widget);
static void gtk_layout_unrealize (GtkWidget *widget);
GtkAllocation *allocation);
static gint gtk_layout_expose (GtkWidget *widget,
GdkEventExpose *event);
+static void gtk_layout_add (GtkContainer *container,
+ GtkWidget *widget);
static void gtk_layout_remove (GtkContainer *container,
GtkWidget *widget);
static void gtk_layout_forall (GtkContainer *container,
GtkLayoutChild *child);
static void gtk_layout_adjustment_changed (GtkAdjustment *adjustment,
GtkLayout *layout);
+static void gtk_layout_style_set (GtkWidget *widget,
+ GtkStyle *old_style);
+static void gtk_layout_set_adjustment_upper (GtkAdjustment *adj,
+ gdouble upper,
+ gboolean always_emit_changed);
-static GtkWidgetClass *parent_class = NULL;
+G_DEFINE_TYPE (GtkLayout, gtk_layout, GTK_TYPE_CONTAINER)
/* Public interface
*/
/**
* gtk_layout_new:
- * @hadjustment: horizontal scroll adjustment, or %NULL
- * @vadjustment: vertical scroll adjustment, or %NULL
+ * @hadjustment: (allow-none): horizontal scroll adjustment, or %NULL
+ * @vadjustment: (allow-none): vertical scroll adjustment, or %NULL
*
* Creates a new #GtkLayout. Unless you have a specific adjustment
* you'd like the layout to use for scrolling, pass %NULL for
{
GtkLayout *layout;
- layout = gtk_type_new (GTK_TYPE_LAYOUT);
-
- gtk_layout_set_adjustments (layout, hadjustment, vadjustment);
+ layout = g_object_new (GTK_TYPE_LAYOUT,
+ "hadjustment", hadjustment,
+ "vadjustment", vadjustment,
+ NULL);
return GTK_WIDGET (layout);
}
+/**
+ * gtk_layout_get_bin_window:
+ * @layout: a #GtkLayout
+ *
+ * Retrieve the bin window of the layout used for drawing operations.
+ *
+ * Return value: a #GdkWindow
+ *
+ * Since: 2.14
+ **/
+GdkWindow*
+gtk_layout_get_bin_window (GtkLayout *layout)
+{
+ g_return_val_if_fail (GTK_IS_LAYOUT (layout), NULL);
+
+ return layout->priv->bin_window;
+}
+
/**
* gtk_layout_get_hadjustment:
* @layout: a #GtkLayout
{
g_return_val_if_fail (GTK_IS_LAYOUT (layout), NULL);
- return layout->hadjustment;
+ return layout->priv->hadjustment;
}
/**
* gtk_layout_get_vadjustment:
{
g_return_val_if_fail (GTK_IS_LAYOUT (layout), NULL);
- return layout->vadjustment;
+ return layout->priv->vadjustment;
+}
+
+static GtkAdjustment *
+new_default_adjustment (void)
+{
+ return GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0));
}
static void
GtkAdjustment *hadj,
GtkAdjustment *vadj)
{
+ GtkLayoutPriv *priv = layout->priv;
gboolean need_adjust = FALSE;
- g_return_if_fail (GTK_IS_LAYOUT (layout));
-
if (hadj)
g_return_if_fail (GTK_IS_ADJUSTMENT (hadj));
- else
- hadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0));
+ else if (priv->hadjustment)
+ hadj = new_default_adjustment ();
if (vadj)
g_return_if_fail (GTK_IS_ADJUSTMENT (vadj));
- else
- vadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0));
-
- if (layout->hadjustment && (layout->hadjustment != hadj))
+ else if (priv->vadjustment)
+ vadj = new_default_adjustment ();
+
+ if (priv->hadjustment && (priv->hadjustment != hadj))
{
- gtk_signal_disconnect_by_data (GTK_OBJECT (layout->hadjustment), layout);
- gtk_object_unref (GTK_OBJECT (layout->hadjustment));
+ g_signal_handlers_disconnect_by_func (priv->hadjustment,
+ gtk_layout_adjustment_changed,
+ layout);
+ g_object_unref (priv->hadjustment);
}
-
- if (layout->vadjustment && (layout->vadjustment != vadj))
+
+ if (priv->vadjustment && (priv->vadjustment != vadj))
{
- gtk_signal_disconnect_by_data (GTK_OBJECT (layout->vadjustment), layout);
- gtk_object_unref (GTK_OBJECT (layout->vadjustment));
+ g_signal_handlers_disconnect_by_func (priv->vadjustment,
+ gtk_layout_adjustment_changed,
+ layout);
+ g_object_unref (priv->vadjustment);
}
-
- if (layout->hadjustment != hadj)
+
+ if (priv->hadjustment != hadj)
{
- layout->hadjustment = hadj;
- gtk_object_ref (GTK_OBJECT (layout->hadjustment));
- gtk_object_sink (GTK_OBJECT (layout->hadjustment));
-
- gtk_signal_connect (GTK_OBJECT (layout->hadjustment), "value_changed",
- (GtkSignalFunc) gtk_layout_adjustment_changed,
- layout);
+ priv->hadjustment = hadj;
+ g_object_ref_sink (priv->hadjustment);
+ gtk_layout_set_adjustment_upper (priv->hadjustment, priv->width, FALSE);
+
+ g_signal_connect (priv->hadjustment, "value-changed",
+ G_CALLBACK (gtk_layout_adjustment_changed),
+ layout);
need_adjust = TRUE;
}
-
- if (layout->vadjustment != vadj)
+
+ if (priv->vadjustment != vadj)
{
- layout->vadjustment = vadj;
- gtk_object_ref (GTK_OBJECT (layout->vadjustment));
- gtk_object_sink (GTK_OBJECT (layout->vadjustment));
-
- gtk_signal_connect (GTK_OBJECT (layout->vadjustment), "value_changed",
- (GtkSignalFunc) gtk_layout_adjustment_changed,
- layout);
+ priv->vadjustment = vadj;
+ g_object_ref_sink (priv->vadjustment);
+ gtk_layout_set_adjustment_upper (priv->vadjustment, priv->height, FALSE);
+
+ g_signal_connect (priv->vadjustment, "value-changed",
+ G_CALLBACK (gtk_layout_adjustment_changed),
+ layout);
need_adjust = TRUE;
}
- if (need_adjust)
+ /* vadj or hadj can be NULL while constructing; don't emit a signal
+ then */
+ if (need_adjust && vadj && hadj)
gtk_layout_adjustment_changed (NULL, layout);
}
gtk_layout_finalize (GObject *object)
{
GtkLayout *layout = GTK_LAYOUT (object);
+ GtkLayoutPriv *priv = layout->priv;
- gtk_object_unref (GTK_OBJECT (layout->hadjustment));
- gtk_object_unref (GTK_OBJECT (layout->vadjustment));
+ g_object_unref (priv->hadjustment);
+ g_object_unref (priv->vadjustment);
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gtk_layout_parent_class)->finalize (object);
}
/**
* gtk_layout_set_hadjustment:
* @layout: a #GtkLayout
- * @adjustment: new scroll adjustment
+ * @adjustment: (allow-none): new scroll adjustment
*
* Sets the horizontal scroll adjustment for the layout.
*
gtk_layout_set_hadjustment (GtkLayout *layout,
GtkAdjustment *adjustment)
{
+ GtkLayoutPriv *priv;
+
g_return_if_fail (GTK_IS_LAYOUT (layout));
- gtk_layout_set_adjustments (layout, adjustment, layout->vadjustment);
+ priv = layout->priv;
+
+ gtk_layout_set_adjustments (layout, adjustment, priv->vadjustment);
g_object_notify (G_OBJECT (layout), "hadjustment");
}
/**
* gtk_layout_set_vadjustment:
* @layout: a #GtkLayout
- * @adjustment: new scroll adjustment
+ * @adjustment: (allow-none): new scroll adjustment
*
* Sets the vertical scroll adjustment for the layout.
*
gtk_layout_set_vadjustment (GtkLayout *layout,
GtkAdjustment *adjustment)
{
+ GtkLayoutPriv *priv;
+
g_return_if_fail (GTK_IS_LAYOUT (layout));
-
- gtk_layout_set_adjustments (layout, layout->hadjustment, adjustment);
+
+ priv = layout->priv;
+
+ gtk_layout_set_adjustments (layout, priv->hadjustment, adjustment);
g_object_notify (G_OBJECT (layout), "vadjustment");
}
get_child (GtkLayout *layout,
GtkWidget *widget)
{
+ GtkLayoutPriv *priv = layout->priv;
GList *children;
-
- children = layout->children;
+
+ children = priv->children;
while (children)
{
GtkLayoutChild *child;
gint x,
gint y)
{
+ GtkLayoutPriv *priv;
GtkLayoutChild *child;
g_return_if_fail (GTK_IS_LAYOUT (layout));
g_return_if_fail (GTK_IS_WIDGET (child_widget));
-
+
+ priv = layout->priv;
+
child = g_new (GtkLayoutChild, 1);
child->widget = child_widget;
child->x = x;
child->y = y;
- layout->children = g_list_append (layout->children, child);
-
- if (GTK_WIDGET_REALIZED (layout))
- gtk_widget_set_parent_window (child->widget, layout->bin_window);
+ priv->children = g_list_append (priv->children, child);
+
+ if (gtk_widget_get_realized (GTK_WIDGET (layout)))
+ gtk_widget_set_parent_window (child->widget, priv->bin_window);
gtk_widget_set_parent (child_widget, GTK_WIDGET (layout));
}
gint y)
{
GtkLayoutChild *child;
-
- g_return_if_fail (GTK_IS_LAYOUT (layout));
- g_return_if_fail (GTK_IS_WIDGET (widget));
- g_return_if_fail (widget->parent == GTK_WIDGET (layout));
-
+
child = get_child (layout, widget);
g_assert (child);
gtk_widget_thaw_child_notify (widget);
- if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (layout))
- gtk_widget_queue_resize (GTK_WIDGET (layout));
+ if (gtk_widget_get_visible (widget) &&
+ gtk_widget_get_visible (GTK_WIDGET (layout)))
+ gtk_widget_queue_resize (widget);
}
/**
static void
gtk_layout_set_adjustment_upper (GtkAdjustment *adj,
- gdouble upper)
+ gdouble upper,
+ gboolean always_emit_changed)
{
+ gboolean changed = FALSE;
+ gboolean value_changed = FALSE;
+
+ gdouble min = MAX (0., upper - adj->page_size);
+
if (upper != adj->upper)
{
- gdouble min = MAX (0., upper - adj->page_size);
- gboolean value_changed = FALSE;
-
adj->upper = upper;
+ changed = TRUE;
+ }
- if (adj->value > min)
- {
- adj->value = min;
- value_changed = TRUE;
- }
-
- gtk_signal_emit_by_name (GTK_OBJECT (adj), "changed");
- if (value_changed)
- gtk_signal_emit_by_name (GTK_OBJECT (adj), "value_changed");
+ if (adj->value > min)
+ {
+ adj->value = min;
+ value_changed = TRUE;
}
+
+ if (changed || always_emit_changed)
+ gtk_adjustment_changed (adj);
+ if (value_changed)
+ gtk_adjustment_value_changed (adj);
}
/**
guint width,
guint height)
{
+ GtkLayoutPriv *priv;
GtkWidget *widget;
-
+
g_return_if_fail (GTK_IS_LAYOUT (layout));
+ priv = layout->priv;
widget = GTK_WIDGET (layout);
-
+
g_object_freeze_notify (G_OBJECT (layout));
- if (width != layout->width)
+ if (width != priv->width)
{
- layout->width = width;
+ priv->width = width;
g_object_notify (G_OBJECT (layout), "width");
}
- if (height != layout->height)
+ if (height != priv->height)
{
- layout->height = height;
+ priv->height = height;
g_object_notify (G_OBJECT (layout), "height");
}
g_object_thaw_notify (G_OBJECT (layout));
- gtk_layout_set_adjustment_upper (layout->hadjustment, layout->width);
- gtk_layout_set_adjustment_upper (layout->vadjustment, layout->height);
+ if (priv->hadjustment)
+ gtk_layout_set_adjustment_upper (priv->hadjustment, priv->width, FALSE);
+ if (priv->vadjustment)
+ gtk_layout_set_adjustment_upper (priv->vadjustment, priv->height, FALSE);
- if (GTK_WIDGET_REALIZED (layout))
+ if (gtk_widget_get_realized (widget))
{
width = MAX (width, widget->allocation.width);
height = MAX (height, widget->allocation.height);
- gdk_window_resize (layout->bin_window, width, height);
+ gdk_window_resize (priv->bin_window, width, height);
}
}
/**
* gtk_layout_get_size:
* @layout: a #GtkLayout
- * @width: location to store the width set on @layout, or %NULL
- * @height: location to store the height set on @layout, or %NULL
+ * @width: (allow-none): location to store the width set on @layout, or %NULL
+ * @height: (allow-none): location to store the height set on @layout, or %NULL
*
* Gets the size that has been set on the layout, and that determines
* the total extents of the layout's scrollbar area. See
guint *width,
guint *height)
{
- g_return_if_fail (GTK_IS_LAYOUT (layout));
+ GtkLayoutPriv *priv;
- if (width)
- *width = layout->width;
- if (height)
- *height = layout->height;
-}
-
-/**
- * gtk_layout_freeze:
- * @layout: a #GtkLayout
- *
- * This is a deprecated function, it doesn't do anything useful.
- **/
-void
-gtk_layout_freeze (GtkLayout *layout)
-{
g_return_if_fail (GTK_IS_LAYOUT (layout));
- layout->freeze_count++;
-}
-
-/**
- * gtk_layout_thaw:
- * @layout: a #GtkLayout
- *
- * This is a deprecated function, it doesn't do anything useful.
- **/
-void
-gtk_layout_thaw (GtkLayout *layout)
-{
- g_return_if_fail (GTK_IS_LAYOUT (layout));
+ priv = layout->priv;
- if (layout->freeze_count)
- if (!(--layout->freeze_count))
- gtk_widget_draw (GTK_WIDGET (layout), NULL);
+ if (width)
+ *width = priv->width;
+ if (height)
+ *height = priv->height;
}
/* Basic Object handling procedures
*/
-GtkType
-gtk_layout_get_type (void)
-{
- static GtkType layout_type = 0;
-
- if (!layout_type)
- {
- static const GTypeInfo layout_info =
- {
- sizeof (GtkLayoutClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) gtk_layout_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GtkLayout),
- 16, /* n_preallocs */
- (GInstanceInitFunc) gtk_layout_init,
- };
-
- layout_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkLayout", &layout_info, 0);
- }
-
- return layout_type;
-}
-
static void
gtk_layout_class_init (GtkLayoutClass *class)
{
GObjectClass *gobject_class;
- GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
GtkContainerClass *container_class;
gobject_class = (GObjectClass*) class;
- object_class = (GtkObjectClass*) class;
widget_class = (GtkWidgetClass*) class;
container_class = (GtkContainerClass*) class;
- parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
-
gobject_class->set_property = gtk_layout_set_property;
gobject_class->get_property = gtk_layout_get_property;
gobject_class->finalize = gtk_layout_finalize;
+ gobject_class->constructor = gtk_layout_constructor;
container_class->set_child_property = gtk_layout_set_child_property;
container_class->get_child_property = gtk_layout_get_child_property;
gtk_container_class_install_child_property (container_class,
CHILD_PROP_X,
g_param_spec_int ("x",
- _("X position"),
- _("X position of child widget"),
+ P_("X position"),
+ P_("X position of child widget"),
G_MININT,
G_MAXINT,
0,
- G_PARAM_READWRITE));
+ GTK_PARAM_READWRITE));
gtk_container_class_install_child_property (container_class,
CHILD_PROP_Y,
g_param_spec_int ("y",
- _("Y position"),
- _("Y position of child widget"),
+ P_("Y position"),
+ P_("Y position of child widget"),
G_MININT,
G_MAXINT,
0,
- G_PARAM_READWRITE));
+ GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_HADJUSTMENT,
g_param_spec_object ("hadjustment",
- _("Horizontal adjustment"),
- _("The GtkAdjustment for the horizontal position."),
+ P_("Horizontal adjustment"),
+ P_("The GtkAdjustment for the horizontal position"),
GTK_TYPE_ADJUSTMENT,
- G_PARAM_READWRITE));
+ GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_VADJUSTMENT,
g_param_spec_object ("vadjustment",
- _("Vertical adjustment"),
- _("The GtkAdjustment for the vertical position."),
+ P_("Vertical adjustment"),
+ P_("The GtkAdjustment for the vertical position"),
GTK_TYPE_ADJUSTMENT,
- G_PARAM_READWRITE));
+ GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_WIDTH,
g_param_spec_uint ("width",
- _("Width"),
- _("The width of the layout."),
+ P_("Width"),
+ P_("The width of the layout"),
0,
G_MAXINT,
100,
- G_PARAM_READWRITE));
+ GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_HEIGHT,
g_param_spec_uint ("height",
- _("Height"),
- _("The height of the layout."),
+ P_("Height"),
+ P_("The height of the layout"),
0,
G_MAXINT,
100,
- G_PARAM_READWRITE));
+ GTK_PARAM_READWRITE));
widget_class->realize = gtk_layout_realize;
widget_class->unrealize = gtk_layout_unrealize;
widget_class->map = gtk_layout_map;
widget_class->size_request = gtk_layout_size_request;
widget_class->size_allocate = gtk_layout_size_allocate;
widget_class->expose_event = gtk_layout_expose;
+ widget_class->style_set = gtk_layout_style_set;
+ container_class->add = gtk_layout_add;
container_class->remove = gtk_layout_remove;
container_class->forall = gtk_layout_forall;
class->set_scroll_adjustments = gtk_layout_set_adjustments;
+ /**
+ * GtkLayout::set-scroll-adjustments
+ * @horizontal: the horizontal #GtkAdjustment
+ * @vertical: the vertical #GtkAdjustment
+ *
+ * Set the scroll adjustments for the layout. Usually scrolled containers
+ * like #GtkScrolledWindow will emit this signal to connect two instances
+ * of #GtkScrollbar to the scroll directions of the #GtkLayout.
+ */
widget_class->set_scroll_adjustments_signal =
- gtk_signal_new ("set_scroll_adjustments",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkLayoutClass, set_scroll_adjustments),
- gtk_marshal_VOID__OBJECT_OBJECT,
- GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
+ g_signal_new (I_("set-scroll-adjustments"),
+ G_OBJECT_CLASS_TYPE (gobject_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (GtkLayoutClass, set_scroll_adjustments),
+ NULL, NULL,
+ _gtk_marshal_VOID__OBJECT_OBJECT,
+ G_TYPE_NONE, 2,
+ GTK_TYPE_ADJUSTMENT,
+ GTK_TYPE_ADJUSTMENT);
+
+ g_type_class_add_private (class, sizeof (GtkLayoutPriv));
}
static void
GParamSpec *pspec)
{
GtkLayout *layout = GTK_LAYOUT (object);
-
+ GtkLayoutPriv *priv = layout->priv;
+
switch (prop_id)
{
case PROP_HADJUSTMENT:
- g_value_set_object (value, G_OBJECT (layout->hadjustment));
+ g_value_set_object (value, priv->hadjustment);
break;
case PROP_VADJUSTMENT:
- g_value_set_object (value, G_OBJECT (layout->vadjustment));
+ g_value_set_object (value, priv->vadjustment);
break;
case PROP_WIDTH:
- g_value_set_uint (value, layout->width);
+ g_value_set_uint (value, priv->width);
break;
case PROP_HEIGHT:
- g_value_set_uint (value, layout->height);
+ g_value_set_uint (value, priv->height);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
GParamSpec *pspec)
{
GtkLayout *layout = GTK_LAYOUT (object);
-
+ GtkLayoutPriv *priv = layout->priv;
+
switch (prop_id)
{
case PROP_HADJUSTMENT:
break;
case PROP_WIDTH:
gtk_layout_set_size (layout, g_value_get_uint (value),
- layout->height);
+ priv->height);
break;
case PROP_HEIGHT:
- gtk_layout_set_size (layout, layout->width,
+ gtk_layout_set_size (layout, priv->width,
g_value_get_uint (value));
break;
default:
static void
gtk_layout_init (GtkLayout *layout)
{
- layout->children = NULL;
+ GtkLayoutPriv *priv;
+
+ layout->priv = G_TYPE_INSTANCE_GET_PRIVATE (layout,
+ GTK_TYPE_LAYOUT,
+ GtkLayoutPriv);
+ priv = layout->priv;
+
+ priv->children = NULL;
+
+ priv->width = 100;
+ priv->height = 100;
+
+ priv->hadjustment = NULL;
+ priv->vadjustment = NULL;
+
+ priv->bin_window = NULL;
+
+ priv->scroll_x = 0;
+ priv->scroll_y = 0;
+ priv->visibility = GDK_VISIBILITY_PARTIAL;
- layout->width = 100;
- layout->height = 100;
+ priv->freeze_count = 0;
+}
+
+static GObject *
+gtk_layout_constructor (GType type,
+ guint n_properties,
+ GObjectConstructParam *properties)
+{
+ GtkLayoutPriv *priv;
+ GtkLayout *layout;
+ GObject *object;
+ GtkAdjustment *hadj, *vadj;
+
+ object = G_OBJECT_CLASS (gtk_layout_parent_class)->constructor (type,
+ n_properties,
+ properties);
- layout->hadjustment = NULL;
- layout->vadjustment = NULL;
+ layout = GTK_LAYOUT (object);
+ priv = layout->priv;
- layout->bin_window = NULL;
+ hadj = priv->hadjustment ? priv->hadjustment : new_default_adjustment ();
+ vadj = priv->vadjustment ? priv->vadjustment : new_default_adjustment ();
- layout->scroll_x = 0;
- layout->scroll_y = 0;
- layout->visibility = GDK_VISIBILITY_PARTIAL;
+ if (!priv->hadjustment || !priv->vadjustment)
+ gtk_layout_set_adjustments (layout, hadj, vadj);
- layout->freeze_count = 0;
+ return object;
}
/* Widget methods
static void
gtk_layout_realize (GtkWidget *widget)
{
+ GtkLayout *layout = GTK_LAYOUT (widget);
+ GtkLayoutPriv *priv = layout->priv;
GList *tmp_list;
- GtkLayout *layout;
GdkWindowAttr attributes;
gint attributes_mask;
- g_return_if_fail (GTK_IS_LAYOUT (widget));
-
- layout = GTK_LAYOUT (widget);
- GTK_WIDGET_SET_FLAGS (layout, GTK_REALIZED);
+ gtk_widget_set_realized (widget, TRUE);
attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = widget->allocation.x;
widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
&attributes, attributes_mask);
+ gdk_window_set_back_pixmap (widget->window, NULL, FALSE);
gdk_window_set_user_data (widget->window, widget);
- attributes.x = 0;
- attributes.y = 0;
- attributes.width = MAX (layout->width, widget->allocation.width);
- attributes.height = MAX (layout->height, widget->allocation.height);
+ attributes.x = - priv->hadjustment->value,
+ attributes.y = - priv->vadjustment->value;
+ attributes.width = MAX (priv->width, widget->allocation.width);
+ attributes.height = MAX (priv->height, widget->allocation.height);
attributes.event_mask = GDK_EXPOSURE_MASK | GDK_SCROLL_MASK |
gtk_widget_get_events (widget);
- layout->bin_window = gdk_window_new (widget->window,
+ priv->bin_window = gdk_window_new (widget->window,
&attributes, attributes_mask);
- gdk_window_set_user_data (layout->bin_window, widget);
+ gdk_window_set_user_data (priv->bin_window, widget);
widget->style = gtk_style_attach (widget->style, widget->window);
- gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
- gtk_style_set_background (widget->style, layout->bin_window, GTK_STATE_NORMAL);
+ gtk_style_set_background (widget->style, priv->bin_window, GTK_STATE_NORMAL);
- tmp_list = layout->children;
+ tmp_list = priv->children;
while (tmp_list)
{
GtkLayoutChild *child = tmp_list->data;
tmp_list = tmp_list->next;
- gtk_widget_set_parent_window (child->widget, layout->bin_window);
+ gtk_widget_set_parent_window (child->widget, priv->bin_window);
}
}
-static void
-gtk_layout_map (GtkWidget *widget)
+static void
+gtk_layout_style_set (GtkWidget *widget,
+ GtkStyle *old_style)
{
- GList *tmp_list;
- GtkLayout *layout;
+ GtkLayoutPriv *priv;
+
+ GTK_WIDGET_CLASS (gtk_layout_parent_class)->style_set (widget, old_style);
- g_return_if_fail (GTK_IS_LAYOUT (widget));
+ if (gtk_widget_get_realized (widget))
+ {
+ priv = GTK_LAYOUT (widget)->priv;
+ gtk_style_set_background (widget->style, priv->bin_window, GTK_STATE_NORMAL);
+ }
+}
- layout = GTK_LAYOUT (widget);
+static void
+gtk_layout_map (GtkWidget *widget)
+{
+ GtkLayout *layout = GTK_LAYOUT (widget);
+ GtkLayoutPriv *priv = layout->priv;
+ GList *tmp_list;
- GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+ gtk_widget_set_mapped (widget, TRUE);
- tmp_list = layout->children;
+ tmp_list = priv->children;
while (tmp_list)
{
GtkLayoutChild *child = tmp_list->data;
tmp_list = tmp_list->next;
- if (GTK_WIDGET_VISIBLE (child->widget))
+ if (gtk_widget_get_visible (child->widget))
{
- if (!GTK_WIDGET_MAPPED (child->widget))
+ if (!gtk_widget_get_mapped (child->widget))
gtk_widget_map (child->widget);
}
}
- gdk_window_show (layout->bin_window);
+ gdk_window_show (priv->bin_window);
gdk_window_show (widget->window);
}
static void
gtk_layout_unrealize (GtkWidget *widget)
{
- GtkLayout *layout;
-
- g_return_if_fail (GTK_IS_LAYOUT (widget));
-
- layout = GTK_LAYOUT (widget);
+ GtkLayout *layout = GTK_LAYOUT (widget);
+ GtkLayoutPriv *priv = layout->priv;
- gdk_window_set_user_data (layout->bin_window, NULL);
- gdk_window_destroy (layout->bin_window);
- layout->bin_window = NULL;
+ gdk_window_set_user_data (priv->bin_window, NULL);
+ gdk_window_destroy (priv->bin_window);
+ priv->bin_window = NULL;
- if (GTK_WIDGET_CLASS (parent_class)->unrealize)
- (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
+ GTK_WIDGET_CLASS (gtk_layout_parent_class)->unrealize (widget);
}
static void
gtk_layout_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
+ GtkLayout *layout = GTK_LAYOUT (widget);
+ GtkLayoutPriv *priv = layout->priv;
GList *tmp_list;
- GtkLayout *layout;
-
- g_return_if_fail (GTK_IS_LAYOUT (widget));
-
- layout = GTK_LAYOUT (widget);
requisition->width = 0;
requisition->height = 0;
- tmp_list = layout->children;
+ tmp_list = priv->children;
while (tmp_list)
{
gtk_layout_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
+ GtkLayout *layout = GTK_LAYOUT (widget);
+ GtkLayoutPriv *priv = layout->priv;
GList *tmp_list;
- GtkLayout *layout;
-
- g_return_if_fail (GTK_IS_LAYOUT (widget));
widget->allocation = *allocation;
-
- layout = GTK_LAYOUT (widget);
- tmp_list = layout->children;
+ tmp_list = priv->children;
while (tmp_list)
{
gtk_layout_allocate_child (layout, child);
}
- if (GTK_WIDGET_REALIZED (widget))
+ if (gtk_widget_get_realized (widget))
{
gdk_window_move_resize (widget->window,
allocation->x, allocation->y,
allocation->width, allocation->height);
- gdk_window_resize (layout->bin_window,
- MAX (layout->width, allocation->width),
- MAX (layout->height, allocation->height));
+ gdk_window_resize (priv->bin_window,
+ MAX (priv->width, allocation->width),
+ MAX (priv->height, allocation->height));
}
- layout->hadjustment->page_size = allocation->width;
- layout->hadjustment->page_increment = allocation->width / 2;
- layout->hadjustment->lower = 0;
- layout->hadjustment->upper = MAX (allocation->width, layout->width);
- gtk_signal_emit_by_name (GTK_OBJECT (layout->hadjustment), "changed");
-
- layout->vadjustment->page_size = allocation->height;
- layout->vadjustment->page_increment = allocation->height / 2;
- layout->vadjustment->lower = 0;
- layout->vadjustment->upper = MAX (allocation->height, layout->height);
- gtk_signal_emit_by_name (GTK_OBJECT (layout->vadjustment), "changed");
+ priv->hadjustment->page_size = allocation->width;
+ priv->hadjustment->page_increment = allocation->width * 0.9;
+ priv->hadjustment->lower = 0;
+ /* set_adjustment_upper() emits ::changed */
+ gtk_layout_set_adjustment_upper (priv->hadjustment, MAX (allocation->width, priv->width), TRUE);
+
+ priv->vadjustment->page_size = allocation->height;
+ priv->vadjustment->page_increment = allocation->height * 0.9;
+ priv->vadjustment->lower = 0;
+ priv->vadjustment->upper = MAX (allocation->height, priv->height);
+ gtk_layout_set_adjustment_upper (priv->vadjustment, MAX (allocation->height, priv->height), TRUE);
}
static gint
-gtk_layout_expose (GtkWidget *widget, GdkEventExpose *event)
+gtk_layout_expose (GtkWidget *widget,
+ GdkEventExpose *event)
{
- GtkLayout *layout;
+ GtkLayout *layout = GTK_LAYOUT (widget);
+ GtkLayoutPriv *priv = layout->priv;
- g_return_val_if_fail (GTK_IS_LAYOUT (widget), FALSE);
-
- layout = GTK_LAYOUT (widget);
-
- if (event->window != layout->bin_window)
+ if (event->window != priv->bin_window)
return FALSE;
-
- (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
+
+ GTK_WIDGET_CLASS (gtk_layout_parent_class)->expose_event (widget, event);
return FALSE;
}
-/* Container method
+/* Container methods
*/
+static void
+gtk_layout_add (GtkContainer *container,
+ GtkWidget *widget)
+{
+ gtk_layout_put (GTK_LAYOUT (container), widget, 0, 0);
+}
+
static void
gtk_layout_remove (GtkContainer *container,
GtkWidget *widget)
{
+ GtkLayout *layout = GTK_LAYOUT (container);
+ GtkLayoutPriv *priv = layout->priv;
GList *tmp_list;
- GtkLayout *layout;
GtkLayoutChild *child = NULL;
-
- g_return_if_fail (GTK_IS_LAYOUT (container));
-
- layout = GTK_LAYOUT (container);
- tmp_list = layout->children;
+ tmp_list = priv->children;
while (tmp_list)
{
child = tmp_list->data;
{
gtk_widget_unparent (widget);
- layout->children = g_list_remove_link (layout->children, tmp_list);
+ priv->children = g_list_remove_link (priv->children, tmp_list);
g_list_free_1 (tmp_list);
g_free (child);
}
GtkCallback callback,
gpointer callback_data)
{
- GtkLayout *layout;
+ GtkLayout *layout = GTK_LAYOUT (container);
+ GtkLayoutPriv *priv = layout->priv;
GtkLayoutChild *child;
GList *tmp_list;
- g_return_if_fail (GTK_IS_LAYOUT (container));
- g_return_if_fail (callback != NULL);
-
- layout = GTK_LAYOUT (container);
-
- tmp_list = layout->children;
+ tmp_list = priv->children;
while (tmp_list)
{
child = tmp_list->data;
gtk_layout_adjustment_changed (GtkAdjustment *adjustment,
GtkLayout *layout)
{
- GtkWidget *widget;
+ GtkLayoutPriv *priv = layout->priv;
- widget = GTK_WIDGET (layout);
-
- if (layout->freeze_count)
+ if (priv->freeze_count)
return;
- if (GTK_WIDGET_REALIZED (layout))
+ if (gtk_widget_get_realized (GTK_WIDGET (layout)))
{
- gdk_window_move (layout->bin_window,
- - layout->hadjustment->value,
- - layout->vadjustment->value);
-
- gdk_window_process_updates (layout->bin_window, TRUE);
+ gdk_window_move (priv->bin_window,
+ - priv->hadjustment->value,
+ - priv->vadjustment->value);
+
+ gdk_window_process_updates (priv->bin_window, TRUE);
}
}
projects / ~andy / gtk / blobdiff