diff options
| author | Benjamin Otte <otte@redhat.com> | 2011-06-26 22:52:14 +0200 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2011-07-05 16:08:09 -0400 |
| commit | e510d5beba5f448403800c001f21f19dd92f19ff (patch) | |
| tree | 4a8a214541e41befa29a3e516155d4b47dcc5af0 | |
| parent | 447fae8d4bbe5448f5a177368d64a65d5ad77ab4 (diff) | |
| download | gtk+-e510d5beba5f448403800c001f21f19dd92f19ff.tar.gz | |
cellareacontext: Don't ever return -1 for preferred sized
People don't check for -1 when computing size requests. Document this
new behavior.
| -rw-r--r-- | gtk/gtkcellareacontext.c | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/gtk/gtkcellareacontext.c b/gtk/gtkcellareacontext.c index cc2cbb0eda..523037be07 100644 --- a/gtk/gtkcellareacontext.c +++ b/gtk/gtkcellareacontext.c @@ -87,17 +87,9 @@ G_DEFINE_TYPE (GtkCellAreaContext, gtk_cell_area_context, G_TYPE_OBJECT); static void gtk_cell_area_context_init (GtkCellAreaContext *context) { - GtkCellAreaContextPrivate *priv; - context->priv = G_TYPE_INSTANCE_GET_PRIVATE (context, GTK_TYPE_CELL_AREA_CONTEXT, GtkCellAreaContextPrivate); - priv = context->priv; - - priv->min_width = -1; - priv->nat_width = -1; - priv->min_height = -1; - priv->nat_height = -1; } static void @@ -289,27 +281,27 @@ gtk_cell_area_context_real_reset (GtkCellAreaContext *context) g_object_freeze_notify (G_OBJECT (context)); - if (priv->min_width != -1) + if (priv->min_width != 0) { - priv->min_width = -1; + priv->min_width = 0; g_object_notify (G_OBJECT (context), "minimum-width"); } - if (priv->nat_width != -1) + if (priv->nat_width != 0) { - priv->nat_width = -1; + priv->nat_width = 0; g_object_notify (G_OBJECT (context), "natural-width"); } - if (priv->min_height != -1) + if (priv->min_height != 0) { - priv->min_height = -1; + priv->min_height = 0; g_object_notify (G_OBJECT (context), "minimum-height"); } - if (priv->nat_height != -1) + if (priv->nat_height != 0) { - priv->nat_height = -1; + priv->nat_height = 0; g_object_notify (G_OBJECT (context), "natural-height"); } @@ -444,7 +436,7 @@ gtk_cell_area_context_allocate (GtkCellAreaContext *context, * requested with this context. * * After gtk_cell_area_context_reset() is called and/or before ever - * requesting the size of a #GtkCellArea, the returned values are -1. + * requesting the size of a #GtkCellArea, the returned values are 0. * * Since: 3.0 */ @@ -478,7 +470,7 @@ gtk_cell_area_context_get_preferred_width (GtkCellAreaContext *context, * requested with this context. * * After gtk_cell_area_context_reset() is called and/or before ever - * requesting the size of a #GtkCellArea, the returned values are -1. + * requesting the size of a #GtkCellArea, the returned values are 0. * * Since: 3.0 */ |