]> Pileus Git - ~andy/gtk/blob - gtk/gtkcellareabox.c
Merge branch 'master' into broadway
[~andy/gtk] / gtk / gtkcellareabox.c
1 /* gtkcellareabox.c
2  *
3  * Copyright (C) 2010 Openismus GmbH
4  *
5  * Authors:
6  *      Tristan Van Berkom <tristanvb@openismus.com>
7  *
8  * This library is free software; you can redistribute it and/or
9  * modify it under the terms of the GNU Library General Public
10  * License as published by the Free Software Foundation; either
11  * version 2 of the License, or (at your option) any later version.
12  *
13  * This library is distributed in the hope that it will be useful,
14  * but WITHOUT ANY WARRANTY; without even the implied warranty of
15  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
16  * Library General Public License for more details.
17  *
18  * You should have received a copy of the GNU Library General Public
19  * License along with this library; if not, write to the
20  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
21  * Boston, MA 02111-1307, USA.
22  */
23
24
25 /**
26  * SECTION:gtkcellareabox
27  * @Short_Description: A cell area that renders GtkCellRenderers
28  *     into a row or a column
29  * @Title: GtkCellAreaBox
30  *
31  * The #GtkCellAreaBox renders cell renderers into a row or a column
32  * depending on its #GtkOrientation.
33  *
34  * GtkCellAreaBox uses a notion of <emphasis>packing</emphasis>. Packing
35  * refers to adding cell renderers with reference to a particular position
36  * in a #GtkCellAreaBox. There are two reference positions: the
37  * <emphasis>start</emphasis> and the <emphasis>end</emphasis> of the box.
38  * When the #GtkCellAreaBox is oriented in the %GTK_ORIENTATION_VERTICAL
39  * orientation, the start is defined as the top of the box and the end is
40  * defined as the bottom. In the %GTK_ORIENTATION_HORIZONTAL orientation
41  * start is defined as the left side and the end is defined as the right
42  * side.
43  *
44  * Alignments of #GtkCellRenderers rendered in adjacent rows can be
45  * configured by configuring the #GtkCellAreaBox:align child cell property
46  * with gtk_cell_area_cell_set_property() or by specifying the "align"
47  * argument to gtk_cell_area_box_pack_start() and gtk_cell_area_box_pack_end().
48  */
49
50 #include "config.h"
51 #include "gtkintl.h"
52 #include "gtkorientable.h"
53 #include "gtkcelllayout.h"
54 #include "gtkcellareabox.h"
55 #include "gtkcellareaboxcontextprivate.h"
56 #include "gtktypebuiltins.h"
57 #include "gtkprivate.h"
58
59
60 /* GObjectClass */
61 static void      gtk_cell_area_box_finalize                       (GObject              *object);
62 static void      gtk_cell_area_box_dispose                        (GObject              *object);
63 static void      gtk_cell_area_box_set_property                   (GObject              *object,
64                                                                    guint                 prop_id,
65                                                                    const GValue         *value,
66                                                                    GParamSpec           *pspec);
67 static void      gtk_cell_area_box_get_property                   (GObject              *object,
68                                                                    guint                 prop_id,
69                                                                    GValue               *value,
70                                                                    GParamSpec           *pspec);
71
72 /* GtkCellAreaClass */
73 static void      gtk_cell_area_box_add                            (GtkCellArea          *area,
74                                                                    GtkCellRenderer      *renderer);
75 static void      gtk_cell_area_box_remove                         (GtkCellArea          *area,
76                                                                    GtkCellRenderer      *renderer);
77 static void      gtk_cell_area_box_foreach                        (GtkCellArea          *area,
78                                                                    GtkCellCallback       callback,
79                                                                    gpointer              callback_data);
80 static void      gtk_cell_area_box_foreach_alloc                  (GtkCellArea          *area,
81                                                                    GtkCellAreaContext   *context,
82                                                                    GtkWidget            *widget,
83                                                                    const GdkRectangle   *cell_area,
84                                                                    const GdkRectangle   *background_area,
85                                                                    GtkCellAllocCallback  callback,
86                                                                    gpointer              callback_data);
87 static void      gtk_cell_area_box_apply_attributes               (GtkCellArea          *area,
88                                                                    GtkTreeModel         *tree_model,
89                                                                    GtkTreeIter          *iter,
90                                                                    gboolean              is_expander,
91                                                                    gboolean              is_expanded);
92 static void      gtk_cell_area_box_set_cell_property              (GtkCellArea          *area,
93                                                                    GtkCellRenderer      *renderer,
94                                                                    guint                 prop_id,
95                                                                    const GValue         *value,
96                                                                    GParamSpec           *pspec);
97 static void      gtk_cell_area_box_get_cell_property              (GtkCellArea          *area,
98                                                                    GtkCellRenderer      *renderer,
99                                                                    guint                 prop_id,
100                                                                    GValue               *value,
101                                                                    GParamSpec           *pspec);
102 static GtkCellAreaContext *gtk_cell_area_box_create_context       (GtkCellArea          *area);
103 static GtkCellAreaContext *gtk_cell_area_box_copy_context         (GtkCellArea          *area,
104                                                                    GtkCellAreaContext   *context);
105 static GtkSizeRequestMode  gtk_cell_area_box_get_request_mode     (GtkCellArea          *area);
106 static void      gtk_cell_area_box_get_preferred_width            (GtkCellArea          *area,
107                                                                    GtkCellAreaContext   *context,
108                                                                    GtkWidget            *widget,
109                                                                    gint                 *minimum_width,
110                                                                    gint                 *natural_width);
111 static void      gtk_cell_area_box_get_preferred_height           (GtkCellArea          *area,
112                                                                    GtkCellAreaContext   *context,
113                                                                    GtkWidget            *widget,
114                                                                    gint                 *minimum_height,
115                                                                    gint                 *natural_height);
116 static void      gtk_cell_area_box_get_preferred_height_for_width (GtkCellArea          *area,
117                                                                    GtkCellAreaContext   *context,
118                                                                    GtkWidget            *widget,
119                                                                    gint                  width,
120                                                                    gint                 *minimum_height,
121                                                                    gint                 *natural_height);
122 static void      gtk_cell_area_box_get_preferred_width_for_height (GtkCellArea          *area,
123                                                                    GtkCellAreaContext   *context,
124                                                                    GtkWidget            *widget,
125                                                                    gint                  height,
126                                                                    gint                 *minimum_width,
127                                                                    gint                 *natural_width);
128 static gboolean  gtk_cell_area_box_focus                          (GtkCellArea          *area,
129                                                                    GtkDirectionType      direction);
130
131 /* GtkCellLayoutIface */
132 static void      gtk_cell_area_box_cell_layout_init               (GtkCellLayoutIface *iface);
133 static void      gtk_cell_area_box_layout_pack_start              (GtkCellLayout      *cell_layout,
134                                                                    GtkCellRenderer    *renderer,
135                                                                    gboolean            expand);
136 static void      gtk_cell_area_box_layout_pack_end                (GtkCellLayout      *cell_layout,
137                                                                    GtkCellRenderer    *renderer,
138                                                                    gboolean            expand);
139 static void      gtk_cell_area_box_layout_reorder                 (GtkCellLayout      *cell_layout,
140                                                                    GtkCellRenderer    *renderer,
141                                                                    gint                position);
142 static void      gtk_cell_area_box_focus_changed                  (GtkCellArea        *area,
143                                                                    GParamSpec         *pspec,
144                                                                    GtkCellAreaBox     *box);
145
146
147 /* CellInfo/CellGroup metadata handling and convenience functions */
148 typedef struct {
149   GtkCellRenderer *renderer;
150
151   guint            expand : 1; /* Whether the cell expands */
152   guint            pack   : 1; /* Whether it is packed from the start or end */
153   guint            align  : 1; /* Whether to align its position with adjacent rows */
154   guint            fixed  : 1; /* Whether to require the same size for all rows */
155 } CellInfo;
156
157 typedef struct {
158   GList *cells;
159
160   guint  id           : 8;
161   guint  n_cells      : 8;
162   guint  expand_cells : 8;
163   guint  align        : 1;
164   guint  visible      : 1;
165 } CellGroup;
166
167 typedef struct {
168   GtkCellRenderer *renderer;
169
170   gint             position;
171   gint             size;
172 } AllocatedCell;
173
174 static CellInfo      *cell_info_new          (GtkCellRenderer       *renderer,
175                                               GtkPackType            pack,
176                                               gboolean               expand,
177                                               gboolean               align,
178                                               gboolean               fixed);
179 static void           cell_info_free         (CellInfo              *info);
180 static gint           cell_info_find         (CellInfo              *info,
181                                               GtkCellRenderer       *renderer);
182
183 static AllocatedCell *allocated_cell_new     (GtkCellRenderer       *renderer,
184                                               gint                   position,
185                                               gint                   size);
186 static void           allocated_cell_free    (AllocatedCell         *cell);
187 static GList         *list_consecutive_cells (GtkCellAreaBox        *box);
188 static gint           count_expand_groups    (GtkCellAreaBox        *box);
189 static void           context_weak_notify    (GtkCellAreaBox        *box,
190                                               GtkCellAreaBoxContext *dead_context);
191 static void           reset_contexts         (GtkCellAreaBox        *box);
192 static void           init_context_groups    (GtkCellAreaBox        *box);
193 static void           init_context_group     (GtkCellAreaBox        *box,
194                                               GtkCellAreaBoxContext *context);
195 static GSList        *get_allocated_cells    (GtkCellAreaBox        *box,
196                                               GtkCellAreaBoxContext *context,
197                                               GtkWidget             *widget,
198                                               gint                   width,
199                                               gint                   height);
200
201
202 struct _GtkCellAreaBoxPrivate
203 {
204   GtkOrientation   orientation;
205
206   /* We hold on to the previously focused cell when navigating
207    * up and down in a horizontal box (or left and right on a vertical one)
208    * this way we always re-enter the last focused cell.
209    */
210   GtkCellRenderer *last_focus_cell;
211   gulong           focus_cell_id;
212
213   GList           *cells;
214   GArray          *groups;
215
216   GSList          *contexts;
217
218   gint             spacing;
219
220   /* We hold on to the rtl state from a widget we are requested for
221    * so that we can navigate focus correctly
222    */
223   gboolean         rtl;
224 };
225
226 enum {
227   PROP_0,
228   PROP_ORIENTATION,
229   PROP_SPACING
230 };
231
232 enum {
233   CELL_PROP_0,
234   CELL_PROP_EXPAND,
235   CELL_PROP_ALIGN,
236   CELL_PROP_FIXED_SIZE,
237   CELL_PROP_PACK_TYPE
238 };
239
240 G_DEFINE_TYPE_WITH_CODE (GtkCellAreaBox, gtk_cell_area_box, GTK_TYPE_CELL_AREA,
241                          G_IMPLEMENT_INTERFACE (GTK_TYPE_CELL_LAYOUT,
242                                                 gtk_cell_area_box_cell_layout_init)
243                          G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, NULL));
244
245 #define OPPOSITE_ORIENTATION(orientation)                       \
246   ((orientation) == GTK_ORIENTATION_HORIZONTAL ?                \
247    GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL)
248
249 static void
250 gtk_cell_area_box_init (GtkCellAreaBox *box)
251 {
252   GtkCellAreaBoxPrivate *priv;
253
254   box->priv = G_TYPE_INSTANCE_GET_PRIVATE (box,
255                                            GTK_TYPE_CELL_AREA_BOX,
256                                            GtkCellAreaBoxPrivate);
257   priv = box->priv;
258
259   priv->orientation = GTK_ORIENTATION_HORIZONTAL;
260   priv->groups      = g_array_new (FALSE, TRUE, sizeof (CellGroup));
261   priv->cells       = NULL;
262   priv->contexts    = NULL;
263   priv->spacing     = 0;
264   priv->rtl         = FALSE;
265
266   /* Watch whenever focus is given to a cell, even if it's not with keynav,
267    * this way we remember upon entry of the area where focus was last time
268    * around
269    */
270   priv->focus_cell_id = g_signal_connect (box, "notify::focus-cell",
271                                           G_CALLBACK (gtk_cell_area_box_focus_changed), box);
272 }
273
274 static void
275 gtk_cell_area_box_class_init (GtkCellAreaBoxClass *class)
276 {
277   GObjectClass     *object_class = G_OBJECT_CLASS (class);
278   GtkCellAreaClass *area_class   = GTK_CELL_AREA_CLASS (class);
279
280   /* GObjectClass */
281   object_class->finalize     = gtk_cell_area_box_finalize;
282   object_class->dispose      = gtk_cell_area_box_dispose;
283   object_class->set_property = gtk_cell_area_box_set_property;
284   object_class->get_property = gtk_cell_area_box_get_property;
285
286   /* GtkCellAreaClass */
287   area_class->add                 = gtk_cell_area_box_add;
288   area_class->remove              = gtk_cell_area_box_remove;
289   area_class->foreach             = gtk_cell_area_box_foreach;
290   area_class->foreach_alloc       = gtk_cell_area_box_foreach_alloc;
291   area_class->apply_attributes    = gtk_cell_area_box_apply_attributes;
292   area_class->set_cell_property   = gtk_cell_area_box_set_cell_property;
293   area_class->get_cell_property   = gtk_cell_area_box_get_cell_property;
294
295   area_class->create_context                 = gtk_cell_area_box_create_context;
296   area_class->copy_context                   = gtk_cell_area_box_copy_context;
297   area_class->get_request_mode               = gtk_cell_area_box_get_request_mode;
298   area_class->get_preferred_width            = gtk_cell_area_box_get_preferred_width;
299   area_class->get_preferred_height           = gtk_cell_area_box_get_preferred_height;
300   area_class->get_preferred_height_for_width = gtk_cell_area_box_get_preferred_height_for_width;
301   area_class->get_preferred_width_for_height = gtk_cell_area_box_get_preferred_width_for_height;
302
303   area_class->focus = gtk_cell_area_box_focus;
304
305   /* Properties */
306   g_object_class_override_property (object_class, PROP_ORIENTATION, "orientation");
307
308   /**
309    * GtkCellAreaBox:spacing:
310    *
311    * The amount of space to reserve between cells.
312    *
313    * Since: 3.0
314    */
315   g_object_class_install_property (object_class,
316                                    PROP_SPACING,
317                                    g_param_spec_int ("spacing",
318                                                      P_("Spacing"),
319                                                      P_("Space which is inserted between cells"),
320                                                      0,
321                                                      G_MAXINT,
322                                                      0,
323                                                      GTK_PARAM_READWRITE));
324
325   /* Cell Properties */
326   /**
327    * GtkCellAreaBox:expand:
328    *
329    * Whether the cell renderer should receive extra space
330    * when the area receives more than its natural size.
331    *
332    * Since: 3.0
333    */
334   gtk_cell_area_class_install_cell_property (area_class,
335                                              CELL_PROP_EXPAND,
336                                              g_param_spec_boolean
337                                              ("expand",
338                                               P_("Expand"),
339                                               P_("Whether the cell expands"),
340                                               FALSE,
341                                               GTK_PARAM_READWRITE));
342
343   /**
344    * GtkCellAreaBox:align:
345    *
346    * Whether the cell renderer should be aligned in adjacent rows.
347    *
348    * Since: 3.0
349    */
350   gtk_cell_area_class_install_cell_property (area_class,
351                                              CELL_PROP_ALIGN,
352                                              g_param_spec_boolean
353                                              ("align",
354                                               P_("Align"),
355                                               P_("Whether cell should align with adjacent rows"),
356                                               FALSE,
357                                               GTK_PARAM_READWRITE));
358
359   /**
360    * GtkCellAreaBox:fixed-size:
361    *
362    * Whether the cell renderer should require the same size
363    * for all rows for which it was requested.
364    *
365    * Since: 3.0
366    */
367   gtk_cell_area_class_install_cell_property (area_class,
368                                              CELL_PROP_FIXED_SIZE,
369                                              g_param_spec_boolean
370                                              ("fixed-size",
371                                               P_("Fixed Size"),
372                                               P_("Whether cells should be the same size in all rows"),
373                                               TRUE,
374                                               GTK_PARAM_READWRITE));
375
376   /**
377    * GtkCellAreaBox:pack-type:
378    *
379    * A GtkPackType indicating whether the cell renderer is packed
380    * with reference to the start or end of the area.
381    *
382    * Since: 3.0
383    */
384   gtk_cell_area_class_install_cell_property (area_class,
385                                              CELL_PROP_PACK_TYPE,
386                                              g_param_spec_enum
387                                              ("pack-type",
388                                               P_("Pack Type"),
389                                               P_("A GtkPackType indicating whether the cell is packed with "
390                                                  "reference to the start or end of the cell area"),
391                                               GTK_TYPE_PACK_TYPE, GTK_PACK_START,
392                                               GTK_PARAM_READWRITE));
393
394   g_type_class_add_private (object_class, sizeof (GtkCellAreaBoxPrivate));
395 }
396
397
398 /*************************************************************
399  *    CellInfo/CellGroup basics and convenience functions    *
400  *************************************************************/
401 static CellInfo *
402 cell_info_new  (GtkCellRenderer *renderer,
403                 GtkPackType      pack,
404                 gboolean         expand,
405                 gboolean         align,
406                 gboolean         fixed)
407 {
408   CellInfo *info = g_slice_new (CellInfo);
409
410   info->renderer = g_object_ref_sink (renderer);
411   info->pack     = pack;
412   info->expand   = expand;
413   info->align    = align;
414   info->fixed    = fixed;
415
416   return info;
417 }
418
419 static void
420 cell_info_free (CellInfo *info)
421 {
422   g_object_unref (info->renderer);
423
424   g_slice_free (CellInfo, info);
425 }
426
427 static gint
428 cell_info_find (CellInfo        *info,
429                 GtkCellRenderer *renderer)
430 {
431   return (info->renderer == renderer) ? 0 : -1;
432 }
433
434 static AllocatedCell *
435 allocated_cell_new (GtkCellRenderer *renderer,
436                     gint             position,
437                     gint             size)
438 {
439   AllocatedCell *cell = g_slice_new (AllocatedCell);
440
441   cell->renderer = renderer;
442   cell->position = position;
443   cell->size     = size;
444
445   return cell;
446 }
447
448 static void
449 allocated_cell_free (AllocatedCell *cell)
450 {
451   g_slice_free (AllocatedCell, cell);
452 }
453
454 static GList *
455 list_consecutive_cells (GtkCellAreaBox *box)
456 {
457   GtkCellAreaBoxPrivate *priv = box->priv;
458   GList                 *l, *consecutive_cells = NULL, *pack_end_cells = NULL;
459   CellInfo              *info;
460
461   /* List cells in consecutive order taking their
462    * PACK_START/PACK_END options into account
463    */
464   for (l = priv->cells; l; l = l->next)
465     {
466       info = l->data;
467
468       if (info->pack == GTK_PACK_START)
469         consecutive_cells = g_list_prepend (consecutive_cells, info);
470     }
471
472   for (l = priv->cells; l; l = l->next)
473     {
474       info = l->data;
475
476       if (info->pack == GTK_PACK_END)
477         pack_end_cells = g_list_prepend (pack_end_cells, info);
478     }
479
480   consecutive_cells = g_list_reverse (consecutive_cells);
481   consecutive_cells = g_list_concat (consecutive_cells, pack_end_cells);
482
483   return consecutive_cells;
484 }
485
486 static void
487 cell_groups_clear (GtkCellAreaBox *box)
488 {
489   GtkCellAreaBoxPrivate *priv = box->priv;
490   gint                   i;
491
492   for (i = 0; i < priv->groups->len; i++)
493     {
494       CellGroup *group = &g_array_index (priv->groups, CellGroup, i);
495
496       g_list_free (group->cells);
497     }
498
499   g_array_set_size (priv->groups, 0);
500 }
501
502 static void
503 cell_groups_rebuild (GtkCellAreaBox *box)
504 {
505   GtkCellAreaBoxPrivate *priv = box->priv;
506   CellGroup              group = { 0, };
507   CellGroup             *group_ptr;
508   GList                 *cells, *l;
509   guint                  id = 0;
510   gboolean               last_cell_fixed = FALSE;
511
512   cell_groups_clear (box);
513
514   if (!priv->cells)
515     return;
516
517   cells = list_consecutive_cells (box);
518
519   /* First group is implied */
520   g_array_append_val (priv->groups, group);
521   group_ptr = &g_array_index (priv->groups, CellGroup, id);
522
523   for (l = cells; l; l = l->next)
524     {
525       CellInfo *info = l->data;
526
527       /* A new group starts with any aligned cell, or
528        * at the beginning and end of a fixed size cell. 
529        * the first group is implied */
530       if ((info->align || info->fixed || last_cell_fixed) && l != cells)
531         {
532           memset (&group, 0x0, sizeof (CellGroup));
533           group.id = ++id;
534
535           g_array_append_val (priv->groups, group);
536           group_ptr = &g_array_index (priv->groups, CellGroup, id);
537         }
538
539       group_ptr->cells = g_list_prepend (group_ptr->cells, info);
540       group_ptr->n_cells++;
541
542       /* Not every group is aligned, some are floating
543        * fixed size cells */
544       if (info->align)
545         group_ptr->align = TRUE;
546
547       /* A group expands if it contains any expand cells */
548       if (info->expand)
549         group_ptr->expand_cells++;
550
551       last_cell_fixed = info->fixed;
552     }
553
554   g_list_free (cells);
555
556   for (id = 0; id < priv->groups->len; id++)
557     {
558       group_ptr = &g_array_index (priv->groups, CellGroup, id);
559
560       group_ptr->cells = g_list_reverse (group_ptr->cells);
561     }
562
563   /* Contexts need to be updated with the new grouping information */
564   init_context_groups (box);
565 }
566
567 static gint
568 count_visible_cells (CellGroup *group,
569                      gint      *expand_cells)
570 {
571   GList *l;
572   gint   visible_cells = 0;
573   gint   n_expand_cells = 0;
574
575   for (l = group->cells; l; l = l->next)
576     {
577       CellInfo *info = l->data;
578
579       if (gtk_cell_renderer_get_visible (info->renderer))
580         {
581           visible_cells++;
582
583           if (info->expand)
584             n_expand_cells++;
585         }
586     }
587
588   if (expand_cells)
589     *expand_cells = n_expand_cells;
590
591   return visible_cells;
592 }
593
594 static gint
595 count_expand_groups (GtkCellAreaBox  *box)
596 {
597   GtkCellAreaBoxPrivate *priv = box->priv;
598   gint                   i;
599   gint                   expand_groups = 0;
600
601   for (i = 0; i < priv->groups->len; i++)
602     {
603       CellGroup *group = &g_array_index (priv->groups, CellGroup, i);
604
605       if (group->expand_cells > 0)
606         expand_groups++;
607     }
608
609   return expand_groups;
610 }
611
612 static void
613 context_weak_notify (GtkCellAreaBox        *box,
614                      GtkCellAreaBoxContext *dead_context)
615 {
616   GtkCellAreaBoxPrivate *priv = box->priv;
617
618   priv->contexts = g_slist_remove (priv->contexts, dead_context);
619 }
620
621 static void
622 init_context_group (GtkCellAreaBox        *box,
623                     GtkCellAreaBoxContext *context)
624 {
625   GtkCellAreaBoxPrivate *priv = box->priv;
626   gint                  *expand_groups, *align_groups, i;
627
628   expand_groups = g_new (gboolean, priv->groups->len);
629   align_groups  = g_new (gboolean, priv->groups->len);
630
631   for (i = 0; i < priv->groups->len; i++)
632     {
633       CellGroup *group = &g_array_index (priv->groups, CellGroup, i);
634
635       expand_groups[i] = (group->expand_cells > 0);
636       align_groups[i]  = group->align;
637     }
638
639   /* This call implies resetting the request info */
640   _gtk_cell_area_box_init_groups (context, priv->groups->len, expand_groups, align_groups);
641   g_free (expand_groups);
642   g_free (align_groups);
643 }
644
645 static void
646 init_context_groups (GtkCellAreaBox *box)
647 {
648   GtkCellAreaBoxPrivate *priv = box->priv;
649   GSList                *l;
650
651   /* When the box's groups are reconstructed,
652    * contexts need to be reinitialized.
653    */
654   for (l = priv->contexts; l; l = l->next)
655     {
656       GtkCellAreaBoxContext *context = l->data;
657
658       init_context_group (box, context);
659     }
660 }
661
662 static void
663 reset_contexts (GtkCellAreaBox *box)
664 {
665   GtkCellAreaBoxPrivate *priv = box->priv;
666   GSList                *l;
667
668   /* When the box layout changes, contexts need to
669    * be reset and sizes for the box get requested again
670    */
671   for (l = priv->contexts; l; l = l->next)
672     {
673       GtkCellAreaContext *context = l->data;
674
675       gtk_cell_area_context_reset (context);
676     }
677 }
678
679 /* Fall back on a completely unaligned dynamic allocation of cells
680  * when not allocated for the said orientation, alignment of cells
681  * is not done when each area gets a different size in the orientation
682  * of the box.
683  */
684 static GSList *
685 allocate_cells_manually (GtkCellAreaBox        *box,
686                          GtkWidget             *widget,
687                          gint                   width,
688                          gint                   height)
689 {
690   GtkCellAreaBoxPrivate    *priv = box->priv;
691   GList                    *cells, *l;
692   GSList                   *allocated_cells = NULL;
693   GtkRequestedSize         *sizes;
694   gint                      i;
695   gint                      nvisible = 0, nexpand = 0, group_expand;
696   gint                      avail_size, extra_size, extra_extra, full_size;
697   gint                      position = 0, for_size;
698   gboolean                  rtl;
699
700   if (!priv->cells)
701     return NULL;
702
703   /* For vertical oriented boxes, we just let the cell renderers
704    * realign themselves for rtl
705    */
706   rtl = (priv->orientation == GTK_ORIENTATION_HORIZONTAL &&
707          gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);
708
709   cells = list_consecutive_cells (box);
710
711   /* Count the visible and expand cells */
712   for (i = 0; i < priv->groups->len; i++)
713     {
714       CellGroup *group = &g_array_index (priv->groups, CellGroup, i);
715
716       nvisible += count_visible_cells (group, &group_expand);
717       nexpand  += group_expand;
718     }
719
720   if (nvisible <= 0)
721     {
722       g_list_free (cells);
723       return NULL;
724     }
725
726   if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
727     {
728       full_size = avail_size = width;
729       for_size  = height;
730     }
731   else
732     {
733       full_size = avail_size = height;
734       for_size  = width;
735     }
736
737   /* Go ahead and collect the requests on the fly */
738   sizes = g_new0 (GtkRequestedSize, nvisible);
739   for (l = cells, i = 0; l; l = l->next)
740     {
741       CellInfo *info = l->data;
742
743       if (!gtk_cell_renderer_get_visible (info->renderer))
744         continue;
745
746       gtk_cell_area_request_renderer (GTK_CELL_AREA (box), info->renderer,
747                                       priv->orientation,
748                                       widget, for_size,
749                                       &sizes[i].minimum_size,
750                                       &sizes[i].natural_size);
751
752       avail_size -= sizes[i].minimum_size;
753
754       sizes[i].data = info;
755
756       i++;
757     }
758
759   /* Naturally distribute the allocation */
760   avail_size -= (nvisible - 1) * priv->spacing;
761   if (avail_size > 0)
762     avail_size = gtk_distribute_natural_allocation (avail_size, nvisible, sizes);
763   else
764     avail_size = 0;
765
766   /* Calculate/distribute expand for cells */
767   if (nexpand > 0)
768     {
769       extra_size  = avail_size / nexpand;
770       extra_extra = avail_size % nexpand;
771     }
772   else
773     extra_size = extra_extra = 0;
774
775   /* Create the allocated cells */
776   for (i = 0; i < nvisible; i++)
777     {
778       CellInfo      *info = sizes[i].data;
779       AllocatedCell *cell;
780
781       if (info->expand)
782         {
783           sizes[i].minimum_size += extra_size;
784           if (extra_extra)
785             {
786               sizes[i].minimum_size++;
787               extra_extra--;
788             }
789         }
790
791       if (rtl)
792         cell = allocated_cell_new (info->renderer,
793                                    full_size - (position + sizes[i].minimum_size),
794                                    sizes[i].minimum_size);
795       else
796         cell = allocated_cell_new (info->renderer, position, sizes[i].minimum_size);
797
798       allocated_cells = g_slist_prepend (allocated_cells, cell);
799
800       position += sizes[i].minimum_size;
801       position += priv->spacing;
802     }
803
804   g_free (sizes);
805   g_list_free (cells);
806
807   /* Note it might not be important to reverse the list here at all,
808    * we have the correct positions, no need to allocate from left to right
809    */
810   return g_slist_reverse (allocated_cells);
811 }
812
813 /* Returns an allocation for each cell in the orientation of the box,
814  * used in ->render()/->event() implementations to get a straight-forward
815  * list of allocated cells to operate on.
816  */
817 static GSList *
818 get_allocated_cells (GtkCellAreaBox        *box,
819                      GtkCellAreaBoxContext *context,
820                      GtkWidget             *widget,
821                      gint                   width,
822                      gint                   height)
823 {
824   GtkCellAreaBoxAllocation *group_allocs;
825   GtkCellArea              *area = GTK_CELL_AREA (box);
826   GtkCellAreaBoxPrivate    *priv = box->priv;
827   GList                    *cell_list;
828   GSList                   *allocated_cells = NULL;
829   gint                      i, j, n_allocs, position;
830   gint                      for_size, full_size;
831   gboolean                  rtl;
832
833   group_allocs = _gtk_cell_area_box_context_get_orientation_allocs (context, &n_allocs);
834   if (!group_allocs)
835     return allocate_cells_manually (box, widget, width, height);
836
837   if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
838     {
839       full_size = width;
840       for_size  = height;
841     }
842   else
843     {
844       full_size = height;
845       for_size  = width;
846     }
847
848   /* For vertical oriented boxes, we just let the cell renderers
849    * realign themselves for rtl
850    */
851   rtl = (priv->orientation == GTK_ORIENTATION_HORIZONTAL &&
852          gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);
853
854   for (position = 0, i = 0; i < n_allocs; i++)
855     {
856       /* We dont always allocate all groups, sometimes the requested
857        * group has only invisible cells for every row, hence the usage
858        * of group_allocs[i].group_idx here
859        */
860       CellGroup *group = &g_array_index (priv->groups, CellGroup, group_allocs[i].group_idx);
861
862       /* Exception for single cell groups */
863       if (group->n_cells == 1)
864         {
865           CellInfo      *info = group->cells->data;
866           AllocatedCell *cell;
867           gint           cell_position, cell_size;
868
869           if (!gtk_cell_renderer_get_visible (info->renderer))
870             continue;
871
872           /* If were not aligned, place the cell after the last cell */
873           if (info->align)
874             position = cell_position = group_allocs[i].position;
875           else
876             cell_position = position;
877
878           /* If not a fixed size, use only the requested size for this row */
879           if (info->fixed)
880             cell_size = group_allocs[i].size;
881           else
882             {
883               gint dummy;
884               gtk_cell_area_request_renderer (area, info->renderer,
885                                               priv->orientation,
886                                               widget, for_size,
887                                               &dummy,
888                                               &cell_size);
889               cell_size = MIN (cell_size, group_allocs[i].size);
890             }
891
892           if (rtl)
893             cell = allocated_cell_new (info->renderer,
894                                        full_size - (cell_position + cell_size), cell_size);
895           else
896             cell = allocated_cell_new (info->renderer, cell_position, cell_size);
897
898           position += cell_size;
899           position += priv->spacing;
900
901           allocated_cells = g_slist_prepend (allocated_cells, cell);
902         }
903       else
904         {
905           GtkRequestedSize *sizes;
906           gint              avail_size, cell_position;
907           gint              visible_cells, expand_cells;
908           gint              extra_size, extra_extra;
909
910           visible_cells = count_visible_cells (group, &expand_cells);
911
912           /* If this row has no visible cells in this group, just
913            * skip the allocation
914            */
915           if (visible_cells == 0)
916             continue;
917
918           /* If were not aligned, place the cell after the last cell 
919            * and eat up the extra space
920            */
921           if (group->align)
922             {
923               avail_size = group_allocs[i].size;
924               position   = cell_position = group_allocs[i].position;
925             }
926           else
927             {
928               avail_size    = group_allocs[i].size + (group_allocs[i].position - position);
929               cell_position = position;
930             }
931
932           sizes = g_new (GtkRequestedSize, visible_cells);
933
934           for (j = 0, cell_list = group->cells; cell_list; cell_list = cell_list->next)
935             {
936               CellInfo *info = cell_list->data;
937
938               if (!gtk_cell_renderer_get_visible (info->renderer))
939                 continue;
940
941               gtk_cell_area_request_renderer (area, info->renderer,
942                                               priv->orientation,
943                                               widget, for_size,
944                                               &sizes[j].minimum_size,
945                                               &sizes[j].natural_size);
946
947               sizes[j].data = info;
948               avail_size   -= sizes[j].minimum_size;
949
950               j++;
951             }
952
953           /* Distribute cells naturally within the group */
954           avail_size -= (visible_cells - 1) * priv->spacing;
955           if (avail_size > 0)
956             avail_size = gtk_distribute_natural_allocation (avail_size, visible_cells, sizes);
957           else
958             avail_size = 0;
959
960           /* Calculate/distribute expand for cells */
961           if (expand_cells > 0)
962             {
963               extra_size  = avail_size / expand_cells;
964               extra_extra = avail_size % expand_cells;
965             }
966           else
967             extra_size = extra_extra = 0;
968
969           /* Create the allocated cells (loop only over visible cells here) */
970           for (j = 0; j < visible_cells; j++)
971             {
972               CellInfo      *info = sizes[j].data;
973               AllocatedCell *cell;
974
975               if (info->expand)
976                 {
977                   sizes[j].minimum_size += extra_size;
978                   if (extra_extra)
979                     {
980                       sizes[j].minimum_size++;
981                       extra_extra--;
982                     }
983                 }
984
985               if (rtl)
986                 cell = allocated_cell_new (info->renderer,
987                                            full_size - (cell_position + sizes[j].minimum_size),
988                                            sizes[j].minimum_size);
989               else
990                 cell = allocated_cell_new (info->renderer, cell_position, sizes[j].minimum_size);
991
992               allocated_cells = g_slist_prepend (allocated_cells, cell);
993
994               cell_position += sizes[j].minimum_size;
995               cell_position += priv->spacing;
996             }
997
998           g_free (sizes);
999
1000           position = cell_position;
1001         }
1002     }
1003
1004   g_free (group_allocs);
1005
1006   /* Note it might not be important to reverse the list here at all,
1007    * we have the correct positions, no need to allocate from left to right
1008    */
1009   return g_slist_reverse (allocated_cells);
1010 }
1011
1012
1013 static void
1014 gtk_cell_area_box_focus_changed (GtkCellArea        *area,
1015                                  GParamSpec         *pspec,
1016                                  GtkCellAreaBox     *box)
1017 {
1018   if (gtk_cell_area_get_focus_cell (area))
1019     box->priv->last_focus_cell = gtk_cell_area_get_focus_cell (area);
1020 }
1021
1022 /*************************************************************
1023  *                      GObjectClass                         *
1024  *************************************************************/
1025 static void
1026 gtk_cell_area_box_finalize (GObject *object)
1027 {
1028   GtkCellAreaBox        *box = GTK_CELL_AREA_BOX (object);
1029   GtkCellAreaBoxPrivate *priv = box->priv;
1030   GSList                *l;
1031
1032   /* Unref/free the context list */
1033   for (l = priv->contexts; l; l = l->next)
1034     g_object_weak_unref (G_OBJECT (l->data), (GWeakNotify)context_weak_notify, box);
1035
1036   g_slist_free (priv->contexts);
1037   priv->contexts = NULL;
1038
1039   /* Free the cell grouping info */
1040   cell_groups_clear (box);
1041   g_array_free (priv->groups, TRUE);
1042
1043   G_OBJECT_CLASS (gtk_cell_area_box_parent_class)->finalize (object);
1044 }
1045
1046 static void
1047 gtk_cell_area_box_dispose (GObject *object)
1048 {
1049   G_OBJECT_CLASS (gtk_cell_area_box_parent_class)->dispose (object);
1050 }
1051
1052 static void
1053 gtk_cell_area_box_set_property (GObject       *object,
1054                                 guint          prop_id,
1055                                 const GValue  *value,
1056                                 GParamSpec    *pspec)
1057 {
1058   GtkCellAreaBox *box = GTK_CELL_AREA_BOX (object);
1059
1060   switch (prop_id)
1061     {
1062     case PROP_ORIENTATION:
1063       box->priv->orientation = g_value_get_enum (value);
1064
1065       /* Notify that size needs to be requested again */
1066       reset_contexts (box);
1067
1068       break;
1069     case PROP_SPACING:
1070       gtk_cell_area_box_set_spacing (box, g_value_get_int (value));
1071       break;
1072     default:
1073       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
1074       break;
1075     }
1076 }
1077
1078 static void
1079 gtk_cell_area_box_get_property (GObject     *object,
1080                                 guint        prop_id,
1081                                 GValue      *value,
1082                                 GParamSpec  *pspec)
1083 {
1084   GtkCellAreaBox *box = GTK_CELL_AREA_BOX (object);
1085
1086   switch (prop_id)
1087     {
1088     case PROP_ORIENTATION:
1089       g_value_set_enum (value, box->priv->orientation);
1090       break;
1091     case PROP_SPACING:
1092       g_value_set_int (value, gtk_cell_area_box_get_spacing (box));
1093       break;
1094     default:
1095       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
1096       break;
1097     }
1098 }
1099
1100 /*************************************************************
1101  *                    GtkCellAreaClass                       *
1102  *************************************************************/
1103 static void
1104 gtk_cell_area_box_add (GtkCellArea        *area,
1105                        GtkCellRenderer    *renderer)
1106 {
1107   gtk_cell_area_box_pack_start (GTK_CELL_AREA_BOX (area),
1108                                 renderer, FALSE, FALSE, TRUE);
1109 }
1110
1111 static void
1112 gtk_cell_area_box_remove (GtkCellArea        *area,
1113                           GtkCellRenderer    *renderer)
1114 {
1115   GtkCellAreaBox        *box  = GTK_CELL_AREA_BOX (area);
1116   GtkCellAreaBoxPrivate *priv = box->priv;
1117   GList                 *node;
1118
1119   if (priv->last_focus_cell == renderer)
1120     priv->last_focus_cell = NULL;
1121
1122   node = g_list_find_custom (priv->cells, renderer,
1123                              (GCompareFunc)cell_info_find);
1124
1125   if (node)
1126     {
1127       CellInfo *info = node->data;
1128
1129       cell_info_free (info);
1130
1131       priv->cells = g_list_delete_link (priv->cells, node);
1132
1133       /* Reconstruct cell groups */
1134       cell_groups_rebuild (box);
1135     }
1136   else
1137     g_warning ("Trying to remove a cell renderer that is not present GtkCellAreaBox");
1138 }
1139
1140 static void
1141 gtk_cell_area_box_foreach (GtkCellArea        *area,
1142                            GtkCellCallback     callback,
1143                            gpointer            callback_data)
1144 {
1145   GtkCellAreaBox        *box  = GTK_CELL_AREA_BOX (area);
1146   GtkCellAreaBoxPrivate *priv = box->priv;
1147   GList                 *list;
1148
1149   for (list = priv->cells; list; list = list->next)
1150     {
1151       CellInfo *info = list->data;
1152
1153       if (callback (info->renderer, callback_data))
1154         break;
1155     }
1156 }
1157
1158 static void
1159 gtk_cell_area_box_foreach_alloc (GtkCellArea          *area,
1160                                  GtkCellAreaContext   *context,
1161                                  GtkWidget            *widget,
1162                                  const GdkRectangle   *cell_area,
1163                                  const GdkRectangle   *background_area,
1164                                  GtkCellAllocCallback  callback,
1165                                  gpointer              callback_data)
1166 {
1167   GtkCellAreaBox        *box      = GTK_CELL_AREA_BOX (area);
1168   GtkCellAreaBoxPrivate *priv     = box->priv;
1169   GtkCellAreaBoxContext *box_context = GTK_CELL_AREA_BOX_CONTEXT (context);
1170   GSList                *allocated_cells, *l;
1171   GdkRectangle           cell_alloc, cell_background;
1172   gboolean               rtl;
1173
1174   rtl = (priv->orientation == GTK_ORIENTATION_HORIZONTAL &&
1175          gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);
1176
1177   cell_alloc = *cell_area;
1178
1179   /* Get a list of cells with allocation sizes decided regardless
1180    * of alignments and pack order etc.
1181    */
1182   allocated_cells = get_allocated_cells (box, box_context, widget,
1183                                          cell_area->width, cell_area->height);
1184
1185   for (l = allocated_cells; l; l = l->next)
1186     {
1187       AllocatedCell *cell = l->data;
1188
1189       if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
1190         {
1191           cell_alloc.x     = cell_area->x + cell->position;
1192           cell_alloc.width = cell->size;
1193         }
1194       else
1195         {
1196           cell_alloc.y      = cell_area->y + cell->position;
1197           cell_alloc.height = cell->size;
1198         }
1199
1200       /* Stop iterating over cells if they flow out of the render
1201        * area, this can happen because the render area can actually
1202        * be smaller than the requested area (treeview columns can
1203        * be user resizable and can be resized to be smaller than
1204        * the actual requested area).
1205        */
1206       if (cell_alloc.x > cell_area->x + cell_area->width ||
1207           cell_alloc.x + cell_alloc.width < cell_area->x ||
1208           cell_alloc.y > cell_area->y + cell_area->height)
1209         break;
1210
1211       /* Special case for the last cell (or first cell in rtl)...
1212        * let the last cell consume the remaining space in the area
1213        * (the last cell is allowed to consume the remaining space if
1214        * the space given for rendering is actually larger than allocation,
1215        * this can happen in the expander GtkTreeViewColumn where only the
1216        * deepest depth column receives the allocation... shallow columns
1217        * receive more width). */
1218       if (!l->next)
1219         {
1220           if (rtl)
1221             {
1222               /* Fill the leading space for the first cell in the area
1223                * (still last in the list)
1224                */
1225               cell_alloc.width = (cell_alloc.x - cell_area->x) + cell_alloc.width;
1226               cell_alloc.x     = cell_area->x;
1227             }
1228           else
1229             {
1230               cell_alloc.width  = cell_area->x + cell_area->width  - cell_alloc.x;
1231               cell_alloc.height = cell_area->y + cell_area->height - cell_alloc.y;
1232             }
1233         }
1234       else
1235         {
1236           /* If the cell we are rendering doesnt fit into the remaining space,
1237            * clip it so that the underlying renderer has a chance to deal with
1238            * it (for instance text renderers get a chance to ellipsize).
1239            */
1240           if (cell_alloc.x + cell_alloc.width > cell_area->x + cell_area->width)
1241             cell_alloc.width = cell_area->x + cell_area->width - cell_alloc.x;
1242
1243           if (cell_alloc.y + cell_alloc.height > cell_area->y + cell_area->height)
1244             cell_alloc.height = cell_area->y + cell_area->height - cell_alloc.y;
1245         }
1246
1247       /* Add portions of the background_area to the cell_alloc
1248        * to create the cell_background
1249        */
1250       cell_background = cell_alloc;
1251
1252       if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
1253         {
1254           if (l == allocated_cells)
1255             {
1256               /* Add the depth to the first cell */
1257               if (rtl)
1258                 {
1259                   cell_background.width += background_area->width - cell_area->width;
1260                   cell_background.x      = background_area->x + background_area->width - cell_background.width;
1261                 }
1262               else
1263                 {
1264                   cell_background.width += cell_area->x - background_area->x;
1265                   cell_background.x      = background_area->x;
1266                 }
1267             }
1268
1269           if (l->next == NULL)
1270             {
1271               /* Grant this cell the remaining space */
1272               int remain = cell_background.x - background_area->x;
1273
1274               if (rtl)
1275                 cell_background.x -= remain;
1276               else
1277                 cell_background.width = background_area->width - remain;
1278             }
1279
1280           cell_background.y      = background_area->y;
1281           cell_background.height = background_area->height;
1282         }
1283       else
1284         {
1285           if (l == allocated_cells)
1286             {
1287               cell_background.height += cell_background.y - background_area->y;
1288               cell_background.y       = background_area->y;
1289             }
1290
1291           if (l->next == NULL)
1292               cell_background.height =
1293                 background_area->height - (cell_background.y - background_area->y);
1294
1295           cell_background.x     = background_area->x;
1296           cell_background.width = background_area->width;
1297         }
1298
1299       if (callback (cell->renderer, &cell_alloc, &cell_background, callback_data))
1300         break;
1301     }
1302
1303   g_slist_foreach (allocated_cells, (GFunc)allocated_cell_free, NULL);
1304   g_slist_free (allocated_cells);
1305 }
1306
1307 static void
1308 gtk_cell_area_box_apply_attributes (GtkCellArea          *area,
1309                                     GtkTreeModel         *tree_model,
1310                                     GtkTreeIter          *iter,
1311                                     gboolean              is_expander,
1312                                     gboolean              is_expanded)
1313 {
1314   GtkCellAreaBox        *box  = GTK_CELL_AREA_BOX (area);
1315   GtkCellAreaBoxPrivate *priv = box->priv;
1316   gint                   i;
1317
1318   /* Call the parent class to apply the attributes */
1319   GTK_CELL_AREA_CLASS
1320     (gtk_cell_area_box_parent_class)->apply_attributes (area, tree_model, iter, 
1321                                                         is_expander, is_expanded);
1322
1323   /* Update visible state for cell groups */
1324   for (i = 0; i < priv->groups->len; i++)
1325     {
1326       CellGroup *group = &g_array_index (priv->groups, CellGroup, i);
1327       GList     *list;
1328
1329       group->visible = FALSE;
1330
1331       for (list = group->cells; list && group->visible == FALSE; list = list->next)
1332         {
1333           CellInfo *info = list->data;
1334
1335           if (gtk_cell_renderer_get_visible (info->renderer))
1336             group->visible = TRUE;
1337         }
1338     }
1339 }
1340
1341 static void
1342 gtk_cell_area_box_set_cell_property (GtkCellArea        *area,
1343                                      GtkCellRenderer    *renderer,
1344                                      guint               prop_id,
1345                                      const GValue       *value,
1346                                      GParamSpec         *pspec)
1347 {
1348   GtkCellAreaBox        *box  = GTK_CELL_AREA_BOX (area);
1349   GtkCellAreaBoxPrivate *priv = box->priv;
1350   GList                 *node;
1351   CellInfo              *info;
1352   gboolean               rebuild = FALSE;
1353   gboolean               val;
1354   GtkPackType            pack_type;
1355
1356   node = g_list_find_custom (priv->cells, renderer,
1357                              (GCompareFunc)cell_info_find);
1358   if (!node)
1359     return;
1360
1361   info = node->data;
1362
1363   switch (prop_id)
1364     {
1365     case CELL_PROP_EXPAND:
1366       val = g_value_get_boolean (value);
1367
1368       if (info->expand != val)
1369         {
1370           info->expand = val;
1371           rebuild      = TRUE;
1372         }
1373       break;
1374
1375     case CELL_PROP_ALIGN:
1376       val = g_value_get_boolean (value);
1377
1378       if (info->align != val)
1379         {
1380           info->align = val;
1381           rebuild     = TRUE;
1382         }
1383       break;
1384
1385     case CELL_PROP_FIXED_SIZE:
1386       val = g_value_get_boolean (value);
1387
1388       if (info->fixed != val)
1389         {
1390           info->fixed = val;
1391           rebuild     = TRUE;
1392         }
1393       break;
1394
1395     case CELL_PROP_PACK_TYPE:
1396       pack_type = g_value_get_enum (value);
1397
1398       if (info->pack != pack_type)
1399         {
1400           info->pack = pack_type;
1401           rebuild    = TRUE;
1402         }
1403       break;
1404     default:
1405       GTK_CELL_AREA_WARN_INVALID_CELL_PROPERTY_ID (area, prop_id, pspec);
1406       break;
1407     }
1408
1409   /* Groups need to be rebuilt */
1410   if (rebuild)
1411     cell_groups_rebuild (box);
1412 }
1413
1414 static void
1415 gtk_cell_area_box_get_cell_property (GtkCellArea        *area,
1416                                      GtkCellRenderer    *renderer,
1417                                      guint               prop_id,
1418                                      GValue             *value,
1419                                      GParamSpec         *pspec)
1420 {
1421   GtkCellAreaBox        *box  = GTK_CELL_AREA_BOX (area);
1422   GtkCellAreaBoxPrivate *priv = box->priv;
1423   GList                 *node;
1424   CellInfo              *info;
1425
1426   node = g_list_find_custom (priv->cells, renderer,
1427                              (GCompareFunc)cell_info_find);
1428   if (!node)
1429     return;
1430
1431   info = node->data;
1432
1433   switch (prop_id)
1434     {
1435     case CELL_PROP_EXPAND:
1436       g_value_set_boolean (value, info->expand);
1437       break;
1438
1439     case CELL_PROP_ALIGN:
1440       g_value_set_boolean (value, info->align);
1441       break;
1442
1443     case CELL_PROP_FIXED_SIZE:
1444       g_value_set_boolean (value, info->fixed);
1445       break;
1446
1447     case CELL_PROP_PACK_TYPE:
1448       g_value_set_enum (value, info->pack);
1449       break;
1450     default:
1451       GTK_CELL_AREA_WARN_INVALID_CELL_PROPERTY_ID (area, prop_id, pspec);
1452       break;
1453     }
1454 }
1455
1456
1457 static GtkCellAreaContext *
1458 gtk_cell_area_box_create_context (GtkCellArea *area)
1459 {
1460   GtkCellAreaBox        *box  = GTK_CELL_AREA_BOX (area);
1461   GtkCellAreaBoxPrivate *priv = box->priv;
1462   GtkCellAreaContext    *context =
1463     (GtkCellAreaContext *)g_object_new (GTK_TYPE_CELL_AREA_BOX_CONTEXT,
1464                                      "area", area, NULL);
1465
1466   priv->contexts = g_slist_prepend (priv->contexts, context);
1467
1468   g_object_weak_ref (G_OBJECT (context), (GWeakNotify)context_weak_notify, box);
1469
1470   /* Tell the new group about our cell layout */
1471   init_context_group (box, GTK_CELL_AREA_BOX_CONTEXT (context));
1472
1473   return context;
1474 }
1475
1476 static GtkCellAreaContext *
1477 gtk_cell_area_box_copy_context (GtkCellArea        *area,
1478                                 GtkCellAreaContext *context)
1479 {
1480   GtkCellAreaBox        *box  = GTK_CELL_AREA_BOX (area);
1481   GtkCellAreaBoxPrivate *priv = box->priv;
1482   GtkCellAreaContext    *copy =
1483     (GtkCellAreaContext *)_gtk_cell_area_box_context_copy (GTK_CELL_AREA_BOX (area),
1484                                                           GTK_CELL_AREA_BOX_CONTEXT (context));
1485
1486   priv->contexts = g_slist_prepend (priv->contexts, copy);
1487
1488   g_object_weak_ref (G_OBJECT (copy), (GWeakNotify)context_weak_notify, box);
1489
1490   return copy;
1491 }
1492
1493 static GtkSizeRequestMode
1494 gtk_cell_area_box_get_request_mode (GtkCellArea *area)
1495 {
1496   GtkCellAreaBox        *box  = GTK_CELL_AREA_BOX (area);
1497   GtkCellAreaBoxPrivate *priv = box->priv;
1498
1499   return (priv->orientation) == GTK_ORIENTATION_HORIZONTAL ?
1500     GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH :
1501     GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT;
1502 }
1503
1504 static void
1505 compute_size (GtkCellAreaBox        *box,
1506               GtkOrientation         orientation,
1507               GtkCellAreaBoxContext *context,
1508               GtkWidget             *widget,
1509               gint                   for_size,
1510               gint                  *minimum_size,
1511               gint                  *natural_size)
1512 {
1513   GtkCellAreaBoxPrivate *priv = box->priv;
1514   GtkCellArea           *area = GTK_CELL_AREA (box);
1515   GList                 *list;
1516   gint                   i;
1517   gint                   min_size = 0;
1518   gint                   nat_size = 0;
1519
1520   for (i = 0; i < priv->groups->len; i++)
1521     {
1522       CellGroup *group = &g_array_index (priv->groups, CellGroup, i);
1523       gint       group_min_size = 0;
1524       gint       group_nat_size = 0;
1525
1526       for (list = group->cells; list; list = list->next)
1527         {
1528           CellInfo *info = list->data;
1529           gint      renderer_min_size, renderer_nat_size;
1530
1531           if (!gtk_cell_renderer_get_visible (info->renderer))
1532               continue;
1533
1534           gtk_cell_area_request_renderer (area, info->renderer, orientation, widget, for_size,
1535                                           &renderer_min_size, &renderer_nat_size);
1536
1537           if (orientation == priv->orientation)
1538             {
1539               if (min_size > 0)
1540                 {
1541                   min_size += priv->spacing;
1542                   nat_size += priv->spacing;
1543                 }
1544
1545               if (group_min_size > 0)
1546                 {
1547                   group_min_size += priv->spacing;
1548                   group_nat_size += priv->spacing;
1549                 }
1550
1551               min_size       += renderer_min_size;
1552               nat_size       += renderer_nat_size;
1553               group_min_size += renderer_min_size;
1554               group_nat_size += renderer_nat_size;
1555             }
1556           else
1557             {
1558               min_size       = MAX (min_size, renderer_min_size);
1559               nat_size       = MAX (nat_size, renderer_nat_size);
1560               group_min_size = MAX (group_min_size, renderer_min_size);
1561               group_nat_size = MAX (group_nat_size, renderer_nat_size);
1562             }
1563         }
1564
1565       if (orientation == GTK_ORIENTATION_HORIZONTAL)
1566         {
1567           if (for_size < 0)
1568             _gtk_cell_area_box_context_push_group_width (context, group->id, group_min_size, group_nat_size);
1569           else
1570             _gtk_cell_area_box_context_push_group_width_for_height (context, group->id, for_size,
1571                                                                    group_min_size, group_nat_size);
1572         }
1573       else
1574         {
1575           if (for_size < 0)
1576             _gtk_cell_area_box_context_push_group_height (context, group->id, group_min_size, group_nat_size);
1577           else
1578             _gtk_cell_area_box_context_push_group_height_for_width (context, group->id, for_size,
1579                                                                    group_min_size, group_nat_size);
1580         }
1581     }
1582
1583   *minimum_size = min_size;
1584   *natural_size = nat_size;
1585
1586   /* Update rtl state for focus navigation to work */
1587   priv->rtl = (priv->orientation == GTK_ORIENTATION_HORIZONTAL &&
1588                gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);
1589 }
1590
1591 static GtkRequestedSize *
1592 get_group_sizes (GtkCellArea    *area,
1593                  CellGroup      *group,
1594                  GtkOrientation  orientation,
1595                  GtkWidget      *widget,
1596                  gint           *n_sizes)
1597 {
1598   GtkRequestedSize *sizes;
1599   GList            *l;
1600   gint              i;
1601
1602   *n_sizes = count_visible_cells (group, NULL);
1603   sizes    = g_new (GtkRequestedSize, *n_sizes);
1604
1605   for (l = group->cells, i = 0; l; l = l->next)
1606     {
1607       CellInfo *info = l->data;
1608
1609       if (!gtk_cell_renderer_get_visible (info->renderer))
1610         continue;
1611
1612       sizes[i].data = info;
1613
1614       gtk_cell_area_request_renderer (area, info->renderer,
1615                                       orientation, widget, -1,
1616                                       &sizes[i].minimum_size,
1617                                       &sizes[i].natural_size);
1618
1619       i++;
1620     }
1621
1622   return sizes;
1623 }
1624
1625 static void
1626 compute_group_size_for_opposing_orientation (GtkCellAreaBox     *box,
1627                                              CellGroup          *group,
1628                                              GtkWidget          *widget,
1629                                              gint                for_size,
1630                                              gint               *minimum_size,
1631                                              gint               *natural_size)
1632 {
1633   GtkCellAreaBoxPrivate *priv = box->priv;
1634   GtkCellArea           *area = GTK_CELL_AREA (box);
1635
1636   /* Exception for single cell groups */
1637   if (group->n_cells == 1)
1638     {
1639       CellInfo *info = group->cells->data;
1640
1641       gtk_cell_area_request_renderer (area, info->renderer,
1642                                       OPPOSITE_ORIENTATION (priv->orientation),
1643                                       widget, for_size, minimum_size, natural_size);
1644     }
1645   else
1646     {
1647       GtkRequestedSize *orientation_sizes;
1648       CellInfo         *info;
1649       gint              n_sizes, i;
1650       gint              avail_size     = for_size;
1651       gint              extra_size, extra_extra;
1652       gint              min_size = 0, nat_size = 0;
1653
1654       orientation_sizes = get_group_sizes (area, group, priv->orientation, widget, &n_sizes);
1655
1656       /* First naturally allocate the cells in the group into the for_size */
1657       avail_size -= (n_sizes - 1) * priv->spacing;
1658       for (i = 0; i < n_sizes; i++)
1659         avail_size -= orientation_sizes[i].minimum_size;
1660
1661       if (avail_size > 0)
1662         avail_size = gtk_distribute_natural_allocation (avail_size, n_sizes, orientation_sizes);
1663       else
1664         avail_size = 0;
1665
1666       /* Calculate/distribute expand for cells */
1667       if (group->expand_cells > 0)
1668         {
1669           extra_size  = avail_size / group->expand_cells;
1670           extra_extra = avail_size % group->expand_cells;
1671         }
1672       else
1673         extra_size = extra_extra = 0;
1674
1675       for (i = 0; i < n_sizes; i++)
1676         {
1677           gint cell_min, cell_nat;
1678
1679           info = orientation_sizes[i].data;
1680
1681           if (info->expand)
1682             {
1683               orientation_sizes[i].minimum_size += extra_size;
1684               if (extra_extra)
1685                 {
1686                   orientation_sizes[i].minimum_size++;
1687                   extra_extra--;
1688                 }
1689             }
1690
1691           gtk_cell_area_request_renderer (area, info->renderer,
1692                                           OPPOSITE_ORIENTATION (priv->orientation),
1693                                           widget,
1694                                           orientation_sizes[i].minimum_size,
1695                                           &cell_min, &cell_nat);
1696
1697           min_size = MAX (min_size, cell_min);
1698           nat_size = MAX (nat_size, cell_nat);
1699         }
1700
1701       *minimum_size = min_size;
1702       *natural_size = nat_size;
1703
1704       g_free (orientation_sizes);
1705     }
1706 }
1707
1708 static void
1709 compute_size_for_opposing_orientation (GtkCellAreaBox        *box,
1710                                        GtkCellAreaBoxContext *context,
1711                                        GtkWidget             *widget,
1712                                        gint                   for_size,
1713                                        gint                  *minimum_size,
1714                                        gint                  *natural_size)
1715 {
1716   GtkCellAreaBoxPrivate *priv = box->priv;
1717   CellGroup             *group;
1718   GtkRequestedSize      *orientation_sizes;
1719   gint                   n_groups, n_expand_groups, i;
1720   gint                   avail_size = for_size;
1721   gint                   extra_size, extra_extra;
1722   gint                   min_size = 0, nat_size = 0;
1723
1724   n_expand_groups = count_expand_groups (box);
1725
1726   if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
1727     orientation_sizes = _gtk_cell_area_box_context_get_widths (context, &n_groups);
1728   else
1729     orientation_sizes = _gtk_cell_area_box_context_get_heights (context, &n_groups);
1730
1731   /* First start by naturally allocating space among groups of cells */
1732   avail_size -= (n_groups - 1) * priv->spacing;
1733   for (i = 0; i < n_groups; i++)
1734     avail_size -= orientation_sizes[i].minimum_size;
1735
1736   if (avail_size > 0)
1737     avail_size = gtk_distribute_natural_allocation (avail_size, n_groups, orientation_sizes);
1738   else
1739     avail_size = 0;
1740
1741   /* Calculate/distribute expand for groups */
1742   if (n_expand_groups > 0)
1743     {
1744       extra_size  = avail_size / n_expand_groups;
1745       extra_extra = avail_size % n_expand_groups;
1746     }
1747   else
1748     extra_size = extra_extra = 0;
1749
1750   /* Now we need to naturally allocate sizes for cells in each group
1751    * and push the height-for-width for each group accordingly while
1752    * accumulating the overall height-for-width for this row.
1753    */
1754   for (i = 0; i < n_groups; i++)
1755     {
1756       gint group_min, group_nat;
1757       gint group_idx = GPOINTER_TO_INT (orientation_sizes[i].data);
1758
1759       group = &g_array_index (priv->groups, CellGroup, group_idx);
1760
1761       if (group->expand_cells > 0)
1762         {
1763           orientation_sizes[i].minimum_size += extra_size;
1764           if (extra_extra)
1765             {
1766               orientation_sizes[i].minimum_size++;
1767               extra_extra--;
1768             }
1769         }
1770
1771       /* Now we have the allocation for the group,
1772        * request it's height-for-width
1773        */
1774       compute_group_size_for_opposing_orientation (box, group, widget,
1775                                                    orientation_sizes[i].minimum_size,
1776                                                    &group_min, &group_nat);
1777
1778       min_size = MAX (min_size, group_min);
1779       nat_size = MAX (nat_size, group_nat);
1780
1781       if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
1782         {
1783           _gtk_cell_area_box_context_push_group_height_for_width (context, group_idx, for_size,
1784                                                                  group_min, group_nat);
1785         }
1786       else
1787         {
1788           _gtk_cell_area_box_context_push_group_width_for_height (context, group_idx, for_size,
1789                                                                  group_min, group_nat);
1790         }
1791     }
1792
1793   *minimum_size = min_size;
1794   *natural_size = nat_size;
1795
1796   g_free (orientation_sizes);
1797
1798   /* Update rtl state for focus navigation to work */
1799   priv->rtl = (priv->orientation == GTK_ORIENTATION_HORIZONTAL &&
1800                gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);
1801 }
1802
1803
1804
1805 static void
1806 gtk_cell_area_box_get_preferred_width (GtkCellArea        *area,
1807                                        GtkCellAreaContext *context,
1808                                        GtkWidget          *widget,
1809                                        gint               *minimum_width,
1810                                        gint               *natural_width)
1811 {
1812   GtkCellAreaBox        *box = GTK_CELL_AREA_BOX (area);
1813   GtkCellAreaBoxContext *box_context;
1814   gint                   min_width, nat_width;
1815
1816   g_return_if_fail (GTK_IS_CELL_AREA_BOX_CONTEXT (context));
1817
1818   box_context = GTK_CELL_AREA_BOX_CONTEXT (context);
1819
1820   /* Compute the size of all renderers for current row data,
1821    * bumping cell alignments in the context along the way
1822    */
1823   compute_size (box, GTK_ORIENTATION_HORIZONTAL,
1824                 box_context, widget, -1, &min_width, &nat_width);
1825
1826   if (minimum_width)
1827     *minimum_width = min_width;
1828
1829   if (natural_width)
1830     *natural_width = nat_width;
1831 }
1832
1833 static void
1834 gtk_cell_area_box_get_preferred_height (GtkCellArea        *area,
1835                                         GtkCellAreaContext *context,
1836                                         GtkWidget          *widget,
1837                                         gint               *minimum_height,
1838                                         gint               *natural_height)
1839 {
1840   GtkCellAreaBox        *box = GTK_CELL_AREA_BOX (area);
1841   GtkCellAreaBoxContext *box_context;
1842   gint                   min_height, nat_height;
1843
1844   g_return_if_fail (GTK_IS_CELL_AREA_BOX_CONTEXT (context));
1845
1846   box_context = GTK_CELL_AREA_BOX_CONTEXT (context);
1847
1848   /* Compute the size of all renderers for current row data,
1849    * bumping cell alignments in the context along the way
1850    */
1851   compute_size (box, GTK_ORIENTATION_VERTICAL,
1852                 box_context, widget, -1, &min_height, &nat_height);
1853
1854   if (minimum_height)
1855     *minimum_height = min_height;
1856
1857   if (natural_height)
1858     *natural_height = nat_height;
1859 }
1860
1861 static void
1862 gtk_cell_area_box_get_preferred_height_for_width (GtkCellArea        *area,
1863                                                   GtkCellAreaContext *context,
1864                                                   GtkWidget          *widget,
1865                                                   gint                width,
1866                                                   gint               *minimum_height,
1867                                                   gint               *natural_height)
1868 {
1869   GtkCellAreaBox        *box = GTK_CELL_AREA_BOX (area);
1870   GtkCellAreaBoxContext *box_context;
1871   GtkCellAreaBoxPrivate *priv;
1872   gint                   min_height, nat_height;
1873
1874   g_return_if_fail (GTK_IS_CELL_AREA_BOX_CONTEXT (context));
1875
1876   box_context = GTK_CELL_AREA_BOX_CONTEXT (context);
1877   priv        = box->priv;
1878
1879   if (priv->orientation == GTK_ORIENTATION_VERTICAL)
1880     {
1881       /* Add up vertical requests of height for width and push
1882        * the overall cached sizes for alignments
1883        */
1884       compute_size (box, priv->orientation, box_context, widget, width, &min_height, &nat_height);
1885     }
1886   else
1887     {
1888       /* Juice: virtually allocate cells into the for_width using the
1889        * alignments and then return the overall height for that width,
1890        * and cache it
1891        */
1892       compute_size_for_opposing_orientation (box, box_context, widget, width, &min_height, &nat_height);
1893     }
1894
1895   if (minimum_height)
1896     *minimum_height = min_height;
1897
1898   if (natural_height)
1899     *natural_height = nat_height;
1900 }
1901
1902 static void
1903 gtk_cell_area_box_get_preferred_width_for_height (GtkCellArea        *area,
1904                                                   GtkCellAreaContext *context,
1905                                                   GtkWidget          *widget,
1906                                                   gint                height,
1907                                                   gint               *minimum_width,
1908                                                   gint               *natural_width)
1909 {
1910   GtkCellAreaBox        *box = GTK_CELL_AREA_BOX (area);
1911   GtkCellAreaBoxContext *box_context;
1912   GtkCellAreaBoxPrivate *priv;
1913   gint                   min_width, nat_width;
1914
1915   g_return_if_fail (GTK_IS_CELL_AREA_BOX_CONTEXT (context));
1916
1917   box_context = GTK_CELL_AREA_BOX_CONTEXT (context);
1918   priv        = box->priv;
1919
1920   if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
1921     {
1922       /* Add up horizontal requests of width for height and push
1923        * the overall cached sizes for alignments
1924        */
1925       compute_size (box, priv->orientation, box_context, widget, height, &min_width, &nat_width);
1926     }
1927   else
1928     {
1929       /* Juice: horizontally allocate cells into the for_height using the
1930        * alignments and then return the overall width for that height,
1931        * and cache it
1932        */
1933       compute_size_for_opposing_orientation (box, box_context, widget, height, &min_width, &nat_width);
1934     }
1935
1936   if (minimum_width)
1937     *minimum_width = min_width;
1938
1939   if (natural_width)
1940     *natural_width = nat_width;
1941 }
1942
1943 enum {
1944   FOCUS_NONE,
1945   FOCUS_PREV,
1946   FOCUS_NEXT,
1947   FOCUS_LAST_CELL
1948 };
1949
1950 static gboolean
1951 gtk_cell_area_box_focus (GtkCellArea      *area,
1952                          GtkDirectionType  direction)
1953 {
1954   GtkCellAreaBox        *box   = GTK_CELL_AREA_BOX (area);
1955   GtkCellAreaBoxPrivate *priv  = box->priv;
1956   gint                   cycle = FOCUS_NONE;
1957   gboolean               cycled_focus = FALSE;
1958   GtkCellRenderer       *focus_cell;
1959
1960   focus_cell = gtk_cell_area_get_focus_cell (area);
1961
1962   /* Special case, when there is no activatable cell, focus
1963    * is painted around the entire area... in this case we
1964    * let focus leave the area directly.
1965    */
1966   if (focus_cell && !gtk_cell_area_is_activatable (area))
1967     {
1968       gtk_cell_area_set_focus_cell (area, NULL);
1969       return FALSE;
1970     }
1971
1972   switch (direction)
1973     {
1974     case GTK_DIR_TAB_FORWARD:
1975       cycle = priv->rtl ? FOCUS_PREV : FOCUS_NEXT;
1976       break;
1977     case GTK_DIR_TAB_BACKWARD:
1978       cycle = priv->rtl ? FOCUS_NEXT : FOCUS_PREV;
1979       break;
1980     case GTK_DIR_UP:
1981       if (priv->orientation == GTK_ORIENTATION_VERTICAL || !priv->last_focus_cell)
1982         cycle = FOCUS_PREV;
1983       else if (!focus_cell)
1984         cycle = FOCUS_LAST_CELL;
1985       break;
1986     case GTK_DIR_DOWN:
1987       if (priv->orientation == GTK_ORIENTATION_VERTICAL || !priv->last_focus_cell)
1988         cycle = FOCUS_NEXT;
1989       else if (!focus_cell)
1990         cycle = FOCUS_LAST_CELL;
1991       break;
1992     case GTK_DIR_LEFT:
1993       if (priv->orientation == GTK_ORIENTATION_HORIZONTAL || !priv->last_focus_cell)
1994         cycle = priv->rtl ? FOCUS_NEXT : FOCUS_PREV;
1995       else if (!focus_cell)
1996         cycle = FOCUS_LAST_CELL;
1997       break;
1998     case GTK_DIR_RIGHT:
1999       if (priv->orientation == GTK_ORIENTATION_HORIZONTAL || !priv->last_focus_cell)
2000         cycle = priv->rtl ? FOCUS_PREV : FOCUS_NEXT;
2001       else if (!focus_cell)
2002         cycle = FOCUS_LAST_CELL;
2003       break;
2004     default:
2005       break;
2006     }
2007
2008   if (cycle == FOCUS_LAST_CELL)
2009     {
2010       gtk_cell_area_set_focus_cell (area, priv->last_focus_cell);
2011       cycled_focus = TRUE;
2012     }
2013   else if (cycle != FOCUS_NONE)
2014     {
2015       gboolean  found_cell = FALSE;
2016       GList    *list;
2017       gint      i;
2018
2019       /* If there is no focused cell, focus on the first (or last) one */
2020       if (!focus_cell)
2021         found_cell = TRUE;
2022
2023       for (i = (cycle == FOCUS_NEXT) ? 0 : priv->groups->len -1;
2024            cycled_focus == FALSE && i >= 0 && i < priv->groups->len;
2025            i = (cycle == FOCUS_NEXT) ? i + 1 : i - 1)
2026         {
2027           CellGroup *group = &g_array_index (priv->groups, CellGroup, i);
2028
2029           for (list = (cycle == FOCUS_NEXT) ? g_list_first (group->cells) : g_list_last (group->cells);
2030                cycled_focus == FALSE && list; list = (cycle == FOCUS_NEXT) ? list->next : list->prev)
2031             {
2032               CellInfo *info = list->data;
2033
2034               if (info->renderer == focus_cell)
2035                 found_cell = TRUE;
2036               else if (found_cell && /* Dont give focus to cells that are siblings to a focus cell */
2037                        gtk_cell_area_get_focus_from_sibling (area, info->renderer) == NULL)
2038                 {
2039                   gtk_cell_area_set_focus_cell (area, info->renderer);
2040                   cycled_focus = TRUE;
2041                 }
2042             }
2043         }
2044     }
2045
2046   if (!cycled_focus)
2047     gtk_cell_area_set_focus_cell (area, NULL);
2048
2049   return cycled_focus;
2050 }
2051
2052
2053 /*************************************************************
2054  *                    GtkCellLayoutIface                     *
2055  *************************************************************/
2056 static void
2057 gtk_cell_area_box_cell_layout_init (GtkCellLayoutIface *iface)
2058 {
2059   iface->pack_start = gtk_cell_area_box_layout_pack_start;
2060   iface->pack_end   = gtk_cell_area_box_layout_pack_end;
2061   iface->reorder    = gtk_cell_area_box_layout_reorder;
2062 }
2063
2064 static void
2065 gtk_cell_area_box_layout_pack_start (GtkCellLayout      *cell_layout,
2066                                      GtkCellRenderer    *renderer,
2067                                      gboolean            expand)
2068 {
2069   gtk_cell_area_box_pack_start (GTK_CELL_AREA_BOX (cell_layout), renderer, expand, FALSE, TRUE);
2070 }
2071
2072 static void
2073 gtk_cell_area_box_layout_pack_end (GtkCellLayout      *cell_layout,
2074                                    GtkCellRenderer    *renderer,
2075                                    gboolean            expand)
2076 {
2077   gtk_cell_area_box_pack_end (GTK_CELL_AREA_BOX (cell_layout), renderer, expand, FALSE, TRUE);
2078 }
2079
2080 static void
2081 gtk_cell_area_box_layout_reorder (GtkCellLayout      *cell_layout,
2082                                   GtkCellRenderer    *renderer,
2083                                   gint                position)
2084 {
2085   GtkCellAreaBox        *box  = GTK_CELL_AREA_BOX (cell_layout);
2086   GtkCellAreaBoxPrivate *priv = box->priv;
2087   GList                 *node;
2088   CellInfo              *info;
2089
2090   node = g_list_find_custom (priv->cells, renderer,
2091                              (GCompareFunc)cell_info_find);
2092
2093   if (node)
2094     {
2095       info = node->data;
2096
2097       priv->cells = g_list_delete_link (priv->cells, node);
2098       priv->cells = g_list_insert (priv->cells, info, position);
2099
2100       cell_groups_rebuild (box);
2101     }
2102 }
2103
2104 /*************************************************************
2105  *       Private interaction with GtkCellAreaBoxContext      *
2106  *************************************************************/
2107 gboolean
2108 _gtk_cell_area_box_group_visible (GtkCellAreaBox  *box,
2109                                   gint             group_idx)
2110 {
2111   GtkCellAreaBoxPrivate *priv  = box->priv;
2112   CellGroup *group;
2113   
2114   g_assert (group_idx >= 0 && group_idx < priv->groups->len);
2115
2116   group = &g_array_index (priv->groups, CellGroup, group_idx);
2117
2118   return group->visible;
2119 }
2120
2121
2122 /*************************************************************
2123  *                            API                            *
2124  *************************************************************/
2125 /**
2126  * gtk_cell_area_box_new:
2127  *
2128  * Creates a new #GtkCellAreaBox.
2129  *
2130  * Return value: a newly created #GtkCellAreaBox
2131  *
2132  * Since: 3.0
2133  */
2134 GtkCellArea *
2135 gtk_cell_area_box_new (void)
2136 {
2137   return (GtkCellArea *)g_object_new (GTK_TYPE_CELL_AREA_BOX, NULL);
2138 }
2139
2140 /**
2141  * gtk_cell_area_box_pack_start:
2142  * @box: a #GtkCellAreaBox
2143  * @renderer: the #GtkCellRenderer to add
2144  * @expand: whether @renderer should receive extra space when the area receives
2145  * more than its natural size
2146  * @align: whether @renderer should be aligned in adjacent rows
2147  * @fixed: whether @renderer should have the same size in all rows
2148  *
2149  * Adds @renderer to @box, packed with reference to the start of @box.
2150  *
2151  * The @renderer is packed after any other #GtkCellRenderer packed
2152  * with reference to the start of @box.
2153  *
2154  * Since: 3.0
2155  */
2156 void
2157 gtk_cell_area_box_pack_start  (GtkCellAreaBox  *box,
2158                                GtkCellRenderer *renderer,
2159                                gboolean         expand,
2160                                gboolean         align,
2161                                gboolean         fixed)
2162 {
2163   GtkCellAreaBoxPrivate *priv;
2164   CellInfo              *info;
2165
2166   g_return_if_fail (GTK_IS_CELL_AREA_BOX (box));
2167   g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
2168
2169   priv = box->priv;
2170
2171   if (g_list_find_custom (priv->cells, renderer,
2172                           (GCompareFunc)cell_info_find))
2173     {
2174       g_warning ("Refusing to add the same cell renderer to a GtkCellAreaBox twice");
2175       return;
2176     }
2177
2178   info = cell_info_new (renderer, GTK_PACK_START, expand, align, fixed);
2179
2180   priv->cells = g_list_append (priv->cells, info);
2181
2182   cell_groups_rebuild (box);
2183 }
2184
2185 /**
2186  * gtk_cell_area_box_pack_end:
2187  * @box: a #GtkCellAreaBox
2188  * @renderer: the #GtkCellRenderer to add
2189  * @expand: whether @renderer should receive extra space when the area receives
2190  * more than its natural size
2191  * @align: whether @renderer should be aligned in adjacent rows
2192  * @fixed: whether @renderer should have the same size in all rows
2193  *
2194  * Adds @renderer to @box, packed with reference to the end of @box.
2195  *
2196  * The @renderer is packed after (away from end of) any other
2197  * #GtkCellRenderer packed with reference to the end of @box.
2198  *
2199  * Since: 3.0
2200  */
2201 void
2202 gtk_cell_area_box_pack_end (GtkCellAreaBox  *box,
2203                             GtkCellRenderer *renderer,
2204                             gboolean         expand,
2205                             gboolean         align,
2206                             gboolean         fixed)
2207 {
2208   GtkCellAreaBoxPrivate *priv;
2209   CellInfo              *info;
2210
2211   g_return_if_fail (GTK_IS_CELL_AREA_BOX (box));
2212   g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
2213
2214   priv = box->priv;
2215
2216   if (g_list_find_custom (priv->cells, renderer,
2217                           (GCompareFunc)cell_info_find))
2218     {
2219       g_warning ("Refusing to add the same cell renderer to a GtkCellArea twice");
2220       return;
2221     }
2222
2223   info = cell_info_new (renderer, GTK_PACK_END, expand, align, fixed);
2224
2225   priv->cells = g_list_append (priv->cells, info);
2226
2227   cell_groups_rebuild (box);
2228 }
2229
2230 /**
2231  * gtk_cell_area_box_get_spacing:
2232  * @box: a #GtkCellAreaBox
2233  *
2234  * Gets the spacing added between cell renderers.
2235  *
2236  * Return value: the space added between cell renderers in @box.
2237  *
2238  * Since: 3.0
2239  */
2240 gint
2241 gtk_cell_area_box_get_spacing (GtkCellAreaBox  *box)
2242 {
2243   g_return_val_if_fail (GTK_IS_CELL_AREA_BOX (box), 0);
2244
2245   return box->priv->spacing;
2246 }
2247
2248 /**
2249  * gtk_cell_area_box_set_spacing:
2250  * @box: a #GtkCellAreaBox
2251  * @spacing: the space to add between #GtkCellRenderers
2252  *
2253  * Sets the spacing to add between cell renderers in @box.
2254  *
2255  * Since: 3.0
2256  */
2257 void
2258 gtk_cell_area_box_set_spacing (GtkCellAreaBox  *box,
2259                                gint             spacing)
2260 {
2261   GtkCellAreaBoxPrivate *priv;
2262
2263   g_return_if_fail (GTK_IS_CELL_AREA_BOX (box));
2264
2265   priv = box->priv;
2266
2267   if (priv->spacing != spacing)
2268     {
2269       priv->spacing = spacing;
2270
2271       g_object_notify (G_OBJECT (box), "spacing");
2272
2273       /* Notify that size needs to be requested again */
2274       reset_contexts (box);
2275     }
2276 }