]> Pileus Git - ~andy/gtk/blob - gtk/gtkcellareabox.c
e54f018fab2f820592d55fccf26402b14057e879
[~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 "gtkcellareaboxcontext.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 reseting 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 were not aligned, place the cell after the last cell */
870           if (info->align)
871             position = cell_position = group_allocs[i].position;
872           else
873             cell_position = position;
874
875           /* If not a fixed size, use only the requested size for this row */
876           if (info->fixed)
877             cell_size = group_allocs[i].size;
878           else
879             {
880               gint dummy;
881               gtk_cell_area_request_renderer (area, info->renderer,
882                                               priv->orientation,
883                                               widget, for_size,
884                                               &dummy,
885                                               &cell_size);
886               cell_size = MIN (cell_size, group_allocs[i].size);
887             }
888
889           if (rtl)
890             cell = allocated_cell_new (info->renderer,
891                                        full_size - (cell_position + cell_size), cell_size);
892           else
893             cell = allocated_cell_new (info->renderer, cell_position, cell_size);
894
895           position += cell_size;
896           position += priv->spacing;
897
898           allocated_cells = g_slist_prepend (allocated_cells, cell);
899         }
900       else
901         {
902           GtkRequestedSize *sizes;
903           gint              avail_size, cell_position;
904           gint              visible_cells, expand_cells;
905           gint              extra_size, extra_extra;
906
907           visible_cells = count_visible_cells (group, &expand_cells);
908
909           /* If this row has no visible cells in this group, just
910            * skip the allocation
911            */
912           if (visible_cells == 0)
913             continue;
914
915           /* If were not aligned, place the cell after the last cell 
916            * and eat up the extra space
917            */
918           if (group->align)
919             {
920               avail_size = group_allocs[i].size;
921               position   = cell_position = group_allocs[i].position;
922             }
923           else
924             {
925               avail_size    = group_allocs[i].size + (group_allocs[i].position - position);
926               cell_position = position;
927             }
928
929           sizes = g_new (GtkRequestedSize, visible_cells);
930
931           for (j = 0, cell_list = group->cells; cell_list; cell_list = cell_list->next)
932             {
933               CellInfo *info = cell_list->data;
934
935               if (!gtk_cell_renderer_get_visible (info->renderer))
936                 continue;
937
938               gtk_cell_area_request_renderer (area, info->renderer,
939                                               priv->orientation,
940                                               widget, for_size,
941                                               &sizes[j].minimum_size,
942                                               &sizes[j].natural_size);
943
944               sizes[j].data = info;
945               avail_size   -= sizes[j].minimum_size;
946
947               j++;
948             }
949
950           /* Distribute cells naturally within the group */
951           avail_size -= (visible_cells - 1) * priv->spacing;
952           if (avail_size > 0)
953             avail_size = gtk_distribute_natural_allocation (avail_size, visible_cells, sizes);
954           else
955             avail_size = 0;
956
957           /* Calculate/distribute expand for cells */
958           if (expand_cells > 0)
959             {
960               extra_size  = avail_size / expand_cells;
961               extra_extra = avail_size % expand_cells;
962             }
963           else
964             extra_size = extra_extra = 0;
965
966           /* Create the allocated cells (loop only over visible cells here) */
967           for (j = 0; j < visible_cells; j++)
968             {
969               CellInfo      *info = sizes[j].data;
970               AllocatedCell *cell;
971
972               if (info->expand)
973                 {
974                   sizes[j].minimum_size += extra_size;
975                   if (extra_extra)
976                     {
977                       sizes[j].minimum_size++;
978                       extra_extra--;
979                     }
980                 }
981
982               if (rtl)
983                 cell = allocated_cell_new (info->renderer,
984                                            full_size - (cell_position + sizes[j].minimum_size),
985                                            sizes[j].minimum_size);
986               else
987                 cell = allocated_cell_new (info->renderer, cell_position, sizes[j].minimum_size);
988
989               allocated_cells = g_slist_prepend (allocated_cells, cell);
990
991               cell_position += sizes[j].minimum_size;
992               cell_position += priv->spacing;
993             }
994
995           g_free (sizes);
996
997           position = cell_position;
998         }
999     }
1000
1001   g_free (group_allocs);
1002
1003   /* Note it might not be important to reverse the list here at all,
1004    * we have the correct positions, no need to allocate from left to right
1005    */
1006   return g_slist_reverse (allocated_cells);
1007 }
1008
1009
1010 static void
1011 gtk_cell_area_box_focus_changed (GtkCellArea        *area,
1012                                  GParamSpec         *pspec,
1013                                  GtkCellAreaBox     *box)
1014 {
1015   if (gtk_cell_area_get_focus_cell (area))
1016     box->priv->last_focus_cell = gtk_cell_area_get_focus_cell (area);
1017 }
1018
1019 /*************************************************************
1020  *                      GObjectClass                         *
1021  *************************************************************/
1022 static void
1023 gtk_cell_area_box_finalize (GObject *object)
1024 {
1025   GtkCellAreaBox        *box = GTK_CELL_AREA_BOX (object);
1026   GtkCellAreaBoxPrivate *priv = box->priv;
1027   GSList                *l;
1028
1029   /* Unref/free the context list */
1030   for (l = priv->contexts; l; l = l->next)
1031     g_object_weak_unref (G_OBJECT (l->data), (GWeakNotify)context_weak_notify, box);
1032
1033   g_slist_free (priv->contexts);
1034   priv->contexts = NULL;
1035
1036   /* Free the cell grouping info */
1037   cell_groups_clear (box);
1038   g_array_free (priv->groups, TRUE);
1039
1040   G_OBJECT_CLASS (gtk_cell_area_box_parent_class)->finalize (object);
1041 }
1042
1043 static void
1044 gtk_cell_area_box_dispose (GObject *object)
1045 {
1046   G_OBJECT_CLASS (gtk_cell_area_box_parent_class)->dispose (object);
1047 }
1048
1049 static void
1050 gtk_cell_area_box_set_property (GObject       *object,
1051                                 guint          prop_id,
1052                                 const GValue  *value,
1053                                 GParamSpec    *pspec)
1054 {
1055   GtkCellAreaBox *box = GTK_CELL_AREA_BOX (object);
1056
1057   switch (prop_id)
1058     {
1059     case PROP_ORIENTATION:
1060       box->priv->orientation = g_value_get_enum (value);
1061
1062       /* Notify that size needs to be requested again */
1063       reset_contexts (box);
1064       break;
1065     case PROP_SPACING:
1066       gtk_cell_area_box_set_spacing (box, g_value_get_int (value));
1067       break;
1068     default:
1069       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
1070       break;
1071     }
1072 }
1073
1074 static void
1075 gtk_cell_area_box_get_property (GObject     *object,
1076                                 guint        prop_id,
1077                                 GValue      *value,
1078                                 GParamSpec  *pspec)
1079 {
1080   GtkCellAreaBox *box = GTK_CELL_AREA_BOX (object);
1081
1082   switch (prop_id)
1083     {
1084     case PROP_ORIENTATION:
1085       g_value_set_enum (value, box->priv->orientation);
1086       break;
1087     case PROP_SPACING:
1088       g_value_set_int (value, gtk_cell_area_box_get_spacing (box));
1089       break;
1090     default:
1091       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
1092       break;
1093     }
1094 }
1095
1096 /*************************************************************
1097  *                    GtkCellAreaClass                       *
1098  *************************************************************/
1099 static void
1100 gtk_cell_area_box_add (GtkCellArea        *area,
1101                        GtkCellRenderer    *renderer)
1102 {
1103   gtk_cell_area_box_pack_start (GTK_CELL_AREA_BOX (area),
1104                                 renderer, FALSE, FALSE, TRUE);
1105 }
1106
1107 static void
1108 gtk_cell_area_box_remove (GtkCellArea        *area,
1109                           GtkCellRenderer    *renderer)
1110 {
1111   GtkCellAreaBox        *box  = GTK_CELL_AREA_BOX (area);
1112   GtkCellAreaBoxPrivate *priv = box->priv;
1113   GList                 *node;
1114
1115   if (priv->last_focus_cell == renderer)
1116     priv->last_focus_cell = NULL;
1117
1118   node = g_list_find_custom (priv->cells, renderer,
1119                              (GCompareFunc)cell_info_find);
1120
1121   if (node)
1122     {
1123       CellInfo *info = node->data;
1124
1125       cell_info_free (info);
1126
1127       priv->cells = g_list_delete_link (priv->cells, node);
1128
1129       /* Reconstruct cell groups */
1130       cell_groups_rebuild (box);
1131     }
1132   else
1133     g_warning ("Trying to remove a cell renderer that is not present GtkCellAreaBox");
1134 }
1135
1136 static void
1137 gtk_cell_area_box_foreach (GtkCellArea        *area,
1138                            GtkCellCallback     callback,
1139                            gpointer            callback_data)
1140 {
1141   GtkCellAreaBox        *box  = GTK_CELL_AREA_BOX (area);
1142   GtkCellAreaBoxPrivate *priv = box->priv;
1143   GList                 *list;
1144
1145   for (list = priv->cells; list; list = list->next)
1146     {
1147       CellInfo *info = list->data;
1148
1149       if (callback (info->renderer, callback_data))
1150         break;
1151     }
1152 }
1153
1154 static void
1155 gtk_cell_area_box_foreach_alloc (GtkCellArea          *area,
1156                                  GtkCellAreaContext   *context,
1157                                  GtkWidget            *widget,
1158                                  const GdkRectangle   *cell_area,
1159                                  const GdkRectangle   *background_area,
1160                                  GtkCellAllocCallback  callback,
1161                                  gpointer              callback_data)
1162 {
1163   GtkCellAreaBox        *box      = GTK_CELL_AREA_BOX (area);
1164   GtkCellAreaBoxPrivate *priv     = box->priv;
1165   GtkCellAreaBoxContext *box_context = GTK_CELL_AREA_BOX_CONTEXT (context);
1166   GSList                *allocated_cells, *l;
1167   GdkRectangle           cell_alloc, cell_background;
1168   gboolean               rtl;
1169
1170   rtl = (priv->orientation == GTK_ORIENTATION_HORIZONTAL &&
1171          gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);
1172
1173   cell_alloc = *cell_area;
1174
1175   /* Get a list of cells with allocation sizes decided regardless
1176    * of alignments and pack order etc.
1177    */
1178   allocated_cells = get_allocated_cells (box, box_context, widget,
1179                                          cell_area->width, cell_area->height);
1180
1181   for (l = allocated_cells; l; l = l->next)
1182     {
1183       AllocatedCell *cell = l->data;
1184
1185       if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
1186         {
1187           cell_alloc.x     = cell_area->x + cell->position;
1188           cell_alloc.width = cell->size;
1189         }
1190       else
1191         {
1192           cell_alloc.y      = cell_area->y + cell->position;
1193           cell_alloc.height = cell->size;
1194         }
1195
1196       /* Stop iterating over cells if they flow out of the render
1197        * area, this can happen because the render area can actually
1198        * be smaller than the requested area (treeview columns can
1199        * be user resizable and can be resized to be smaller than
1200        * the actual requested area).
1201        */
1202       if (cell_alloc.x > cell_area->x + cell_area->width ||
1203           cell_alloc.x + cell_alloc.width < cell_area->x ||
1204           cell_alloc.y > cell_area->y + cell_area->height)
1205         break;
1206
1207       /* Special case for the last cell (or first cell in rtl)...
1208        * let the last cell consume the remaining space in the area
1209        * (the last cell is allowed to consume the remaining space if
1210        * the space given for rendering is actually larger than allocation,
1211        * this can happen in the expander GtkTreeViewColumn where only the
1212        * deepest depth column receives the allocation... shallow columns
1213        * receive more width). */
1214       if (!l->next)
1215         {
1216           if (rtl)
1217             {
1218               /* Fill the leading space for the first cell in the area
1219                * (still last in the list)
1220                */
1221               cell_alloc.width = (cell_alloc.x - cell_area->x) + cell_alloc.width;
1222               cell_alloc.x     = cell_area->x;
1223             }
1224           else
1225             {
1226               cell_alloc.width  = cell_area->x + cell_area->width  - cell_alloc.x;
1227               cell_alloc.height = cell_area->y + cell_area->height - cell_alloc.y;
1228             }
1229         }
1230       else
1231         {
1232           /* If the cell we are rendering doesnt fit into the remaining space,
1233            * clip it so that the underlying renderer has a chance to deal with
1234            * it (for instance text renderers get a chance to ellipsize).
1235            */
1236           if (cell_alloc.x + cell_alloc.width > cell_area->x + cell_area->width)
1237             cell_alloc.width = cell_area->x + cell_area->width - cell_alloc.x;
1238
1239           if (cell_alloc.y + cell_alloc.height > cell_area->y + cell_area->height)
1240             cell_alloc.height = cell_area->y + cell_area->height - cell_alloc.y;
1241         }
1242
1243       /* Add portions of the background_area to the cell_alloc
1244        * to create the cell_background
1245        */
1246       cell_background = cell_alloc;
1247
1248       if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
1249         {
1250           if (l == allocated_cells)
1251             {
1252               /* Add the depth to the first cell */
1253               if (rtl)
1254                 {
1255                   cell_background.width += background_area->width - cell_area->width;
1256                   cell_background.x      = background_area->x + background_area->width - cell_background.width;
1257                 }
1258               else
1259                 {
1260                   cell_background.width += cell_area->x - background_area->x;
1261                   cell_background.x      = background_area->x;
1262                 }
1263             }
1264
1265           if (l->next == NULL)
1266             {
1267               /* Grant this cell the remaining space */
1268               int remain = cell_background.x - background_area->x;
1269
1270               if (rtl)
1271                 cell_background.x -= remain;
1272               else
1273                 cell_background.width = background_area->width - remain;
1274             }
1275
1276           cell_background.y      = background_area->y;
1277           cell_background.height = background_area->height;
1278         }
1279       else
1280         {
1281           if (l == allocated_cells)
1282             {
1283               cell_background.height += cell_background.y - background_area->y;
1284               cell_background.y       = background_area->y;
1285             }
1286
1287           if (l->next == NULL)
1288               cell_background.height =
1289                 background_area->height - (cell_background.y - background_area->y);
1290
1291           cell_background.x     = background_area->x;
1292           cell_background.width = background_area->width;
1293         }
1294
1295       if (callback (cell->renderer, &cell_alloc, &cell_background, callback_data))
1296         break;
1297     }
1298
1299   g_slist_foreach (allocated_cells, (GFunc)allocated_cell_free, NULL);
1300   g_slist_free (allocated_cells);
1301 }
1302
1303 static void
1304 gtk_cell_area_box_apply_attributes (GtkCellArea          *area,
1305                                     GtkTreeModel         *tree_model,
1306                                     GtkTreeIter          *iter,
1307                                     gboolean              is_expander,
1308                                     gboolean              is_expanded)
1309 {
1310   GtkCellAreaBox        *box  = GTK_CELL_AREA_BOX (area);
1311   GtkCellAreaBoxPrivate *priv = box->priv;
1312   gint                   i;
1313
1314   /* Call the parent class to apply the attributes */
1315   GTK_CELL_AREA_CLASS
1316     (gtk_cell_area_box_parent_class)->apply_attributes (area, tree_model, iter, 
1317                                                         is_expander, is_expanded);
1318
1319   /* Update visible state for cell groups */
1320   for (i = 0; i < priv->groups->len; i++)
1321     {
1322       CellGroup *group = &g_array_index (priv->groups, CellGroup, i);
1323       GList     *list;
1324
1325       group->visible = FALSE;
1326
1327       for (list = group->cells; list && group->visible == FALSE; list = list->next)
1328         {
1329           CellInfo *info = list->data;
1330
1331           if (gtk_cell_renderer_get_visible (info->renderer))
1332             group->visible = TRUE;
1333         }
1334     }
1335 }
1336
1337 static void
1338 gtk_cell_area_box_set_cell_property (GtkCellArea        *area,
1339                                      GtkCellRenderer    *renderer,
1340                                      guint               prop_id,
1341                                      const GValue       *value,
1342                                      GParamSpec         *pspec)
1343 {
1344   GtkCellAreaBox        *box  = GTK_CELL_AREA_BOX (area);
1345   GtkCellAreaBoxPrivate *priv = box->priv;
1346   GList                 *node;
1347   CellInfo              *info;
1348   gboolean               rebuild = FALSE;
1349   gboolean               val;
1350   GtkPackType            pack_type;
1351
1352   node = g_list_find_custom (priv->cells, renderer,
1353                              (GCompareFunc)cell_info_find);
1354   if (!node)
1355     return;
1356
1357   info = node->data;
1358
1359   switch (prop_id)
1360     {
1361     case CELL_PROP_EXPAND:
1362       val = g_value_get_boolean (value);
1363
1364       if (info->expand != val)
1365         {
1366           info->expand = val;
1367           rebuild      = TRUE;
1368         }
1369       break;
1370
1371     case CELL_PROP_ALIGN:
1372       val = g_value_get_boolean (value);
1373
1374       if (info->align != val)
1375         {
1376           info->align = val;
1377           rebuild     = TRUE;
1378         }
1379       break;
1380
1381     case CELL_PROP_FIXED_SIZE:
1382       val = g_value_get_boolean (value);
1383
1384       if (info->fixed != val)
1385         {
1386           info->fixed = val;
1387           rebuild     = TRUE;
1388         }
1389       break;
1390
1391     case CELL_PROP_PACK_TYPE:
1392       pack_type = g_value_get_enum (value);
1393
1394       if (info->pack != pack_type)
1395         {
1396           info->pack = pack_type;
1397           rebuild    = TRUE;
1398         }
1399       break;
1400     default:
1401       GTK_CELL_AREA_WARN_INVALID_CELL_PROPERTY_ID (area, prop_id, pspec);
1402       break;
1403     }
1404
1405   /* Groups need to be rebuilt */
1406   if (rebuild)
1407     cell_groups_rebuild (box);
1408 }
1409
1410 static void
1411 gtk_cell_area_box_get_cell_property (GtkCellArea        *area,
1412                                      GtkCellRenderer    *renderer,
1413                                      guint               prop_id,
1414                                      GValue             *value,
1415                                      GParamSpec         *pspec)
1416 {
1417   GtkCellAreaBox        *box  = GTK_CELL_AREA_BOX (area);
1418   GtkCellAreaBoxPrivate *priv = box->priv;
1419   GList                 *node;
1420   CellInfo              *info;
1421
1422   node = g_list_find_custom (priv->cells, renderer,
1423                              (GCompareFunc)cell_info_find);
1424   if (!node)
1425     return;
1426
1427   info = node->data;
1428
1429   switch (prop_id)
1430     {
1431     case CELL_PROP_EXPAND:
1432       g_value_set_boolean (value, info->expand);
1433       break;
1434
1435     case CELL_PROP_ALIGN:
1436       g_value_set_boolean (value, info->align);
1437       break;
1438
1439     case CELL_PROP_FIXED_SIZE:
1440       g_value_set_boolean (value, info->fixed);
1441       break;
1442
1443     case CELL_PROP_PACK_TYPE:
1444       g_value_set_enum (value, info->pack);
1445       break;
1446     default:
1447       GTK_CELL_AREA_WARN_INVALID_CELL_PROPERTY_ID (area, prop_id, pspec);
1448       break;
1449     }
1450 }
1451
1452
1453 static GtkCellAreaContext *
1454 gtk_cell_area_box_create_context (GtkCellArea *area)
1455 {
1456   GtkCellAreaBox        *box  = GTK_CELL_AREA_BOX (area);
1457   GtkCellAreaBoxPrivate *priv = box->priv;
1458   GtkCellAreaContext    *context =
1459     (GtkCellAreaContext *)g_object_new (GTK_TYPE_CELL_AREA_BOX_CONTEXT,
1460                                      "area", area, NULL);
1461
1462   priv->contexts = g_slist_prepend (priv->contexts, context);
1463
1464   g_object_weak_ref (G_OBJECT (context), (GWeakNotify)context_weak_notify, box);
1465
1466   /* Tell the new group about our cell layout */
1467   init_context_group (box, GTK_CELL_AREA_BOX_CONTEXT (context));
1468
1469   return context;
1470 }
1471
1472 static GtkCellAreaContext *
1473 gtk_cell_area_box_copy_context (GtkCellArea        *area,
1474                                 GtkCellAreaContext *context)
1475 {
1476   GtkCellAreaBox        *box  = GTK_CELL_AREA_BOX (area);
1477   GtkCellAreaBoxPrivate *priv = box->priv;
1478   GtkCellAreaContext    *copy =
1479     (GtkCellAreaContext *)gtk_cell_area_box_context_copy (GTK_CELL_AREA_BOX (area),
1480                                                           GTK_CELL_AREA_BOX_CONTEXT (context));
1481
1482   priv->contexts = g_slist_prepend (priv->contexts, copy);
1483
1484   g_object_weak_ref (G_OBJECT (copy), (GWeakNotify)context_weak_notify, box);
1485
1486   return copy;
1487 }
1488
1489 static GtkSizeRequestMode
1490 gtk_cell_area_box_get_request_mode (GtkCellArea *area)
1491 {
1492   GtkCellAreaBox        *box  = GTK_CELL_AREA_BOX (area);
1493   GtkCellAreaBoxPrivate *priv = box->priv;
1494
1495   return (priv->orientation) == GTK_ORIENTATION_HORIZONTAL ?
1496     GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH :
1497     GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT;
1498 }
1499
1500 static void
1501 compute_size (GtkCellAreaBox        *box,
1502               GtkOrientation         orientation,
1503               GtkCellAreaBoxContext *context,
1504               GtkWidget             *widget,
1505               gint                   for_size,
1506               gint                  *minimum_size,
1507               gint                  *natural_size)
1508 {
1509   GtkCellAreaBoxPrivate *priv = box->priv;
1510   GtkCellArea           *area = GTK_CELL_AREA (box);
1511   GList                 *list;
1512   gint                   i;
1513   gint                   min_size = 0;
1514   gint                   nat_size = 0;
1515
1516   for (i = 0; i < priv->groups->len; i++)
1517     {
1518       CellGroup *group = &g_array_index (priv->groups, CellGroup, i);
1519       gint       group_min_size = 0;
1520       gint       group_nat_size = 0;
1521
1522       for (list = group->cells; list; list = list->next)
1523         {
1524           CellInfo *info = list->data;
1525           gint      renderer_min_size, renderer_nat_size;
1526
1527           if (!gtk_cell_renderer_get_visible (info->renderer))
1528               continue;
1529
1530           gtk_cell_area_request_renderer (area, info->renderer, orientation, widget, for_size,
1531                                           &renderer_min_size, &renderer_nat_size);
1532
1533           if (orientation == priv->orientation)
1534             {
1535               if (min_size > 0)
1536                 {
1537                   min_size += priv->spacing;
1538                   nat_size += priv->spacing;
1539                 }
1540
1541               if (group_min_size > 0)
1542                 {
1543                   group_min_size += priv->spacing;
1544                   group_nat_size += priv->spacing;
1545                 }
1546
1547               min_size       += renderer_min_size;
1548               nat_size       += renderer_nat_size;
1549               group_min_size += renderer_min_size;
1550               group_nat_size += renderer_nat_size;
1551             }
1552           else
1553             {
1554               min_size       = MAX (min_size, renderer_min_size);
1555               nat_size       = MAX (nat_size, renderer_nat_size);
1556               group_min_size = MAX (group_min_size, renderer_min_size);
1557               group_nat_size = MAX (group_nat_size, renderer_nat_size);
1558             }
1559         }
1560
1561       if (orientation == GTK_ORIENTATION_HORIZONTAL)
1562         {
1563           if (for_size < 0)
1564             gtk_cell_area_box_context_push_group_width (context, group->id, group_min_size, group_nat_size);
1565           else
1566             gtk_cell_area_box_context_push_group_width_for_height (context, group->id, for_size,
1567                                                                    group_min_size, group_nat_size);
1568         }
1569       else
1570         {
1571           if (for_size < 0)
1572             gtk_cell_area_box_context_push_group_height (context, group->id, group_min_size, group_nat_size);
1573           else
1574             gtk_cell_area_box_context_push_group_height_for_width (context, group->id, for_size,
1575                                                                    group_min_size, group_nat_size);
1576         }
1577     }
1578
1579   *minimum_size = min_size;
1580   *natural_size = nat_size;
1581
1582   /* Update rtl state for focus navigation to work */
1583   priv->rtl = (priv->orientation == GTK_ORIENTATION_HORIZONTAL &&
1584                gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);
1585 }
1586
1587 static GtkRequestedSize *
1588 get_group_sizes (GtkCellArea    *area,
1589                  CellGroup      *group,
1590                  GtkOrientation  orientation,
1591                  GtkWidget      *widget,
1592                  gint           *n_sizes)
1593 {
1594   GtkRequestedSize *sizes;
1595   GList            *l;
1596   gint              i;
1597
1598   *n_sizes = count_visible_cells (group, NULL);
1599   sizes    = g_new (GtkRequestedSize, *n_sizes);
1600
1601   for (l = group->cells, i = 0; l; l = l->next)
1602     {
1603       CellInfo *info = l->data;
1604
1605       if (!gtk_cell_renderer_get_visible (info->renderer))
1606         continue;
1607
1608       sizes[i].data = info;
1609
1610       gtk_cell_area_request_renderer (area, info->renderer,
1611                                       orientation, widget, -1,
1612                                       &sizes[i].minimum_size,
1613                                       &sizes[i].natural_size);
1614
1615       i++;
1616     }
1617
1618   return sizes;
1619 }
1620
1621 static void
1622 compute_group_size_for_opposing_orientation (GtkCellAreaBox     *box,
1623                                              CellGroup          *group,
1624                                              GtkWidget          *widget,
1625                                              gint                for_size,
1626                                              gint               *minimum_size,
1627                                              gint               *natural_size)
1628 {
1629   GtkCellAreaBoxPrivate *priv = box->priv;
1630   GtkCellArea           *area = GTK_CELL_AREA (box);
1631
1632   /* Exception for single cell groups */
1633   if (group->n_cells == 1)
1634     {
1635       CellInfo *info = group->cells->data;
1636
1637       gtk_cell_area_request_renderer (area, info->renderer,
1638                                       OPPOSITE_ORIENTATION (priv->orientation),
1639                                       widget, for_size, minimum_size, natural_size);
1640     }
1641   else
1642     {
1643       GtkRequestedSize *orientation_sizes;
1644       CellInfo         *info;
1645       gint              n_sizes, i;
1646       gint              avail_size     = for_size;
1647       gint              extra_size, extra_extra;
1648       gint              min_size = 0, nat_size = 0;
1649
1650       orientation_sizes = get_group_sizes (area, group, priv->orientation, widget, &n_sizes);
1651
1652       /* First naturally allocate the cells in the group into the for_size */
1653       avail_size -= (n_sizes - 1) * priv->spacing;
1654       for (i = 0; i < n_sizes; i++)
1655         avail_size -= orientation_sizes[i].minimum_size;
1656
1657       if (avail_size > 0)
1658         avail_size = gtk_distribute_natural_allocation (avail_size, n_sizes, orientation_sizes);
1659       else
1660         avail_size = 0;
1661
1662       /* Calculate/distribute expand for cells */
1663       if (group->expand_cells > 0)
1664         {
1665           extra_size  = avail_size / group->expand_cells;
1666           extra_extra = avail_size % group->expand_cells;
1667         }
1668       else
1669         extra_size = extra_extra = 0;
1670
1671       for (i = 0; i < n_sizes; i++)
1672         {
1673           gint cell_min, cell_nat;
1674
1675           info = orientation_sizes[i].data;
1676
1677           if (info->expand)
1678             {
1679               orientation_sizes[i].minimum_size += extra_size;
1680               if (extra_extra)
1681                 {
1682                   orientation_sizes[i].minimum_size++;
1683                   extra_extra--;
1684                 }
1685             }
1686
1687           gtk_cell_area_request_renderer (area, info->renderer,
1688                                           OPPOSITE_ORIENTATION (priv->orientation),
1689                                           widget,
1690                                           orientation_sizes[i].minimum_size,
1691                                           &cell_min, &cell_nat);
1692
1693           min_size = MAX (min_size, cell_min);
1694           nat_size = MAX (nat_size, cell_nat);
1695         }
1696
1697       *minimum_size = min_size;
1698       *natural_size = nat_size;
1699
1700       g_free (orientation_sizes);
1701     }
1702 }
1703
1704 static void
1705 compute_size_for_opposing_orientation (GtkCellAreaBox        *box,
1706                                        GtkCellAreaBoxContext *context,
1707                                        GtkWidget             *widget,
1708                                        gint                   for_size,
1709                                        gint                  *minimum_size,
1710                                        gint                  *natural_size)
1711 {
1712   GtkCellAreaBoxPrivate *priv = box->priv;
1713   CellGroup             *group;
1714   GtkRequestedSize      *orientation_sizes;
1715   gint                   n_groups, n_expand_groups, i;
1716   gint                   avail_size = for_size;
1717   gint                   extra_size, extra_extra;
1718   gint                   min_size = 0, nat_size = 0;
1719
1720   n_expand_groups = count_expand_groups (box);
1721
1722   if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
1723     orientation_sizes = gtk_cell_area_box_context_get_widths (context, &n_groups);
1724   else
1725     orientation_sizes = gtk_cell_area_box_context_get_heights (context, &n_groups);
1726
1727   /* First start by naturally allocating space among groups of cells */
1728   avail_size -= (n_groups - 1) * priv->spacing;
1729   for (i = 0; i < n_groups; i++)
1730     avail_size -= orientation_sizes[i].minimum_size;
1731
1732   if (avail_size > 0)
1733     avail_size = gtk_distribute_natural_allocation (avail_size, n_groups, orientation_sizes);
1734   else
1735     avail_size = 0;
1736
1737   /* Calculate/distribute expand for groups */
1738   if (n_expand_groups > 0)
1739     {
1740       extra_size  = avail_size / n_expand_groups;
1741       extra_extra = avail_size % n_expand_groups;
1742     }
1743   else
1744     extra_size = extra_extra = 0;
1745
1746   /* Now we need to naturally allocate sizes for cells in each group
1747    * and push the height-for-width for each group accordingly while
1748    * accumulating the overall height-for-width for this row.
1749    */
1750   for (i = 0; i < n_groups; i++)
1751     {
1752       gint group_min, group_nat;
1753       gint group_idx = GPOINTER_TO_INT (orientation_sizes[i].data);
1754
1755       group = &g_array_index (priv->groups, CellGroup, group_idx);
1756
1757       if (group->expand_cells > 0)
1758         {
1759           orientation_sizes[i].minimum_size += extra_size;
1760           if (extra_extra)
1761             {
1762               orientation_sizes[i].minimum_size++;
1763               extra_extra--;
1764             }
1765         }
1766
1767       /* Now we have the allocation for the group,
1768        * request it's height-for-width
1769        */
1770       compute_group_size_for_opposing_orientation (box, group, widget,
1771                                                    orientation_sizes[i].minimum_size,
1772                                                    &group_min, &group_nat);
1773
1774       min_size = MAX (min_size, group_min);
1775       nat_size = MAX (nat_size, group_nat);
1776
1777       if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
1778         {
1779           gtk_cell_area_box_context_push_group_height_for_width (context, group_idx, for_size,
1780                                                                  group_min, group_nat);
1781         }
1782       else
1783         {
1784           gtk_cell_area_box_context_push_group_width_for_height (context, group_idx, for_size,
1785                                                                  group_min, group_nat);
1786         }
1787     }
1788
1789   *minimum_size = min_size;
1790   *natural_size = nat_size;
1791
1792   g_free (orientation_sizes);
1793
1794   /* Update rtl state for focus navigation to work */
1795   priv->rtl = (priv->orientation == GTK_ORIENTATION_HORIZONTAL &&
1796                gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);
1797 }
1798
1799
1800
1801 static void
1802 gtk_cell_area_box_get_preferred_width (GtkCellArea        *area,
1803                                        GtkCellAreaContext *context,
1804                                        GtkWidget          *widget,
1805                                        gint               *minimum_width,
1806                                        gint               *natural_width)
1807 {
1808   GtkCellAreaBox        *box = GTK_CELL_AREA_BOX (area);
1809   GtkCellAreaBoxContext *box_context;
1810   gint                   min_width, nat_width;
1811
1812   g_return_if_fail (GTK_IS_CELL_AREA_BOX_CONTEXT (context));
1813
1814   box_context = GTK_CELL_AREA_BOX_CONTEXT (context);
1815
1816   /* Compute the size of all renderers for current row data,
1817    * bumping cell alignments in the context along the way
1818    */
1819   compute_size (box, GTK_ORIENTATION_HORIZONTAL,
1820                 box_context, widget, -1, &min_width, &nat_width);
1821
1822   if (minimum_width)
1823     *minimum_width = min_width;
1824
1825   if (natural_width)
1826     *natural_width = nat_width;
1827 }
1828
1829 static void
1830 gtk_cell_area_box_get_preferred_height (GtkCellArea        *area,
1831                                         GtkCellAreaContext *context,
1832                                         GtkWidget          *widget,
1833                                         gint               *minimum_height,
1834                                         gint               *natural_height)
1835 {
1836   GtkCellAreaBox        *box = GTK_CELL_AREA_BOX (area);
1837   GtkCellAreaBoxContext *box_context;
1838   gint                   min_height, nat_height;
1839
1840   g_return_if_fail (GTK_IS_CELL_AREA_BOX_CONTEXT (context));
1841
1842   box_context = GTK_CELL_AREA_BOX_CONTEXT (context);
1843
1844   /* Compute the size of all renderers for current row data,
1845    * bumping cell alignments in the context along the way
1846    */
1847   compute_size (box, GTK_ORIENTATION_VERTICAL,
1848                 box_context, widget, -1, &min_height, &nat_height);
1849
1850   if (minimum_height)
1851     *minimum_height = min_height;
1852
1853   if (natural_height)
1854     *natural_height = nat_height;
1855 }
1856
1857 static void
1858 gtk_cell_area_box_get_preferred_height_for_width (GtkCellArea        *area,
1859                                                   GtkCellAreaContext *context,
1860                                                   GtkWidget          *widget,
1861                                                   gint                width,
1862                                                   gint               *minimum_height,
1863                                                   gint               *natural_height)
1864 {
1865   GtkCellAreaBox        *box = GTK_CELL_AREA_BOX (area);
1866   GtkCellAreaBoxContext *box_context;
1867   GtkCellAreaBoxPrivate *priv;
1868   gint                   min_height, nat_height;
1869
1870   g_return_if_fail (GTK_IS_CELL_AREA_BOX_CONTEXT (context));
1871
1872   box_context = GTK_CELL_AREA_BOX_CONTEXT (context);
1873   priv        = box->priv;
1874
1875   if (priv->orientation == GTK_ORIENTATION_VERTICAL)
1876     {
1877       /* Add up vertical requests of height for width and push
1878        * the overall cached sizes for alignments
1879        */
1880       compute_size (box, priv->orientation, box_context, widget, width, &min_height, &nat_height);
1881     }
1882   else
1883     {
1884       /* Juice: virtually allocate cells into the for_width using the
1885        * alignments and then return the overall height for that width,
1886        * and cache it
1887        */
1888       compute_size_for_opposing_orientation (box, box_context, widget, width, &min_height, &nat_height);
1889     }
1890
1891   if (minimum_height)
1892     *minimum_height = min_height;
1893
1894   if (natural_height)
1895     *natural_height = nat_height;
1896 }
1897
1898 static void
1899 gtk_cell_area_box_get_preferred_width_for_height (GtkCellArea        *area,
1900                                                   GtkCellAreaContext *context,
1901                                                   GtkWidget          *widget,
1902                                                   gint                height,
1903                                                   gint               *minimum_width,
1904                                                   gint               *natural_width)
1905 {
1906   GtkCellAreaBox        *box = GTK_CELL_AREA_BOX (area);
1907   GtkCellAreaBoxContext *box_context;
1908   GtkCellAreaBoxPrivate *priv;
1909   gint                   min_width, nat_width;
1910
1911   g_return_if_fail (GTK_IS_CELL_AREA_BOX_CONTEXT (context));
1912
1913   box_context = GTK_CELL_AREA_BOX_CONTEXT (context);
1914   priv        = box->priv;
1915
1916   if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
1917     {
1918       /* Add up horizontal requests of width for height and push
1919        * the overall cached sizes for alignments
1920        */
1921       compute_size (box, priv->orientation, box_context, widget, height, &min_width, &nat_width);
1922     }
1923   else
1924     {
1925       /* Juice: horizontally allocate cells into the for_height using the
1926        * alignments and then return the overall width for that height,
1927        * and cache it
1928        */
1929       compute_size_for_opposing_orientation (box, box_context, widget, height, &min_width, &nat_width);
1930     }
1931
1932   if (minimum_width)
1933     *minimum_width = min_width;
1934
1935   if (natural_width)
1936     *natural_width = nat_width;
1937 }
1938
1939 enum {
1940   FOCUS_NONE,
1941   FOCUS_PREV,
1942   FOCUS_NEXT,
1943   FOCUS_LAST_CELL
1944 };
1945
1946 static gboolean
1947 gtk_cell_area_box_focus (GtkCellArea      *area,
1948                          GtkDirectionType  direction)
1949 {
1950   GtkCellAreaBox        *box   = GTK_CELL_AREA_BOX (area);
1951   GtkCellAreaBoxPrivate *priv  = box->priv;
1952   gint                   cycle = FOCUS_NONE;
1953   gboolean               cycled_focus = FALSE;
1954   GtkCellRenderer       *focus_cell;
1955
1956   focus_cell = gtk_cell_area_get_focus_cell (area);
1957
1958   /* Special case, when there is no activatable cell, focus
1959    * is painted around the entire area... in this case we
1960    * let focus leave the area directly.
1961    */
1962   if (focus_cell && !gtk_cell_area_is_activatable (area))
1963     {
1964       gtk_cell_area_set_focus_cell (area, NULL);
1965       return FALSE;
1966     }
1967
1968   switch (direction)
1969     {
1970     case GTK_DIR_TAB_FORWARD:
1971       cycle = priv->rtl ? FOCUS_PREV : FOCUS_NEXT;
1972       break;
1973     case GTK_DIR_TAB_BACKWARD:
1974       cycle = priv->rtl ? FOCUS_NEXT : FOCUS_PREV;
1975       break;
1976     case GTK_DIR_UP:
1977       if (priv->orientation == GTK_ORIENTATION_VERTICAL || !priv->last_focus_cell)
1978         cycle = FOCUS_PREV;
1979       else if (!focus_cell)
1980         cycle = FOCUS_LAST_CELL;
1981       break;
1982     case GTK_DIR_DOWN:
1983       if (priv->orientation == GTK_ORIENTATION_VERTICAL || !priv->last_focus_cell)
1984         cycle = FOCUS_NEXT;
1985       else if (!focus_cell)
1986         cycle = FOCUS_LAST_CELL;
1987       break;
1988     case GTK_DIR_LEFT:
1989       if (priv->orientation == GTK_ORIENTATION_HORIZONTAL || !priv->last_focus_cell)
1990         cycle = priv->rtl ? FOCUS_NEXT : FOCUS_PREV;
1991       else if (!focus_cell)
1992         cycle = FOCUS_LAST_CELL;
1993       break;
1994     case GTK_DIR_RIGHT:
1995       if (priv->orientation == GTK_ORIENTATION_HORIZONTAL || !priv->last_focus_cell)
1996         cycle = priv->rtl ? FOCUS_PREV : FOCUS_NEXT;
1997       else if (!focus_cell)
1998         cycle = FOCUS_LAST_CELL;
1999       break;
2000     default:
2001       break;
2002     }
2003
2004   if (cycle == FOCUS_LAST_CELL)
2005     {
2006       gtk_cell_area_set_focus_cell (area, priv->last_focus_cell);
2007       cycled_focus = TRUE;
2008     }
2009   else if (cycle != FOCUS_NONE)
2010     {
2011       gboolean  found_cell = FALSE;
2012       GList    *list;
2013       gint      i;
2014
2015       /* If there is no focused cell, focus on the first (or last) one */
2016       if (!focus_cell)
2017         found_cell = TRUE;
2018
2019       for (i = (cycle == FOCUS_NEXT) ? 0 : priv->groups->len -1;
2020            cycled_focus == FALSE && i >= 0 && i < priv->groups->len;
2021            i = (cycle == FOCUS_NEXT) ? i + 1 : i - 1)
2022         {
2023           CellGroup *group = &g_array_index (priv->groups, CellGroup, i);
2024
2025           for (list = (cycle == FOCUS_NEXT) ? g_list_first (group->cells) : g_list_last (group->cells);
2026                cycled_focus == FALSE && list; list = (cycle == FOCUS_NEXT) ? list->next : list->prev)
2027             {
2028               CellInfo *info = list->data;
2029
2030               if (info->renderer == focus_cell)
2031                 found_cell = TRUE;
2032               else if (found_cell && /* Dont give focus to cells that are siblings to a focus cell */
2033                        gtk_cell_area_get_focus_from_sibling (area, info->renderer) == NULL)
2034                 {
2035                   gtk_cell_area_set_focus_cell (area, info->renderer);
2036                   cycled_focus = TRUE;
2037                 }
2038             }
2039         }
2040     }
2041
2042   if (!cycled_focus)
2043     gtk_cell_area_set_focus_cell (area, NULL);
2044
2045   return cycled_focus;
2046 }
2047
2048
2049 /*************************************************************
2050  *                    GtkCellLayoutIface                     *
2051  *************************************************************/
2052 static void
2053 gtk_cell_area_box_cell_layout_init (GtkCellLayoutIface *iface)
2054 {
2055   iface->pack_start = gtk_cell_area_box_layout_pack_start;
2056   iface->pack_end   = gtk_cell_area_box_layout_pack_end;
2057   iface->reorder    = gtk_cell_area_box_layout_reorder;
2058 }
2059
2060 static void
2061 gtk_cell_area_box_layout_pack_start (GtkCellLayout      *cell_layout,
2062                                      GtkCellRenderer    *renderer,
2063                                      gboolean            expand)
2064 {
2065   gtk_cell_area_box_pack_start (GTK_CELL_AREA_BOX (cell_layout), renderer, expand, FALSE, TRUE);
2066 }
2067
2068 static void
2069 gtk_cell_area_box_layout_pack_end (GtkCellLayout      *cell_layout,
2070                                    GtkCellRenderer    *renderer,
2071                                    gboolean            expand)
2072 {
2073   gtk_cell_area_box_pack_end (GTK_CELL_AREA_BOX (cell_layout), renderer, expand, FALSE, TRUE);
2074 }
2075
2076 static void
2077 gtk_cell_area_box_layout_reorder (GtkCellLayout      *cell_layout,
2078                                   GtkCellRenderer    *renderer,
2079                                   gint                position)
2080 {
2081   GtkCellAreaBox        *box  = GTK_CELL_AREA_BOX (cell_layout);
2082   GtkCellAreaBoxPrivate *priv = box->priv;
2083   GList                 *node;
2084   CellInfo              *info;
2085
2086   node = g_list_find_custom (priv->cells, renderer,
2087                              (GCompareFunc)cell_info_find);
2088
2089   if (node)
2090     {
2091       info = node->data;
2092
2093       priv->cells = g_list_delete_link (priv->cells, node);
2094       priv->cells = g_list_insert (priv->cells, info, position);
2095
2096       cell_groups_rebuild (box);
2097     }
2098 }
2099
2100 /*************************************************************
2101  *       Private interaction with GtkCellAreaBoxContext      *
2102  *************************************************************/
2103 gboolean
2104 _gtk_cell_area_box_group_visible (GtkCellAreaBox  *box,
2105                                   gint             group_idx)
2106 {
2107   GtkCellAreaBoxPrivate *priv  = box->priv;
2108   CellGroup *group;
2109   
2110   g_assert (group_idx >= 0 && group_idx < priv->groups->len);
2111
2112   group = &g_array_index (priv->groups, CellGroup, group_idx);
2113
2114   return group->visible;
2115 }
2116
2117
2118 /*************************************************************
2119  *                            API                            *
2120  *************************************************************/
2121 /**
2122  * gtk_cell_area_box_new:
2123  *
2124  * Creates a new #GtkCellAreaBox.
2125  *
2126  * Return value: a newly created #GtkCellAreaBox
2127  *
2128  * Since: 3.0
2129  */
2130 GtkCellArea *
2131 gtk_cell_area_box_new (void)
2132 {
2133   return (GtkCellArea *)g_object_new (GTK_TYPE_CELL_AREA_BOX, NULL);
2134 }
2135
2136 /**
2137  * gtk_cell_area_box_pack_start:
2138  * @box: a #GtkCellAreaBox
2139  * @renderer: the #GtkCellRenderer to add
2140  * @expand: whether @renderer should receive extra space when the area receives
2141  * more than its natural size
2142  * @align: whether @renderer should be aligned in adjacent rows
2143  * @fixed: whether @renderer should have the same size in all rows
2144  *
2145  * Adds @renderer to @box, packed with reference to the start of @box.
2146  *
2147  * The @renderer is packed after any other #GtkCellRenderer packed
2148  * with reference to the start of @box.
2149  *
2150  * Since: 3.0
2151  */
2152 void
2153 gtk_cell_area_box_pack_start  (GtkCellAreaBox  *box,
2154                                GtkCellRenderer *renderer,
2155                                gboolean         expand,
2156                                gboolean         align,
2157                                gboolean         fixed)
2158 {
2159   GtkCellAreaBoxPrivate *priv;
2160   CellInfo              *info;
2161
2162   g_return_if_fail (GTK_IS_CELL_AREA_BOX (box));
2163   g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
2164
2165   priv = box->priv;
2166
2167   if (g_list_find_custom (priv->cells, renderer,
2168                           (GCompareFunc)cell_info_find))
2169     {
2170       g_warning ("Refusing to add the same cell renderer to a GtkCellAreaBox twice");
2171       return;
2172     }
2173
2174   info = cell_info_new (renderer, GTK_PACK_START, expand, align, fixed);
2175
2176   priv->cells = g_list_append (priv->cells, info);
2177
2178   cell_groups_rebuild (box);
2179 }
2180
2181 /**
2182  * gtk_cell_area_box_pack_end:
2183  * @box: a #GtkCellAreaBox
2184  * @renderer: the #GtkCellRenderer to add
2185  * @expand: whether @renderer should receive extra space when the area receives
2186  * more than its natural size
2187  * @align: whether @renderer should be aligned in adjacent rows
2188  * @fixed: whether @renderer should have the same size in all rows
2189  *
2190  * Adds @renderer to @box, packed with reference to the end of @box.
2191  *
2192  * The @renderer is packed after (away from end of) any other
2193  * #GtkCellRenderer packed with reference to the end of @box.
2194  *
2195  * Since: 3.0
2196  */
2197 void
2198 gtk_cell_area_box_pack_end (GtkCellAreaBox  *box,
2199                             GtkCellRenderer *renderer,
2200                             gboolean         expand,
2201                             gboolean         align,
2202                             gboolean         fixed)
2203 {
2204   GtkCellAreaBoxPrivate *priv;
2205   CellInfo              *info;
2206
2207   g_return_if_fail (GTK_IS_CELL_AREA_BOX (box));
2208   g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
2209
2210   priv = box->priv;
2211
2212   if (g_list_find_custom (priv->cells, renderer,
2213                           (GCompareFunc)cell_info_find))
2214     {
2215       g_warning ("Refusing to add the same cell renderer to a GtkCellArea twice");
2216       return;
2217     }
2218
2219   info = cell_info_new (renderer, GTK_PACK_END, expand, align, fixed);
2220
2221   priv->cells = g_list_append (priv->cells, info);
2222
2223   cell_groups_rebuild (box);
2224 }
2225
2226 /**
2227  * gtk_cell_area_box_get_spacing:
2228  * @box: a #GtkCellAreaBox
2229  *
2230  * Gets the spacing added between cell renderers.
2231  *
2232  * Return value: the space added between cell renderers in @box.
2233  *
2234  * Since: 3.0
2235  */
2236 gint
2237 gtk_cell_area_box_get_spacing (GtkCellAreaBox  *box)
2238 {
2239   g_return_val_if_fail (GTK_IS_CELL_AREA_BOX (box), 0);
2240
2241   return box->priv->spacing;
2242 }
2243
2244 /**
2245  * gtk_cell_area_box_set_spacing:
2246  * @box: a #GtkCellAreaBox
2247  * @spacing: the space to add between #GtkCellRenderers
2248  *
2249  * Sets the spacing to add between cell renderers in @box.
2250  *
2251  * Since: 3.0
2252  */
2253 void
2254 gtk_cell_area_box_set_spacing (GtkCellAreaBox  *box,
2255                                gint             spacing)
2256 {
2257   GtkCellAreaBoxPrivate *priv;
2258
2259   g_return_if_fail (GTK_IS_CELL_AREA_BOX (box));
2260
2261   priv = box->priv;
2262
2263   if (priv->spacing != spacing)
2264     {
2265       priv->spacing = spacing;
2266
2267       g_object_notify (G_OBJECT (box), "spacing");
2268
2269       /* Notify that size needs to be requested again */
2270       reset_contexts (box);
2271     }
2272 }