AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Remove size_request from GtkFixed

Browse Source
This commit is contained in:
Matthias Clasen 2010-10-26 22:28:24 -04:00 committed by Tristan Van Berkom
parent e165c6c884
commit b3f6f67c33
1 changed files with 151 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

308
gtk/gtkfixed.c
View File

@ -21,7 +21,7 @@
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog * file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with * files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/. * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/ */
#include "config.h" #include "config.h"
@ -44,18 +44,22 @@ enum {
}; };
static void gtk_fixed_realize (GtkWidget *widget); static void gtk_fixed_realize (GtkWidget *widget);
static void gtk_fixed_size_request (GtkWidget *widget, static void gtk_fixed_get_preferred_width (GtkWidget *widget,
GtkRequisition *requisition); gint *minimum,
gint *natural);
static void gtk_fixed_get_preferred_height (GtkWidget *widget,
gint *minimum,
gint *natural);
static void gtk_fixed_size_allocate (GtkWidget *widget, static void gtk_fixed_size_allocate (GtkWidget *widget,
GtkAllocation *allocation); GtkAllocation *allocation);
static void gtk_fixed_add (GtkContainer *container, static void gtk_fixed_add (GtkContainer *container,
GtkWidget *widget); GtkWidget *widget);
static void gtk_fixed_remove (GtkContainer *container, static void gtk_fixed_remove (GtkContainer *container,
GtkWidget *widget); GtkWidget *widget);
static void gtk_fixed_forall (GtkContainer *container, static void gtk_fixed_forall (GtkContainer *container,
gboolean include_internals, gboolean include_internals,
GtkCallback callback, GtkCallback callback,
gpointer callback_data); gpointer callback_data);
static GType gtk_fixed_child_type (GtkContainer *container); static GType gtk_fixed_child_type (GtkContainer *container);
static void gtk_fixed_set_child_property (GtkContainer *container, static void gtk_fixed_set_child_property (GtkContainer *container,
@ -81,42 +85,39 @@ gtk_fixed_class_init (GtkFixedClass *class)
container_class = (GtkContainerClass*) class; container_class = (GtkContainerClass*) class;
widget_class->realize = gtk_fixed_realize; widget_class->realize = gtk_fixed_realize;
widget_class->size_request = gtk_fixed_size_request; widget_class->get_preferred_width = gtk_fixed_get_preferred_width;
widget_class->get_preferred_height = gtk_fixed_get_preferred_height;
widget_class->size_allocate = gtk_fixed_size_allocate; widget_class->size_allocate = gtk_fixed_size_allocate;
container_class->add = gtk_fixed_add; container_class->add = gtk_fixed_add;
container_class->remove = gtk_fixed_remove; container_class->remove = gtk_fixed_remove;
container_class->forall = gtk_fixed_forall; container_class->forall = gtk_fixed_forall;
container_class->child_type = gtk_fixed_child_type; container_class->child_type = gtk_fixed_child_type;
container_class->set_child_property = gtk_fixed_set_child_property; container_class->set_child_property = gtk_fixed_set_child_property;
container_class->get_child_property = gtk_fixed_get_child_property; container_class->get_child_property = gtk_fixed_get_child_property;
gtk_container_class_handle_border_width (container_class);
gtk_container_class_install_child_property (container_class, gtk_container_class_install_child_property (container_class,
CHILD_PROP_X, CHILD_PROP_X,
g_param_spec_int ("x", g_param_spec_int ("x",
P_("X position"), P_("X position"),
P_("X position of child widget"), P_("X position of child widget"),
G_MININT, G_MININT, G_MAXINT, 0,
G_MAXINT,
0,
GTK_PARAM_READWRITE)); GTK_PARAM_READWRITE));
gtk_container_class_install_child_property (container_class, gtk_container_class_install_child_property (container_class,
CHILD_PROP_Y, CHILD_PROP_Y,
g_param_spec_int ("y", g_param_spec_int ("y",
P_("Y position"), P_("Y position"),
P_("Y position of child widget"), P_("Y position of child widget"),
G_MININT, G_MININT, G_MAXINT, 0,
G_MAXINT,
0,
GTK_PARAM_READWRITE)); GTK_PARAM_READWRITE));
g_type_class_add_private (class, sizeof (GtkFixedPrivate)); g_type_class_add_private (class, sizeof (GtkFixedPrivate));
} }
static GType static GType
gtk_fixed_child_type (GtkContainer *container) gtk_fixed_child_type (GtkContainer *container)
{ {
return GTK_TYPE_WIDGET; return GTK_TYPE_WIDGET;
} }
@ -124,16 +125,11 @@ gtk_fixed_child_type (GtkContainer *container)
static void static void
gtk_fixed_init (GtkFixed *fixed) gtk_fixed_init (GtkFixed *fixed)
{ {
GtkFixedPrivate *priv; fixed->priv = G_TYPE_INSTANCE_GET_PRIVATE (fixed, GTK_TYPE_FIXED, GtkFixedPrivate);
fixed->priv = G_TYPE_INSTANCE_GET_PRIVATE (fixed,
GTK_TYPE_FIXED,
GtkFixedPrivate);
priv = fixed->priv;
gtk_widget_set_has_window (GTK_WIDGET (fixed), FALSE); gtk_widget_set_has_window (GTK_WIDGET (fixed), FALSE);
priv->children = NULL; fixed->priv->children = NULL;
} }
GtkWidget* GtkWidget*
@ -149,13 +145,11 @@ get_child (GtkFixed *fixed,
GtkFixedPrivate *priv = fixed->priv; GtkFixedPrivate *priv = fixed->priv;
GList *children; GList *children;
children = priv->children; for (children = priv->children; children; children = children->next)
while (children)
{ {
GtkFixedChild *child; GtkFixedChild *child;
child = children->data; child = children->data;
children = children->next;
if (child->widget == widget) if (child->widget == widget)
return child; return child;
@ -165,10 +159,10 @@ get_child (GtkFixed *fixed,
} }
void void
gtk_fixed_put (GtkFixed *fixed, gtk_fixed_put (GtkFixed *fixed,
GtkWidget *widget, GtkWidget *widget,
gint x, gint x,
gint y) gint y)
{ {
GtkFixedPrivate *priv = fixed->priv; GtkFixedPrivate *priv = fixed->priv;
GtkFixedChild *child_info; GtkFixedChild *child_info;
@ -187,73 +181,69 @@ gtk_fixed_put (GtkFixed *fixed,
} }
static void static void
gtk_fixed_move_internal (GtkFixed *fixed, gtk_fixed_move_internal (GtkFixed *fixed,
GtkWidget *widget, GtkFixedChild *child,
gboolean change_x, gint x,
gint x, gint y)
gboolean change_y,
gint y)
{ {
GtkFixedChild *child;
g_return_if_fail (GTK_IS_FIXED (fixed)); g_return_if_fail (GTK_IS_FIXED (fixed));
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (gtk_widget_get_parent (child->widget) == GTK_WIDGET (fixed));
g_return_if_fail (gtk_widget_get_parent (widget) == GTK_WIDGET (fixed));
child = get_child (fixed, widget); gtk_widget_freeze_child_notify (child->widget);
g_assert (child); if (child->x != x)
gtk_widget_freeze_child_notify (widget);
if (change_x)
{ {
child->x = x; child->x = x;
gtk_widget_child_notify (widget, "x"); gtk_widget_child_notify (child->widget, "x");
} }
if (change_y) if (child->y != y)
{ {
child->y = y; child->y = y;
gtk_widget_child_notify (widget, "y"); gtk_widget_child_notify (child->widget, "y");
} }
gtk_widget_thaw_child_notify (widget); gtk_widget_thaw_child_notify (child->widget);
if (gtk_widget_get_visible (widget) && if (gtk_widget_get_visible (child->widget) &&
gtk_widget_get_visible (GTK_WIDGET (fixed))) gtk_widget_get_visible (GTK_WIDGET (fixed)))
gtk_widget_queue_resize (GTK_WIDGET (fixed)); gtk_widget_queue_resize (GTK_WIDGET (fixed));
} }
void void
gtk_fixed_move (GtkFixed *fixed, gtk_fixed_move (GtkFixed *fixed,
GtkWidget *widget, GtkWidget *widget,
gint x, gint x,
gint y) gint y)
{ {
gtk_fixed_move_internal (fixed, widget, TRUE, x, TRUE, y); gtk_fixed_move_internal (fixed, get_child (fixed, widget), x, y);
} }
static void static void
gtk_fixed_set_child_property (GtkContainer *container, gtk_fixed_set_child_property (GtkContainer *container,
GtkWidget *child, GtkWidget *child,
guint property_id, guint property_id,
const GValue *value, const GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GtkFixed *fixed = GTK_FIXED (container);
GtkFixedChild *fixed_child;
fixed_child = get_child (fixed, child);
switch (property_id) switch (property_id)
{ {
case CHILD_PROP_X: case CHILD_PROP_X:
gtk_fixed_move_internal (GTK_FIXED (container), gtk_fixed_move_internal (fixed,
child, fixed_child,
TRUE, g_value_get_int (value), g_value_get_int (value),
FALSE, 0); fixed_child->y);
break; break;
case CHILD_PROP_Y: case CHILD_PROP_Y:
gtk_fixed_move_internal (GTK_FIXED (container), gtk_fixed_move_internal (fixed,
child, fixed_child,
FALSE, 0, fixed_child->x,
TRUE, g_value_get_int (value)); g_value_get_int (value));
break; break;
default: default:
GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec); GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
@ -311,7 +301,7 @@ gtk_fixed_realize (GtkWidget *widget)
attributes.visual = gtk_widget_get_visual (widget); attributes.visual = gtk_widget_get_visual (widget);
attributes.event_mask = gtk_widget_get_events (widget); attributes.event_mask = gtk_widget_get_events (widget);
attributes.event_mask |= GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK; attributes.event_mask |= GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK;
attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL; attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
window = gdk_window_new (gtk_widget_get_parent_window (widget), window = gdk_window_new (gtk_widget_get_parent_window (widget),
@ -325,51 +315,64 @@ gtk_fixed_realize (GtkWidget *widget)
} }
static void static void
gtk_fixed_size_request (GtkWidget *widget, gtk_fixed_get_preferred_width (GtkWidget *widget,
GtkRequisition *requisition) gint *minimum,
gint *natural)
{ {
GtkFixedPrivate *priv; GtkFixed *fixed = GTK_FIXED (widget);
GtkFixed *fixed; GtkFixedPrivate *priv = fixed->priv;
GtkFixedChild *child; GtkFixedChild *child;
GList *children; GList *children;
GtkRequisition child_requisition; gint child_min, child_nat;
guint border_width;
fixed = GTK_FIXED (widget); *minimum = 0;
priv = fixed->priv; *natural = 0;
requisition->width = 0; for (children = priv->children; children; children = children->next)
requisition->height = 0;
children = priv->children;
while (children)
{ {
child = children->data; child = children->data;
children = children->next;
if (gtk_widget_get_visible (child->widget)) if (!gtk_widget_get_visible (child->widget))
{ continue;
gtk_widget_get_preferred_size (child->widget,
&child_requisition,
NULL);
requisition->height = MAX (requisition->height, gtk_widget_get_preferred_width (child->widget, &child_min, &child_nat);
child->y +
child_requisition.height); *minimum = MAX (*minimum, child->y + child_min);
requisition->width = MAX (requisition->width, *natural = MAX (*natural, child->y + child_nat);
child->x +
child_requisition.width);
}
} }
}
border_width = gtk_container_get_border_width (GTK_CONTAINER (fixed)); static void
requisition->height += border_width * 2; gtk_fixed_get_preferred_height (GtkWidget *widget,
requisition->width += border_width * 2; gint *minimum,
gint *natural)
{
GtkFixed *fixed = GTK_FIXED (widget);
GtkFixedPrivate *priv = fixed->priv;
GtkFixedChild *child;
GList *children;
gint child_min, child_nat;
*minimum = 0;
*natural = 0;
for (children = priv->children; children; children = children->next)
{
child = children->data;
if (!gtk_widget_get_visible (child->widget))
continue;
gtk_widget_get_preferred_height (child->widget, &child_min, &child_nat);
*minimum = MAX (*minimum, child->y + child_min);
*natural = MAX (*natural, child->y + child_nat);
}
} }
static void static void
gtk_fixed_size_allocate (GtkWidget *widget, gtk_fixed_size_allocate (GtkWidget *widget,
GtkAllocation *allocation) GtkAllocation *allocation)
{ {
GtkFixed *fixed = GTK_FIXED (widget); GtkFixed *fixed = GTK_FIXED (widget);
GtkFixedPrivate *priv = fixed->priv; GtkFixedPrivate *priv = fixed->priv;
@ -377,58 +380,52 @@ gtk_fixed_size_allocate (GtkWidget *widget,
GtkAllocation child_allocation; GtkAllocation child_allocation;
GtkRequisition child_requisition; GtkRequisition child_requisition;
GList *children; GList *children;
guint border_width;
gtk_widget_set_allocation (widget, allocation); gtk_widget_set_allocation (widget, allocation);
if (gtk_widget_get_has_window (widget)) if (gtk_widget_get_has_window (widget))
{ {
if (gtk_widget_get_realized (widget)) if (gtk_widget_get_realized (widget))
gdk_window_move_resize (gtk_widget_get_window (widget), gdk_window_move_resize (gtk_widget_get_window (widget),
allocation->x, allocation->x,
allocation->y, allocation->y,
allocation->width, allocation->width,
allocation->height); allocation->height);
} }
border_width = gtk_container_get_border_width (GTK_CONTAINER (fixed)); for (children = priv->children; children; children = children->next)
children = priv->children;
while (children)
{ {
child = children->data; child = children->data;
children = children->next;
if (gtk_widget_get_visible (child->widget))
{
gtk_widget_get_preferred_size (child->widget,
&child_requisition, NULL);
child_allocation.x = child->x + border_width;
child_allocation.y = child->y + border_width;
if (!gtk_widget_get_has_window (widget)) if (!gtk_widget_get_visible (child->widget))
{ continue;
child_allocation.x += allocation->x;
child_allocation.y += allocation->y; gtk_widget_get_preferred_size (child->widget, &child_requisition, NULL);
} child_allocation.x = child->x;
child_allocation.y = child->y;
child_allocation.width = child_requisition.width;
child_allocation.height = child_requisition.height; if (!gtk_widget_get_has_window (widget))
gtk_widget_size_allocate (child->widget, &child_allocation); {
} child_allocation.x += allocation->x;
child_allocation.y += allocation->y;
}
child_allocation.width = child_requisition.width;
child_allocation.height = child_requisition.height;
gtk_widget_size_allocate (child->widget, &child_allocation);
} }
} }
static void static void
gtk_fixed_add (GtkContainer *container, gtk_fixed_add (GtkContainer *container,
GtkWidget *widget) GtkWidget *widget)
{ {
gtk_fixed_put (GTK_FIXED (container), widget, 0, 0); gtk_fixed_put (GTK_FIXED (container), widget, 0, 0);
} }
static void static void
gtk_fixed_remove (GtkContainer *container, gtk_fixed_remove (GtkContainer *container,
GtkWidget *widget) GtkWidget *widget)
{ {
GtkFixed *fixed = GTK_FIXED (container); GtkFixed *fixed = GTK_FIXED (container);
GtkFixedPrivate *priv = fixed->priv; GtkFixedPrivate *priv = fixed->priv;
@ -436,26 +433,25 @@ gtk_fixed_remove (GtkContainer *container,
GtkWidget *widget_container = GTK_WIDGET (container); GtkWidget *widget_container = GTK_WIDGET (container);
GList *children; GList *children;
children = priv->children; for (children = priv->children; children; children = children->next)
while (children)
{ {
child = children->data; child = children->data;
if (child->widget == widget) if (child->widget == widget)
{ {
gboolean was_visible = gtk_widget_get_visible (widget); gboolean was_visible = gtk_widget_get_visible (widget);
gtk_widget_unparent (widget);
priv->children = g_list_remove_link (priv->children, children); gtk_widget_unparent (widget);
g_list_free (children);
g_free (child);
if (was_visible && gtk_widget_get_visible (widget_container)) priv->children = g_list_remove_link (priv->children, children);
gtk_widget_queue_resize (widget_container); g_list_free (children);
g_free (child);
break; if (was_visible && gtk_widget_get_visible (widget_container))
} gtk_widget_queue_resize (widget_container);
break;
}
children = children->next; children = children->next;
} }
@ -463,20 +459,18 @@ gtk_fixed_remove (GtkContainer *container,
static void static void
gtk_fixed_forall (GtkContainer *container, gtk_fixed_forall (GtkContainer *container,
gboolean include_internals, gboolean include_internals,
GtkCallback callback, GtkCallback callback,
gpointer callback_data) gpointer callback_data)
{ {
GtkFixed *fixed = GTK_FIXED (container); GtkFixed *fixed = GTK_FIXED (container);
GtkFixedPrivate *priv = fixed->priv; GtkFixedPrivate *priv = fixed->priv;
GtkFixedChild *child; GtkFixedChild *child;
GList *children; GList *children;
children = priv->children; for (children = priv->children; children; children = children->next)
while (children)
{ {
child = children->data; child = children->data;
children = children->next;
(* callback) (child->widget, callback_data); (* callback) (child->widget, callback_data);
} }