X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcellareabox.c;h=aa05220ae1d1973b89ff07fb730f6cf994babb59;hb=dc331ccb171151d737112d8dc55b25709271d2c7;hp=a2f73bd4fecb0b4a258274c8160997d897bfbdaf;hpb=631bdc438c67debf5d7fab51cd655ac296ab32d3;p=~andy%2Fgtk diff --git a/gtk/gtkcellareabox.c b/gtk/gtkcellareabox.c index a2f73bd4f..aa05220ae 100644 --- a/gtk/gtkcellareabox.c +++ b/gtk/gtkcellareabox.c @@ -16,9 +16,33 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . + */ + + +/** + * SECTION:gtkcellareabox + * @Short_Description: A cell area that renders GtkCellRenderers + * into a row or a column + * @Title: GtkCellAreaBox + * + * The #GtkCellAreaBox renders cell renderers into a row or a column + * depending on its #GtkOrientation. + * + * GtkCellAreaBox uses a notion of packing. Packing + * refers to adding cell renderers with reference to a particular position + * in a #GtkCellAreaBox. There are two reference positions: the + * start and the end of the box. + * When the #GtkCellAreaBox is oriented in the %GTK_ORIENTATION_VERTICAL + * orientation, the start is defined as the top of the box and the end is + * defined as the bottom. In the %GTK_ORIENTATION_HORIZONTAL orientation + * start is defined as the left side and the end is defined as the right + * side. + * + * Alignments of #GtkCellRenderers rendered in adjacent rows can be + * configured by configuring the #GtkCellAreaBox:align child cell property + * with gtk_cell_area_cell_set_property() or by specifying the "align" + * argument to gtk_cell_area_box_pack_start() and gtk_cell_area_box_pack_end(). */ #include "config.h" @@ -26,7 +50,8 @@ #include "gtkorientable.h" #include "gtkcelllayout.h" #include "gtkcellareabox.h" -#include "gtkcellareaboxiter.h" +#include "gtkcellareaboxcontextprivate.h" +#include "gtktypebuiltins.h" #include "gtkprivate.h" @@ -34,88 +59,87 @@ static void gtk_cell_area_box_finalize (GObject *object); static void gtk_cell_area_box_dispose (GObject *object); static void gtk_cell_area_box_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); + guint prop_id, + const GValue *value, + GParamSpec *pspec); static void gtk_cell_area_box_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); + guint prop_id, + GValue *value, + GParamSpec *pspec); /* GtkCellAreaClass */ static void gtk_cell_area_box_add (GtkCellArea *area, - GtkCellRenderer *renderer); + GtkCellRenderer *renderer); static void gtk_cell_area_box_remove (GtkCellArea *area, - GtkCellRenderer *renderer); -static void gtk_cell_area_box_forall (GtkCellArea *area, - GtkCellCallback callback, - gpointer callback_data); -static void gtk_cell_area_box_get_cell_allocation (GtkCellArea *area, - GtkCellAreaIter *iter, - GtkWidget *widget, - GtkCellRenderer *renderer, - const GdkRectangle *cell_area, - GdkRectangle *allocation); -static gint gtk_cell_area_box_event (GtkCellArea *area, - GtkCellAreaIter *iter, - GtkWidget *widget, - GdkEvent *event, - const GdkRectangle *cell_area, - GtkCellRendererState flags); -static void gtk_cell_area_box_render (GtkCellArea *area, - GtkCellAreaIter *iter, - GtkWidget *widget, - cairo_t *cr, - const GdkRectangle *cell_area, - GtkCellRendererState flags); + GtkCellRenderer *renderer); +static void gtk_cell_area_box_foreach (GtkCellArea *area, + GtkCellCallback callback, + gpointer callback_data); +static void gtk_cell_area_box_foreach_alloc (GtkCellArea *area, + GtkCellAreaContext *context, + GtkWidget *widget, + const GdkRectangle *cell_area, + const GdkRectangle *background_area, + GtkCellAllocCallback callback, + gpointer callback_data); +static void gtk_cell_area_box_apply_attributes (GtkCellArea *area, + GtkTreeModel *tree_model, + GtkTreeIter *iter, + gboolean is_expander, + gboolean is_expanded); static void gtk_cell_area_box_set_cell_property (GtkCellArea *area, - GtkCellRenderer *renderer, - guint prop_id, - const GValue *value, - GParamSpec *pspec); + GtkCellRenderer *renderer, + guint prop_id, + const GValue *value, + GParamSpec *pspec); static void gtk_cell_area_box_get_cell_property (GtkCellArea *area, - GtkCellRenderer *renderer, - guint prop_id, - GValue *value, - GParamSpec *pspec); -static GtkCellAreaIter *gtk_cell_area_box_create_iter (GtkCellArea *area); + GtkCellRenderer *renderer, + guint prop_id, + GValue *value, + GParamSpec *pspec); +static GtkCellAreaContext *gtk_cell_area_box_create_context (GtkCellArea *area); +static GtkCellAreaContext *gtk_cell_area_box_copy_context (GtkCellArea *area, + GtkCellAreaContext *context); static GtkSizeRequestMode gtk_cell_area_box_get_request_mode (GtkCellArea *area); static void gtk_cell_area_box_get_preferred_width (GtkCellArea *area, - GtkCellAreaIter *iter, - GtkWidget *widget, - gint *minimum_width, - gint *natural_width); + GtkCellAreaContext *context, + GtkWidget *widget, + gint *minimum_width, + gint *natural_width); static void gtk_cell_area_box_get_preferred_height (GtkCellArea *area, - GtkCellAreaIter *iter, - GtkWidget *widget, - gint *minimum_height, - gint *natural_height); + GtkCellAreaContext *context, + GtkWidget *widget, + gint *minimum_height, + gint *natural_height); static void gtk_cell_area_box_get_preferred_height_for_width (GtkCellArea *area, - GtkCellAreaIter *iter, - GtkWidget *widget, - gint width, - gint *minimum_height, - gint *natural_height); + GtkCellAreaContext *context, + GtkWidget *widget, + gint width, + gint *minimum_height, + gint *natural_height); static void gtk_cell_area_box_get_preferred_width_for_height (GtkCellArea *area, - GtkCellAreaIter *iter, - GtkWidget *widget, - gint height, - gint *minimum_width, - gint *natural_width); -static void gtk_cell_area_box_grab_focus (GtkCellArea *area, - GtkDirectionType direction); + GtkCellAreaContext *context, + GtkWidget *widget, + gint height, + gint *minimum_width, + gint *natural_width); +static gboolean gtk_cell_area_box_focus (GtkCellArea *area, + GtkDirectionType direction); /* GtkCellLayoutIface */ static void gtk_cell_area_box_cell_layout_init (GtkCellLayoutIface *iface); static void gtk_cell_area_box_layout_pack_start (GtkCellLayout *cell_layout, - GtkCellRenderer *renderer, - gboolean expand); + GtkCellRenderer *renderer, + gboolean expand); static void gtk_cell_area_box_layout_pack_end (GtkCellLayout *cell_layout, - GtkCellRenderer *renderer, - gboolean expand); + GtkCellRenderer *renderer, + gboolean expand); static void gtk_cell_area_box_layout_reorder (GtkCellLayout *cell_layout, - GtkCellRenderer *renderer, - gint position); + GtkCellRenderer *renderer, + gint position); +static void gtk_cell_area_box_focus_changed (GtkCellArea *area, + GParamSpec *pspec, + GtkCellAreaBox *box); /* CellInfo/CellGroup metadata handling and convenience functions */ @@ -123,8 +147,9 @@ typedef struct { GtkCellRenderer *renderer; guint expand : 1; /* Whether the cell expands */ - guint pack : 1; /* Whether the cell is packed from the start or end */ - guint align : 1; /* Whether to align this cell's position with adjacent rows */ + guint pack : 1; /* Whether it is packed from the start or end */ + guint align : 1; /* Whether to align its position with adjacent rows */ + guint fixed : 1; /* Whether to require the same size for all rows */ } CellInfo; typedef struct { @@ -133,6 +158,8 @@ typedef struct { guint id : 8; guint n_cells : 8; guint expand_cells : 8; + guint align : 1; + guint visible : 1; } CellGroup; typedef struct { @@ -142,41 +169,55 @@ typedef struct { gint size; } AllocatedCell; -static CellInfo *cell_info_new (GtkCellRenderer *renderer, - GtkPackType pack, - gboolean expand, - gboolean align); -static void cell_info_free (CellInfo *info); -static gint cell_info_find (CellInfo *info, - GtkCellRenderer *renderer); - -static AllocatedCell *allocated_cell_new (GtkCellRenderer *renderer, - gint position, - gint size); -static void allocated_cell_free (AllocatedCell *cell); -static GList *list_consecutive_cells (GtkCellAreaBox *box); -static gint count_expand_groups (GtkCellAreaBox *box); -static void iter_weak_notify (GtkCellAreaBox *box, - GtkCellAreaBoxIter *dead_iter); -static void flush_iters (GtkCellAreaBox *box); -static void init_iter_groups (GtkCellAreaBox *box); -static void init_iter_group (GtkCellAreaBox *box, - GtkCellAreaBoxIter *iter); -static GSList *get_allocated_cells (GtkCellAreaBox *box, - GtkCellAreaBoxIter *iter, - GtkWidget *widget); +static CellInfo *cell_info_new (GtkCellRenderer *renderer, + GtkPackType pack, + gboolean expand, + gboolean align, + gboolean fixed); +static void cell_info_free (CellInfo *info); +static gint cell_info_find (CellInfo *info, + GtkCellRenderer *renderer); + +static AllocatedCell *allocated_cell_new (GtkCellRenderer *renderer, + gint position, + gint size); +static void allocated_cell_free (AllocatedCell *cell); +static GList *list_consecutive_cells (GtkCellAreaBox *box); +static gint count_expand_groups (GtkCellAreaBox *box); +static void context_weak_notify (GtkCellAreaBox *box, + GtkCellAreaBoxContext *dead_context); +static void reset_contexts (GtkCellAreaBox *box); +static void init_context_groups (GtkCellAreaBox *box); +static void init_context_group (GtkCellAreaBox *box, + GtkCellAreaBoxContext *context); +static GSList *get_allocated_cells (GtkCellAreaBox *box, + GtkCellAreaBoxContext *context, + GtkWidget *widget, + gint width, + gint height); struct _GtkCellAreaBoxPrivate { - GtkOrientation orientation; + /* We hold on to the previously focused cell when navigating + * up and down in a horizontal box (or left and right on a vertical one) + * this way we always re-enter the last focused cell. + */ + GtkCellRenderer *last_focus_cell; + gulong focus_cell_id; + + GList *cells; + GArray *groups; - GList *cells; - GArray *groups; + GSList *contexts; - GSList *iters; + GtkOrientation orientation; + gint spacing; - gint spacing; + /* We hold on to the rtl state from a widget we are requested for + * so that we can navigate focus correctly + */ + gboolean rtl; }; enum { @@ -189,16 +230,17 @@ enum { CELL_PROP_0, CELL_PROP_EXPAND, CELL_PROP_ALIGN, + CELL_PROP_FIXED_SIZE, CELL_PROP_PACK_TYPE }; G_DEFINE_TYPE_WITH_CODE (GtkCellAreaBox, gtk_cell_area_box, GTK_TYPE_CELL_AREA, - G_IMPLEMENT_INTERFACE (GTK_TYPE_CELL_LAYOUT, - gtk_cell_area_box_cell_layout_init) - G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, NULL)); + G_IMPLEMENT_INTERFACE (GTK_TYPE_CELL_LAYOUT, + gtk_cell_area_box_cell_layout_init) + G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, NULL)); -#define OPPOSITE_ORIENTATION(orientation) \ - ((orientation) == GTK_ORIENTATION_HORIZONTAL ? \ +#define OPPOSITE_ORIENTATION(orientation) \ + ((orientation) == GTK_ORIENTATION_HORIZONTAL ? \ GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL) static void @@ -214,11 +256,19 @@ gtk_cell_area_box_init (GtkCellAreaBox *box) priv->orientation = GTK_ORIENTATION_HORIZONTAL; priv->groups = g_array_new (FALSE, TRUE, sizeof (CellGroup)); priv->cells = NULL; - priv->iters = NULL; + priv->contexts = NULL; priv->spacing = 0; + priv->rtl = FALSE; + + /* Watch whenever focus is given to a cell, even if it's not with keynav, + * this way we remember upon entry of the area where focus was last time + * around + */ + priv->focus_cell_id = g_signal_connect (box, "notify::focus-cell", + G_CALLBACK (gtk_cell_area_box_focus_changed), box); } -static void +static void gtk_cell_area_box_class_init (GtkCellAreaBoxClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); @@ -233,63 +283,110 @@ gtk_cell_area_box_class_init (GtkCellAreaBoxClass *class) /* GtkCellAreaClass */ area_class->add = gtk_cell_area_box_add; area_class->remove = gtk_cell_area_box_remove; - area_class->forall = gtk_cell_area_box_forall; - area_class->get_cell_allocation = gtk_cell_area_box_get_cell_allocation; - area_class->event = gtk_cell_area_box_event; - area_class->render = gtk_cell_area_box_render; + area_class->foreach = gtk_cell_area_box_foreach; + area_class->foreach_alloc = gtk_cell_area_box_foreach_alloc; + area_class->apply_attributes = gtk_cell_area_box_apply_attributes; area_class->set_cell_property = gtk_cell_area_box_set_cell_property; area_class->get_cell_property = gtk_cell_area_box_get_cell_property; - - area_class->create_iter = gtk_cell_area_box_create_iter; + + area_class->create_context = gtk_cell_area_box_create_context; + area_class->copy_context = gtk_cell_area_box_copy_context; area_class->get_request_mode = gtk_cell_area_box_get_request_mode; area_class->get_preferred_width = gtk_cell_area_box_get_preferred_width; area_class->get_preferred_height = gtk_cell_area_box_get_preferred_height; area_class->get_preferred_height_for_width = gtk_cell_area_box_get_preferred_height_for_width; area_class->get_preferred_width_for_height = gtk_cell_area_box_get_preferred_width_for_height; - area_class->grab_focus = gtk_cell_area_box_grab_focus; + area_class->focus = gtk_cell_area_box_focus; /* Properties */ g_object_class_override_property (object_class, PROP_ORIENTATION, "orientation"); + /** + * GtkCellAreaBox:spacing: + * + * The amount of space to reserve between cells. + * + * Since: 3.0 + */ g_object_class_install_property (object_class, PROP_SPACING, g_param_spec_int ("spacing", - P_("Spacing"), - P_("Space which is inserted between cells"), - 0, - G_MAXINT, - 0, - GTK_PARAM_READWRITE)); + P_("Spacing"), + P_("Space which is inserted between cells"), + 0, + G_MAXINT, + 0, + GTK_PARAM_READWRITE)); /* Cell Properties */ + /** + * GtkCellAreaBox:expand: + * + * Whether the cell renderer should receive extra space + * when the area receives more than its natural size. + * + * Since: 3.0 + */ gtk_cell_area_class_install_cell_property (area_class, - CELL_PROP_EXPAND, - g_param_spec_boolean - ("expand", - P_("Expand"), - P_("Whether the cell expands"), - FALSE, - GTK_PARAM_READWRITE)); - + CELL_PROP_EXPAND, + g_param_spec_boolean + ("expand", + P_("Expand"), + P_("Whether the cell expands"), + FALSE, + GTK_PARAM_READWRITE)); + + /** + * GtkCellAreaBox:align: + * + * Whether the cell renderer should be aligned in adjacent rows. + * + * Since: 3.0 + */ gtk_cell_area_class_install_cell_property (area_class, - CELL_PROP_ALIGN, - g_param_spec_boolean - ("align", - P_("Align"), - P_("Whether cell should align with adjacent rows"), - TRUE, - GTK_PARAM_READWRITE)); - + CELL_PROP_ALIGN, + g_param_spec_boolean + ("align", + P_("Align"), + P_("Whether cell should align with adjacent rows"), + FALSE, + GTK_PARAM_READWRITE)); + + /** + * GtkCellAreaBox:fixed-size: + * + * Whether the cell renderer should require the same size + * for all rows for which it was requested. + * + * Since: 3.0 + */ gtk_cell_area_class_install_cell_property (area_class, - CELL_PROP_PACK_TYPE, - g_param_spec_enum - ("pack-type", - P_("Pack Type"), - P_("A GtkPackType indicating whether the cell is packed with " - "reference to the start or end of the cell area"), - GTK_TYPE_PACK_TYPE, GTK_PACK_START, - GTK_PARAM_READWRITE)); + CELL_PROP_FIXED_SIZE, + g_param_spec_boolean + ("fixed-size", + P_("Fixed Size"), + P_("Whether cells should be the same size in all rows"), + TRUE, + GTK_PARAM_READWRITE)); + + /** + * GtkCellAreaBox:pack-type: + * + * A GtkPackType indicating whether the cell renderer is packed + * with reference to the start or end of the area. + * + * Since: 3.0 + */ + gtk_cell_area_class_install_cell_property (area_class, + CELL_PROP_PACK_TYPE, + g_param_spec_enum + ("pack-type", + P_("Pack Type"), + P_("A GtkPackType indicating whether the cell is packed with " + "reference to the start or end of the cell area"), + GTK_TYPE_PACK_TYPE, GTK_PACK_START, + GTK_PARAM_READWRITE)); g_type_class_add_private (object_class, sizeof (GtkCellAreaBoxPrivate)); } @@ -299,17 +396,19 @@ gtk_cell_area_box_class_init (GtkCellAreaBoxClass *class) * CellInfo/CellGroup basics and convenience functions * *************************************************************/ static CellInfo * -cell_info_new (GtkCellRenderer *renderer, - GtkPackType pack, - gboolean expand, - gboolean align) +cell_info_new (GtkCellRenderer *renderer, + GtkPackType pack, + gboolean expand, + gboolean align, + gboolean fixed) { CellInfo *info = g_slice_new (CellInfo); - + info->renderer = g_object_ref_sink (renderer); info->pack = pack; info->expand = expand; info->align = align; + info->fixed = fixed; return info; } @@ -324,15 +423,15 @@ cell_info_free (CellInfo *info) static gint cell_info_find (CellInfo *info, - GtkCellRenderer *renderer) + GtkCellRenderer *renderer) { return (info->renderer == renderer) ? 0 : -1; } static AllocatedCell * allocated_cell_new (GtkCellRenderer *renderer, - gint position, - gint size) + gint position, + gint size) { AllocatedCell *cell = g_slice_new (AllocatedCell); @@ -356,23 +455,23 @@ list_consecutive_cells (GtkCellAreaBox *box) GList *l, *consecutive_cells = NULL, *pack_end_cells = NULL; CellInfo *info; - /* List cells in consecutive order taking their - * PACK_START/PACK_END options into account + /* List cells in consecutive order taking their + * PACK_START/PACK_END options into account */ for (l = priv->cells; l; l = l->next) { info = l->data; - + if (info->pack == GTK_PACK_START) - consecutive_cells = g_list_prepend (consecutive_cells, info); + consecutive_cells = g_list_prepend (consecutive_cells, info); } for (l = priv->cells; l; l = l->next) { info = l->data; - + if (info->pack == GTK_PACK_END) - pack_end_cells = g_list_prepend (pack_end_cells, info); + pack_end_cells = g_list_prepend (pack_end_cells, info); } consecutive_cells = g_list_reverse (consecutive_cells); @@ -382,9 +481,9 @@ list_consecutive_cells (GtkCellAreaBox *box) } static void -cell_groups_clear (GtkCellAreaBox *box) +cell_groups_clear (GtkCellAreaBox *box) { - GtkCellAreaBoxPrivate *priv = box->priv; + GtkCellAreaBoxPrivate *priv = box->priv; gint i; for (i = 0; i < priv->groups->len; i++) @@ -400,10 +499,12 @@ cell_groups_clear (GtkCellAreaBox *box) static void cell_groups_rebuild (GtkCellAreaBox *box) { - GtkCellAreaBoxPrivate *priv = box->priv; + GtkCellAreaBoxPrivate *priv = box->priv; CellGroup group = { 0, }; + CellGroup *group_ptr; GList *cells, *l; guint id = 0; + gboolean last_cell_fixed = FALSE; cell_groups_clear (box); @@ -414,44 +515,55 @@ cell_groups_rebuild (GtkCellAreaBox *box) /* First group is implied */ g_array_append_val (priv->groups, group); + group_ptr = &g_array_index (priv->groups, CellGroup, id); for (l = cells; l; l = l->next) { CellInfo *info = l->data; - /* A new group starts with any aligned cell, the first group is implied */ - if (info->align && l != cells) - { - memset (&group, 0x0, sizeof (CellGroup)); - group.id = ++id; + /* A new group starts with any aligned cell, or + * at the beginning and end of a fixed size cell. + * the first group is implied */ + if ((info->align || info->fixed || last_cell_fixed) && l != cells) + { + memset (&group, 0x0, sizeof (CellGroup)); + group.id = ++id; - g_array_append_val (priv->groups, group); - } + g_array_append_val (priv->groups, group); + group_ptr = &g_array_index (priv->groups, CellGroup, id); + } + + group_ptr->cells = g_list_prepend (group_ptr->cells, info); + group_ptr->n_cells++; - group.cells = g_list_prepend (group.cells, info); - group.n_cells++; + /* Not every group is aligned, some are floating + * fixed size cells */ + if (info->align) + group_ptr->align = TRUE; /* A group expands if it contains any expand cells */ if (info->expand) - group.expand_cells++; + group_ptr->expand_cells++; + + last_cell_fixed = info->fixed; } g_list_free (cells); for (id = 0; id < priv->groups->len; id++) { - CellGroup *group_ptr = &g_array_index (priv->groups, CellGroup, id); + group_ptr = &g_array_index (priv->groups, CellGroup, id); group_ptr->cells = g_list_reverse (group_ptr->cells); } - /* Iters need to be updated with the new grouping information */ - init_iter_groups (box); + /* Contexts need to be updated with the new grouping information */ + init_context_groups (box); } static gint -count_visible_cells (CellGroup *group, - gint *expand_cells) +count_visible_cells (CellGroup *group, + gint *expand_cells) { GList *l; gint visible_cells = 0; @@ -462,12 +574,12 @@ count_visible_cells (CellGroup *group, CellInfo *info = l->data; if (gtk_cell_renderer_get_visible (info->renderer)) - { - visible_cells++; + { + visible_cells++; - if (info->expand) - n_expand_cells++; - } + if (info->expand) + n_expand_cells++; + } } if (expand_cells) @@ -488,74 +600,211 @@ count_expand_groups (GtkCellAreaBox *box) CellGroup *group = &g_array_index (priv->groups, CellGroup, i); if (group->expand_cells > 0) - expand_groups++; + expand_groups++; } return expand_groups; } -static void -iter_weak_notify (GtkCellAreaBox *box, - GtkCellAreaBoxIter *dead_iter) +static void +context_weak_notify (GtkCellAreaBox *box, + GtkCellAreaBoxContext *dead_context) { GtkCellAreaBoxPrivate *priv = box->priv; - priv->iters = g_slist_remove (priv->iters, dead_iter); + priv->contexts = g_slist_remove (priv->contexts, dead_context); } static void -init_iter_group (GtkCellAreaBox *box, - GtkCellAreaBoxIter *iter) +init_context_group (GtkCellAreaBox *box, + GtkCellAreaBoxContext *context) { GtkCellAreaBoxPrivate *priv = box->priv; - gint *expand_groups, i; + gint *expand_groups, *align_groups, i; expand_groups = g_new (gboolean, priv->groups->len); + align_groups = g_new (gboolean, priv->groups->len); for (i = 0; i < priv->groups->len; i++) { CellGroup *group = &g_array_index (priv->groups, CellGroup, i); expand_groups[i] = (group->expand_cells > 0); + align_groups[i] = group->align; } - /* This call implies flushing the request info */ - gtk_cell_area_box_init_groups (iter, priv->groups->len, expand_groups); + /* This call implies resetting the request info */ + _gtk_cell_area_box_init_groups (context, priv->groups->len, expand_groups, align_groups); g_free (expand_groups); + g_free (align_groups); } static void -init_iter_groups (GtkCellAreaBox *box) +init_context_groups (GtkCellAreaBox *box) { GtkCellAreaBoxPrivate *priv = box->priv; GSList *l; - /* When the box's groups are reconstructed, iters need to - * be reinitialized. + /* When the box's groups are reconstructed, + * contexts need to be reinitialized. */ - for (l = priv->iters; l; l = l->next) + for (l = priv->contexts; l; l = l->next) { - GtkCellAreaBoxIter *iter = l->data; + GtkCellAreaBoxContext *context = l->data; - init_iter_group (box, iter); + init_context_group (box, context); } } static void -flush_iters (GtkCellAreaBox *box) +reset_contexts (GtkCellAreaBox *box) { GtkCellAreaBoxPrivate *priv = box->priv; GSList *l; - /* When the box layout changes, iters need to - * be flushed and sizes for the box get requested again + /* When the box layout changes, contexts need to + * be reset and sizes for the box get requested again + */ + for (l = priv->contexts; l; l = l->next) + { + GtkCellAreaContext *context = l->data; + + gtk_cell_area_context_reset (context); + } +} + +/* Fall back on a completely unaligned dynamic allocation of cells + * when not allocated for the said orientation, alignment of cells + * is not done when each area gets a different size in the orientation + * of the box. + */ +static GSList * +allocate_cells_manually (GtkCellAreaBox *box, + GtkWidget *widget, + gint width, + gint height) +{ + GtkCellAreaBoxPrivate *priv = box->priv; + GList *cells, *l; + GSList *allocated_cells = NULL; + GtkRequestedSize *sizes; + gint i; + gint nvisible = 0, nexpand = 0, group_expand; + gint avail_size, extra_size, extra_extra, full_size; + gint position = 0, for_size; + gboolean rtl; + + if (!priv->cells) + return NULL; + + /* For vertical oriented boxes, we just let the cell renderers + * realign themselves for rtl */ - for (l = priv->iters; l; l = l->next) + rtl = (priv->orientation == GTK_ORIENTATION_HORIZONTAL && + gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL); + + cells = list_consecutive_cells (box); + + /* Count the visible and expand cells */ + for (i = 0; i < priv->groups->len; i++) + { + CellGroup *group = &g_array_index (priv->groups, CellGroup, i); + + nvisible += count_visible_cells (group, &group_expand); + nexpand += group_expand; + } + + if (nvisible <= 0) + { + g_list_free (cells); + return NULL; + } + + if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) + { + full_size = avail_size = width; + for_size = height; + } + else + { + full_size = avail_size = height; + for_size = width; + } + + /* Go ahead and collect the requests on the fly */ + sizes = g_new0 (GtkRequestedSize, nvisible); + for (l = cells, i = 0; l; l = l->next) + { + CellInfo *info = l->data; + + if (!gtk_cell_renderer_get_visible (info->renderer)) + continue; + + gtk_cell_area_request_renderer (GTK_CELL_AREA (box), info->renderer, + priv->orientation, + widget, for_size, + &sizes[i].minimum_size, + &sizes[i].natural_size); + + avail_size -= sizes[i].minimum_size; + + sizes[i].data = info; + + i++; + } + + /* Naturally distribute the allocation */ + avail_size -= (nvisible - 1) * priv->spacing; + if (avail_size > 0) + avail_size = gtk_distribute_natural_allocation (avail_size, nvisible, sizes); + else + avail_size = 0; + + /* Calculate/distribute expand for cells */ + if (nexpand > 0) + { + extra_size = avail_size / nexpand; + extra_extra = avail_size % nexpand; + } + else + extra_size = extra_extra = 0; + + /* Create the allocated cells */ + for (i = 0; i < nvisible; i++) { - GtkCellAreaIter *iter = l->data; + CellInfo *info = sizes[i].data; + AllocatedCell *cell; + + if (info->expand) + { + sizes[i].minimum_size += extra_size; + if (extra_extra) + { + sizes[i].minimum_size++; + extra_extra--; + } + } + + if (rtl) + cell = allocated_cell_new (info->renderer, + full_size - (position + sizes[i].minimum_size), + sizes[i].minimum_size); + else + cell = allocated_cell_new (info->renderer, position, sizes[i].minimum_size); + + allocated_cells = g_slist_prepend (allocated_cells, cell); - gtk_cell_area_iter_flush (iter); + position += sizes[i].minimum_size; + position += priv->spacing; } + + g_free (sizes); + g_list_free (cells); + + /* Note it might not be important to reverse the list here at all, + * we have the correct positions, no need to allocate from left to right + */ + return g_slist_reverse (allocated_cells); } /* Returns an allocation for each cell in the orientation of the box, @@ -563,130 +812,210 @@ flush_iters (GtkCellAreaBox *box) * list of allocated cells to operate on. */ static GSList * -get_allocated_cells (GtkCellAreaBox *box, - GtkCellAreaBoxIter *iter, - GtkWidget *widget) +get_allocated_cells (GtkCellAreaBox *box, + GtkCellAreaBoxContext *context, + GtkWidget *widget, + gint width, + gint height) { - const GtkCellAreaBoxAllocation *group_allocs; - GtkCellArea *area = GTK_CELL_AREA (box); - GtkCellAreaBoxPrivate *priv = box->priv; - GList *cell_list; - GSList *allocated_cells = NULL; - gint i, j, n_allocs; - - group_allocs = gtk_cell_area_box_iter_get_orientation_allocs (iter, &n_allocs); + GtkCellAreaBoxAllocation *group_allocs; + GtkCellArea *area = GTK_CELL_AREA (box); + GtkCellAreaBoxPrivate *priv = box->priv; + GList *cell_list; + GSList *allocated_cells = NULL; + gint i, j, n_allocs, position; + gint for_size, full_size; + gboolean rtl; + + group_allocs = _gtk_cell_area_box_context_get_orientation_allocs (context, &n_allocs); if (!group_allocs) + return allocate_cells_manually (box, widget, width, height); + + if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) { - g_warning ("Trying to operate on an unallocated GtkCellAreaIter, " - "GtkCellAreaBox requires that the iter be allocated at least " - "in the orientation of the box"); - return NULL; + full_size = width; + for_size = height; + } + else + { + full_size = height; + for_size = width; } - for (i = 0; i < n_allocs; i++) + /* For vertical oriented boxes, we just let the cell renderers + * realign themselves for rtl + */ + rtl = (priv->orientation == GTK_ORIENTATION_HORIZONTAL && + gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL); + + for (position = 0, i = 0; i < n_allocs; i++) { - /* We dont always allocate all groups, sometimes the requested group has only invisible - * cells for every row, hence the usage of group_allocs[i].group_idx here + /* We dont always allocate all groups, sometimes the requested + * group has only invisible cells for every row, hence the usage + * of group_allocs[i].group_idx here */ CellGroup *group = &g_array_index (priv->groups, CellGroup, group_allocs[i].group_idx); /* Exception for single cell groups */ if (group->n_cells == 1) - { - CellInfo *info = group->cells->data; - AllocatedCell *cell = - allocated_cell_new (info->renderer, group_allocs[i].position, group_allocs[i].size); + { + CellInfo *info = group->cells->data; + AllocatedCell *cell; + gint cell_position, cell_size; - allocated_cells = g_slist_prepend (allocated_cells, cell); - } - else - { - GtkRequestedSize *sizes; - gint avail_size, position; - gint visible_cells, expand_cells; - gint extra_size, extra_extra; - - visible_cells = count_visible_cells (group, &expand_cells); - - /* If this row has no visible cells in this group, just - * skip the allocation */ - if (visible_cells == 0) + if (!gtk_cell_renderer_get_visible (info->renderer)) continue; - /* Offset the allocation to the group position and allocate into - * the group's available size */ - position = group_allocs[i].position; - avail_size = group_allocs[i].size; - - sizes = g_new (GtkRequestedSize, visible_cells); + /* If were not aligned, place the cell after the last cell */ + if (info->align) + position = cell_position = group_allocs[i].position; + else + cell_position = position; - for (j = 0, cell_list = group->cells; cell_list; cell_list = cell_list->next) + /* If not a fixed size, use only the requested size for this row */ + if (info->fixed) + cell_size = group_allocs[i].size; + else { - CellInfo *info = cell_list->data; - - if (!gtk_cell_renderer_get_visible (info->renderer)) - continue; - - gtk_cell_area_request_renderer (area, info->renderer, - priv->orientation, - widget, -1, - &sizes[j].minimum_size, - &sizes[j].natural_size); - - sizes[j].data = info; - avail_size -= sizes[j].minimum_size; - - j++; + gint dummy; + gtk_cell_area_request_renderer (area, info->renderer, + priv->orientation, + widget, for_size, + &dummy, + &cell_size); + cell_size = MIN (cell_size, group_allocs[i].size); } - /* Distribute cells naturally within the group */ - avail_size -= (visible_cells - 1) * priv->spacing; - avail_size = gtk_distribute_natural_allocation (avail_size, visible_cells, sizes); + if (rtl) + cell = allocated_cell_new (info->renderer, + full_size - (cell_position + cell_size), cell_size); + else + cell = allocated_cell_new (info->renderer, cell_position, cell_size); + + position += cell_size; + position += priv->spacing; - /* Calculate/distribute expand for cells */ - if (expand_cells > 0) + allocated_cells = g_slist_prepend (allocated_cells, cell); + } + else + { + GtkRequestedSize *sizes; + gint avail_size, cell_position; + gint visible_cells, expand_cells; + gint extra_size, extra_extra; + + visible_cells = count_visible_cells (group, &expand_cells); + + /* If this row has no visible cells in this group, just + * skip the allocation + */ + if (visible_cells == 0) + continue; + + /* If were not aligned, place the cell after the last cell + * and eat up the extra space + */ + if (group->align) { - extra_size = avail_size / expand_cells; - extra_extra = avail_size % expand_cells; + avail_size = group_allocs[i].size; + position = cell_position = group_allocs[i].position; } else - extra_size = extra_extra = 0; - - /* Create the allocated cells (loop only over visible cells here) */ - for (j = 0; j < visible_cells; j++) { - CellInfo *info = sizes[j].data; - AllocatedCell *cell; - - if (info->expand) - { - sizes[j].minimum_size += extra_size; - if (extra_extra) - { - sizes[j].minimum_size++; - extra_extra--; - } - } - - cell = allocated_cell_new (info->renderer, position, sizes[j].minimum_size); - - allocated_cells = g_slist_prepend (allocated_cells, cell); - - position += sizes[j].minimum_size; - position += priv->spacing; - - j++; + avail_size = group_allocs[i].size + (group_allocs[i].position - position); + cell_position = position; } - g_free (sizes); - } + sizes = g_new (GtkRequestedSize, visible_cells); + + for (j = 0, cell_list = group->cells; cell_list; cell_list = cell_list->next) + { + CellInfo *info = cell_list->data; + + if (!gtk_cell_renderer_get_visible (info->renderer)) + continue; + + gtk_cell_area_request_renderer (area, info->renderer, + priv->orientation, + widget, for_size, + &sizes[j].minimum_size, + &sizes[j].natural_size); + + sizes[j].data = info; + avail_size -= sizes[j].minimum_size; + + j++; + } + + /* Distribute cells naturally within the group */ + avail_size -= (visible_cells - 1) * priv->spacing; + if (avail_size > 0) + avail_size = gtk_distribute_natural_allocation (avail_size, visible_cells, sizes); + else + avail_size = 0; + + /* Calculate/distribute expand for cells */ + if (expand_cells > 0) + { + extra_size = avail_size / expand_cells; + extra_extra = avail_size % expand_cells; + } + else + extra_size = extra_extra = 0; + + /* Create the allocated cells (loop only over visible cells here) */ + for (j = 0; j < visible_cells; j++) + { + CellInfo *info = sizes[j].data; + AllocatedCell *cell; + + if (info->expand) + { + sizes[j].minimum_size += extra_size; + if (extra_extra) + { + sizes[j].minimum_size++; + extra_extra--; + } + } + + if (rtl) + cell = allocated_cell_new (info->renderer, + full_size - (cell_position + sizes[j].minimum_size), + sizes[j].minimum_size); + else + cell = allocated_cell_new (info->renderer, cell_position, sizes[j].minimum_size); + + allocated_cells = g_slist_prepend (allocated_cells, cell); + + cell_position += sizes[j].minimum_size; + cell_position += priv->spacing; + } + + g_free (sizes); + + position = cell_position; + } } + g_free (group_allocs); + /* Note it might not be important to reverse the list here at all, - * we have the correct positions, no need to allocate from left to right */ + * we have the correct positions, no need to allocate from left to right + */ return g_slist_reverse (allocated_cells); } + +static void +gtk_cell_area_box_focus_changed (GtkCellArea *area, + GParamSpec *pspec, + GtkCellAreaBox *box) +{ + if (gtk_cell_area_get_focus_cell (area)) + box->priv->last_focus_cell = gtk_cell_area_get_focus_cell (area); +} + /************************************************************* * GObjectClass * *************************************************************/ @@ -697,17 +1026,17 @@ gtk_cell_area_box_finalize (GObject *object) GtkCellAreaBoxPrivate *priv = box->priv; GSList *l; - /* Unref/free the iter list */ - for (l = priv->iters; l; l = l->next) - g_object_weak_unref (G_OBJECT (l->data), (GWeakNotify)iter_weak_notify, box); + /* Unref/free the context list */ + for (l = priv->contexts; l; l = l->next) + g_object_weak_unref (G_OBJECT (l->data), (GWeakNotify)context_weak_notify, box); - g_slist_free (priv->iters); - priv->iters = NULL; + g_slist_free (priv->contexts); + priv->contexts = NULL; /* Free the cell grouping info */ cell_groups_clear (box); g_array_free (priv->groups, TRUE); - + G_OBJECT_CLASS (gtk_cell_area_box_parent_class)->finalize (object); } @@ -719,9 +1048,9 @@ gtk_cell_area_box_dispose (GObject *object) static void gtk_cell_area_box_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) + guint prop_id, + const GValue *value, + GParamSpec *pspec) { GtkCellAreaBox *box = GTK_CELL_AREA_BOX (object); @@ -731,7 +1060,8 @@ gtk_cell_area_box_set_property (GObject *object, box->priv->orientation = g_value_get_enum (value); /* Notify that size needs to be requested again */ - flush_iters (box); + reset_contexts (box); + break; case PROP_SPACING: gtk_cell_area_box_set_spacing (box, g_value_get_int (value)); @@ -744,9 +1074,9 @@ gtk_cell_area_box_set_property (GObject *object, static void gtk_cell_area_box_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) + guint prop_id, + GValue *value, + GParamSpec *pspec) { GtkCellAreaBox *box = GTK_CELL_AREA_BOX (object); @@ -767,24 +1097,27 @@ gtk_cell_area_box_get_property (GObject *object, /************************************************************* * GtkCellAreaClass * *************************************************************/ -static void +static void gtk_cell_area_box_add (GtkCellArea *area, - GtkCellRenderer *renderer) + GtkCellRenderer *renderer) { gtk_cell_area_box_pack_start (GTK_CELL_AREA_BOX (area), - renderer, FALSE, TRUE); + renderer, FALSE, FALSE, TRUE); } static void gtk_cell_area_box_remove (GtkCellArea *area, - GtkCellRenderer *renderer) + GtkCellRenderer *renderer) { GtkCellAreaBox *box = GTK_CELL_AREA_BOX (area); GtkCellAreaBoxPrivate *priv = box->priv; GList *node; - node = g_list_find_custom (priv->cells, renderer, - (GCompareFunc)cell_info_find); + if (priv->last_focus_cell == renderer) + priv->last_focus_cell = NULL; + + node = g_list_find_custom (priv->cells, renderer, + (GCompareFunc)cell_info_find); if (node) { @@ -802,9 +1135,9 @@ gtk_cell_area_box_remove (GtkCellArea *area, } static void -gtk_cell_area_box_forall (GtkCellArea *area, - GtkCellCallback callback, - gpointer callback_data) +gtk_cell_area_box_foreach (GtkCellArea *area, + GtkCellCallback callback, + gpointer callback_data) { GtkCellAreaBox *box = GTK_CELL_AREA_BOX (area); GtkCellAreaBoxPrivate *priv = box->priv; @@ -814,157 +1147,211 @@ gtk_cell_area_box_forall (GtkCellArea *area, { CellInfo *info = list->data; - callback (info->renderer, callback_data); + if (callback (info->renderer, callback_data)) + break; } } static void -gtk_cell_area_box_get_cell_allocation (GtkCellArea *area, - GtkCellAreaIter *iter, - GtkWidget *widget, - GtkCellRenderer *renderer, - const GdkRectangle *cell_area, - GdkRectangle *allocation) +gtk_cell_area_box_foreach_alloc (GtkCellArea *area, + GtkCellAreaContext *context, + GtkWidget *widget, + const GdkRectangle *cell_area, + const GdkRectangle *background_area, + GtkCellAllocCallback callback, + gpointer callback_data) { GtkCellAreaBox *box = GTK_CELL_AREA_BOX (area); GtkCellAreaBoxPrivate *priv = box->priv; - GtkCellAreaBoxIter *box_iter = GTK_CELL_AREA_BOX_ITER (iter); + GtkCellAreaBoxContext *box_context = GTK_CELL_AREA_BOX_CONTEXT (context); GSList *allocated_cells, *l; + GdkRectangle cell_alloc, cell_background; + gboolean rtl; - *allocation = *cell_area; + rtl = (priv->orientation == GTK_ORIENTATION_HORIZONTAL && + gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL); + + cell_alloc = *cell_area; /* Get a list of cells with allocation sizes decided regardless - * of alignments and pack order etc. */ - allocated_cells = get_allocated_cells (box, box_iter, widget); + * of alignments and pack order etc. + */ + allocated_cells = get_allocated_cells (box, box_context, widget, + cell_area->width, cell_area->height); for (l = allocated_cells; l; l = l->next) { AllocatedCell *cell = l->data; - if (cell->renderer == renderer) - { - if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) - { - allocation->x = cell_area->x + cell->position; - allocation->width = cell->size; - } - else - { - allocation->y = cell_area->y + cell->position; - allocation->height = cell->size; - } + if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) + { + cell_alloc.x = cell_area->x + cell->position; + cell_alloc.width = cell->size; + } + else + { + cell_alloc.y = cell_area->y + cell->position; + cell_alloc.height = cell->size; + } + + /* Stop iterating over cells if they flow out of the render + * area, this can happen because the render area can actually + * be smaller than the requested area (treeview columns can + * be user resizable and can be resized to be smaller than + * the actual requested area). + */ + if (cell_alloc.x > cell_area->x + cell_area->width || + cell_alloc.x + cell_alloc.width < cell_area->x || + cell_alloc.y > cell_area->y + cell_area->height) + break; + + /* Special case for the last cell (or first cell in rtl)... + * let the last cell consume the remaining space in the area + * (the last cell is allowed to consume the remaining space if + * the space given for rendering is actually larger than allocation, + * this can happen in the expander GtkTreeViewColumn where only the + * deepest depth column receives the allocation... shallow columns + * receive more width). */ + if (!l->next) + { + if (rtl) + { + /* Fill the leading space for the first cell in the area + * (still last in the list) + */ + cell_alloc.width = (cell_alloc.x - cell_area->x) + cell_alloc.width; + cell_alloc.x = cell_area->x; + } + else + { + cell_alloc.width = cell_area->x + cell_area->width - cell_alloc.x; + cell_alloc.height = cell_area->y + cell_area->height - cell_alloc.y; + } + } + else + { + /* If the cell we are rendering doesnt fit into the remaining space, + * clip it so that the underlying renderer has a chance to deal with + * it (for instance text renderers get a chance to ellipsize). + */ + if (cell_alloc.x + cell_alloc.width > cell_area->x + cell_area->width) + cell_alloc.width = cell_area->x + cell_area->width - cell_alloc.x; + + if (cell_alloc.y + cell_alloc.height > cell_area->y + cell_area->height) + cell_alloc.height = cell_area->y + cell_area->height - cell_alloc.y; + } + + /* Add portions of the background_area to the cell_alloc + * to create the cell_background + */ + cell_background = cell_alloc; - break; - } + if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) + { + if (l == allocated_cells) + { + /* Add the depth to the first cell */ + if (rtl) + { + cell_background.width += background_area->width - cell_area->width; + cell_background.x = background_area->x + background_area->width - cell_background.width; + } + else + { + cell_background.width += cell_area->x - background_area->x; + cell_background.x = background_area->x; + } + } + + if (l->next == NULL) + { + /* Grant this cell the remaining space */ + int remain = cell_background.x - background_area->x; + + if (rtl) + cell_background.x -= remain; + else + cell_background.width = background_area->width - remain; + } + + cell_background.y = background_area->y; + cell_background.height = background_area->height; + } + else + { + if (l == allocated_cells) + { + cell_background.height += cell_background.y - background_area->y; + cell_background.y = background_area->y; + } + + if (l->next == NULL) + cell_background.height = + background_area->height - (cell_background.y - background_area->y); + + cell_background.x = background_area->x; + cell_background.width = background_area->width; + } + + if (callback (cell->renderer, &cell_alloc, &cell_background, callback_data)) + break; } g_slist_foreach (allocated_cells, (GFunc)allocated_cell_free, NULL); g_slist_free (allocated_cells); } -static gint -gtk_cell_area_box_event (GtkCellArea *area, - GtkCellAreaIter *iter, - GtkWidget *widget, - GdkEvent *event, - const GdkRectangle *cell_area, - GtkCellRendererState flags) -{ - gint retval; - - /* First let the parent class handle activation of cells via keystrokes */ - retval = - GTK_CELL_AREA_CLASS (gtk_cell_area_box_parent_class)->event (area, iter, widget, - event, cell_area, flags); - - if (retval) - return retval; - - /* Now detect keystrokes that move focus directionally inside the area - * or signal that focus should leave the area in a given direction. - * - * To navigate focus we only need to loop through the groups and - * observe the orientation and push focus along to the next cell - * or signal that focus should leave the area. - */ - - /* Also detect mouse events, for mouse events we need to allocate the renderers - * and find which renderer needs to be activated. - */ - - - return 0; -} - static void -gtk_cell_area_box_render (GtkCellArea *area, - GtkCellAreaIter *iter, - GtkWidget *widget, - cairo_t *cr, - const GdkRectangle *cell_area, - GtkCellRendererState flags) +gtk_cell_area_box_apply_attributes (GtkCellArea *area, + GtkTreeModel *tree_model, + GtkTreeIter *iter, + gboolean is_expander, + gboolean is_expanded) { - GtkCellAreaBox *box = GTK_CELL_AREA_BOX (area); - GtkCellAreaBoxPrivate *priv = box->priv; - GtkCellAreaBoxIter *box_iter = GTK_CELL_AREA_BOX_ITER (iter); - GSList *allocated_cells, *l; - GdkRectangle background_area, inner_area; - - background_area = *cell_area; + GtkCellAreaBox *box = GTK_CELL_AREA_BOX (area); + GtkCellAreaBoxPrivate *priv = box->priv; + gint i; - /* Get a list of cells with allocation sizes decided regardless - * of alignments and pack order etc. */ - allocated_cells = get_allocated_cells (box, box_iter, widget); + /* Call the parent class to apply the attributes */ + GTK_CELL_AREA_CLASS + (gtk_cell_area_box_parent_class)->apply_attributes (area, tree_model, iter, + is_expander, is_expanded); - for (l = allocated_cells; l; l = l->next) + /* Update visible state for cell groups */ + for (i = 0; i < priv->groups->len; i++) { - AllocatedCell *cell = l->data; + CellGroup *group = &g_array_index (priv->groups, CellGroup, i); + GList *list; - if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) - { - background_area.x = cell_area->x + cell->position; - background_area.width = cell->size; - } - else - { - background_area.y = cell_area->y + cell->position; - background_area.height = cell->size; - } + group->visible = FALSE; - /* Remove margins from the background area to produce the cell area - */ - gtk_cell_area_inner_cell_area (area, &background_area, &inner_area); - - /* XXX We have to do some per-cell considerations for the 'flags' - * for focus handling */ - gtk_cell_renderer_render (cell->renderer, cr, widget, - &background_area, &inner_area, - flags); + for (list = group->cells; list && group->visible == FALSE; list = list->next) + { + CellInfo *info = list->data; + if (gtk_cell_renderer_get_visible (info->renderer)) + group->visible = TRUE; + } } - - g_slist_foreach (allocated_cells, (GFunc)allocated_cell_free, NULL); - g_slist_free (allocated_cells); } static void gtk_cell_area_box_set_cell_property (GtkCellArea *area, - GtkCellRenderer *renderer, - guint prop_id, - const GValue *value, - GParamSpec *pspec) + GtkCellRenderer *renderer, + guint prop_id, + const GValue *value, + GParamSpec *pspec) { - GtkCellAreaBox *box = GTK_CELL_AREA_BOX (area); + GtkCellAreaBox *box = GTK_CELL_AREA_BOX (area); GtkCellAreaBoxPrivate *priv = box->priv; GList *node; CellInfo *info; gboolean rebuild = FALSE; - gboolean flush = FALSE; gboolean val; GtkPackType pack_type; - node = g_list_find_custom (priv->cells, renderer, - (GCompareFunc)cell_info_find); + node = g_list_find_custom (priv->cells, renderer, + (GCompareFunc)cell_info_find); if (!node) return; @@ -976,61 +1363,65 @@ gtk_cell_area_box_set_cell_property (GtkCellArea *area, val = g_value_get_boolean (value); if (info->expand != val) - { - info->expand = val; - flush = TRUE; - } + { + info->expand = val; + rebuild = TRUE; + } break; case CELL_PROP_ALIGN: val = g_value_get_boolean (value); if (info->align != val) - { - info->align = val; - flush = TRUE; - } + { + info->align = val; + rebuild = TRUE; + } + break; + + case CELL_PROP_FIXED_SIZE: + val = g_value_get_boolean (value); + + if (info->fixed != val) + { + info->fixed = val; + rebuild = TRUE; + } break; case CELL_PROP_PACK_TYPE: pack_type = g_value_get_enum (value); if (info->pack != pack_type) - { - info->pack = pack_type; - rebuild = TRUE; - } + { + info->pack = pack_type; + rebuild = TRUE; + } break; default: - GTK_CELL_AREA_WARN_INVALID_CHILD_PROPERTY_ID (area, prop_id, pspec); + GTK_CELL_AREA_WARN_INVALID_CELL_PROPERTY_ID (area, prop_id, pspec); break; } /* Groups need to be rebuilt */ if (rebuild) - { - cell_groups_rebuild (box); - } - else if (flush) - { - flush_iters (box); - } + cell_groups_rebuild (box); } static void gtk_cell_area_box_get_cell_property (GtkCellArea *area, - GtkCellRenderer *renderer, - guint prop_id, - GValue *value, - GParamSpec *pspec) + GtkCellRenderer *renderer, + guint prop_id, + GValue *value, + GParamSpec *pspec) { - GtkCellAreaBox *box = GTK_CELL_AREA_BOX (area); + GtkCellAreaBox *box = GTK_CELL_AREA_BOX (area); GtkCellAreaBoxPrivate *priv = box->priv; GList *node; CellInfo *info; - node = g_list_find_custom (priv->cells, renderer, - (GCompareFunc)cell_info_find); + node = g_list_find_custom (priv->cells, renderer, + (GCompareFunc)cell_info_find); if (!node) return; @@ -1046,35 +1437,57 @@ gtk_cell_area_box_get_cell_property (GtkCellArea *area, g_value_set_boolean (value, info->align); break; + case CELL_PROP_FIXED_SIZE: + g_value_set_boolean (value, info->fixed); + break; + case CELL_PROP_PACK_TYPE: g_value_set_enum (value, info->pack); break; default: - GTK_CELL_AREA_WARN_INVALID_CHILD_PROPERTY_ID (area, prop_id, pspec); + GTK_CELL_AREA_WARN_INVALID_CELL_PROPERTY_ID (area, prop_id, pspec); break; } } -static GtkCellAreaIter * -gtk_cell_area_box_create_iter (GtkCellArea *area) +static GtkCellAreaContext * +gtk_cell_area_box_create_context (GtkCellArea *area) { GtkCellAreaBox *box = GTK_CELL_AREA_BOX (area); GtkCellAreaBoxPrivate *priv = box->priv; - GtkCellAreaIter *iter = - (GtkCellAreaIter *)g_object_new (GTK_TYPE_CELL_AREA_BOX_ITER, NULL); + GtkCellAreaContext *context = + (GtkCellAreaContext *)g_object_new (GTK_TYPE_CELL_AREA_BOX_CONTEXT, + "area", area, NULL); - priv->iters = g_slist_prepend (priv->iters, iter); + priv->contexts = g_slist_prepend (priv->contexts, context); - g_object_weak_ref (G_OBJECT (iter), (GWeakNotify)iter_weak_notify, box); + g_object_weak_ref (G_OBJECT (context), (GWeakNotify)context_weak_notify, box); /* Tell the new group about our cell layout */ - init_iter_group (box, GTK_CELL_AREA_BOX_ITER (iter)); + init_context_group (box, GTK_CELL_AREA_BOX_CONTEXT (context)); + + return context; +} + +static GtkCellAreaContext * +gtk_cell_area_box_copy_context (GtkCellArea *area, + GtkCellAreaContext *context) +{ + GtkCellAreaBox *box = GTK_CELL_AREA_BOX (area); + GtkCellAreaBoxPrivate *priv = box->priv; + GtkCellAreaContext *copy = + (GtkCellAreaContext *)_gtk_cell_area_box_context_copy (GTK_CELL_AREA_BOX (area), + GTK_CELL_AREA_BOX_CONTEXT (context)); + + priv->contexts = g_slist_prepend (priv->contexts, copy); - return iter; + g_object_weak_ref (G_OBJECT (copy), (GWeakNotify)context_weak_notify, box); + + return copy; } -static GtkSizeRequestMode +static GtkSizeRequestMode gtk_cell_area_box_get_request_mode (GtkCellArea *area) { GtkCellAreaBox *box = GTK_CELL_AREA_BOX (area); @@ -1086,13 +1499,13 @@ gtk_cell_area_box_get_request_mode (GtkCellArea *area) } static void -compute_size (GtkCellAreaBox *box, - GtkOrientation orientation, - GtkCellAreaBoxIter *iter, - GtkWidget *widget, - gint for_size, - gint *minimum_size, - gint *natural_size) +compute_size (GtkCellAreaBox *box, + GtkOrientation orientation, + GtkCellAreaBoxContext *context, + GtkWidget *widget, + gint for_size, + gint *minimum_size, + gint *natural_size) { GtkCellAreaBoxPrivate *priv = box->priv; GtkCellArea *area = GTK_CELL_AREA (box); @@ -1100,7 +1513,7 @@ compute_size (GtkCellAreaBox *box, gint i; gint min_size = 0; gint nat_size = 0; - + for (i = 0; i < priv->groups->len; i++) { CellGroup *group = &g_array_index (priv->groups, CellGroup, i); @@ -1108,72 +1521,76 @@ compute_size (GtkCellAreaBox *box, gint group_nat_size = 0; for (list = group->cells; list; list = list->next) - { - CellInfo *info = list->data; - gint renderer_min_size, renderer_nat_size; - - if (!gtk_cell_renderer_get_visible (info->renderer)) - continue; - - gtk_cell_area_request_renderer (area, info->renderer, orientation, widget, for_size, - &renderer_min_size, &renderer_nat_size); - - if (orientation == priv->orientation) - { - if (min_size > 0) - { - min_size += priv->spacing; - nat_size += priv->spacing; - } - - if (group_min_size > 0) - { - group_min_size += priv->spacing; - group_nat_size += priv->spacing; - } - - min_size += renderer_min_size; - nat_size += renderer_nat_size; - group_min_size += renderer_min_size; - group_nat_size += renderer_nat_size; - } - else - { - min_size = MAX (min_size, renderer_min_size); - nat_size = MAX (nat_size, renderer_nat_size); - group_min_size = MAX (group_min_size, renderer_min_size); - group_nat_size = MAX (group_nat_size, renderer_nat_size); - } - } + { + CellInfo *info = list->data; + gint renderer_min_size, renderer_nat_size; + + if (!gtk_cell_renderer_get_visible (info->renderer)) + continue; + + gtk_cell_area_request_renderer (area, info->renderer, orientation, widget, for_size, + &renderer_min_size, &renderer_nat_size); + + if (orientation == priv->orientation) + { + if (min_size > 0) + { + min_size += priv->spacing; + nat_size += priv->spacing; + } + + if (group_min_size > 0) + { + group_min_size += priv->spacing; + group_nat_size += priv->spacing; + } + + min_size += renderer_min_size; + nat_size += renderer_nat_size; + group_min_size += renderer_min_size; + group_nat_size += renderer_nat_size; + } + else + { + min_size = MAX (min_size, renderer_min_size); + nat_size = MAX (nat_size, renderer_nat_size); + group_min_size = MAX (group_min_size, renderer_min_size); + group_nat_size = MAX (group_nat_size, renderer_nat_size); + } + } if (orientation == GTK_ORIENTATION_HORIZONTAL) - { - if (for_size < 0) - gtk_cell_area_box_iter_push_group_width (iter, group->id, group_min_size, group_nat_size); - else - gtk_cell_area_box_iter_push_group_width_for_height (iter, group->id, for_size, - group_min_size, group_nat_size); - } + { + if (for_size < 0) + _gtk_cell_area_box_context_push_group_width (context, group->id, group_min_size, group_nat_size); + else + _gtk_cell_area_box_context_push_group_width_for_height (context, group->id, for_size, + group_min_size, group_nat_size); + } else - { - if (for_size < 0) - gtk_cell_area_box_iter_push_group_height (iter, group->id, group_min_size, group_nat_size); - else - gtk_cell_area_box_iter_push_group_height_for_width (iter, group->id, for_size, - group_min_size, group_nat_size); - } + { + if (for_size < 0) + _gtk_cell_area_box_context_push_group_height (context, group->id, group_min_size, group_nat_size); + else + _gtk_cell_area_box_context_push_group_height_for_width (context, group->id, for_size, + group_min_size, group_nat_size); + } } *minimum_size = min_size; *natural_size = nat_size; + + /* Update rtl state for focus navigation to work */ + priv->rtl = (priv->orientation == GTK_ORIENTATION_HORIZONTAL && + gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL); } -GtkRequestedSize * +static GtkRequestedSize * get_group_sizes (GtkCellArea *area, - CellGroup *group, - GtkOrientation orientation, - GtkWidget *widget, - gint *n_sizes) + CellGroup *group, + GtkOrientation orientation, + GtkWidget *widget, + gint *n_sizes) { GtkRequestedSize *sizes; GList *l; @@ -1187,14 +1604,14 @@ get_group_sizes (GtkCellArea *area, CellInfo *info = l->data; if (!gtk_cell_renderer_get_visible (info->renderer)) - continue; + continue; sizes[i].data = info; - + gtk_cell_area_request_renderer (area, info->renderer, - orientation, widget, -1, - &sizes[i].minimum_size, - &sizes[i].natural_size); + orientation, widget, -1, + &sizes[i].minimum_size, + &sizes[i].natural_size); i++; } @@ -1204,11 +1621,11 @@ get_group_sizes (GtkCellArea *area, static void compute_group_size_for_opposing_orientation (GtkCellAreaBox *box, - CellGroup *group, - GtkWidget *widget, - gint for_size, - gint *minimum_size, - gint *natural_size) + CellGroup *group, + GtkWidget *widget, + gint for_size, + gint *minimum_size, + gint *natural_size) { GtkCellAreaBoxPrivate *priv = box->priv; GtkCellArea *area = GTK_CELL_AREA (box); @@ -1219,8 +1636,8 @@ compute_group_size_for_opposing_orientation (GtkCellAreaBox *box, CellInfo *info = group->cells->data; gtk_cell_area_request_renderer (area, info->renderer, - OPPOSITE_ORIENTATION (priv->orientation), - widget, for_size, minimum_size, natural_size); + OPPOSITE_ORIENTATION (priv->orientation), + widget, for_size, minimum_size, natural_size); } else { @@ -1236,44 +1653,47 @@ compute_group_size_for_opposing_orientation (GtkCellAreaBox *box, /* First naturally allocate the cells in the group into the for_size */ avail_size -= (n_sizes - 1) * priv->spacing; for (i = 0; i < n_sizes; i++) - avail_size -= orientation_sizes[i].minimum_size; + avail_size -= orientation_sizes[i].minimum_size; - avail_size = gtk_distribute_natural_allocation (avail_size, n_sizes, orientation_sizes); + if (avail_size > 0) + avail_size = gtk_distribute_natural_allocation (avail_size, n_sizes, orientation_sizes); + else + avail_size = 0; /* Calculate/distribute expand for cells */ if (group->expand_cells > 0) - { - extra_size = avail_size / group->expand_cells; - extra_extra = avail_size % group->expand_cells; - } + { + extra_size = avail_size / group->expand_cells; + extra_extra = avail_size % group->expand_cells; + } else - extra_size = extra_extra = 0; + extra_size = extra_extra = 0; for (i = 0; i < n_sizes; i++) - { - gint cell_min, cell_nat; - - info = orientation_sizes[i].data; - - if (info->expand) - { - orientation_sizes[i].minimum_size += extra_size; - if (extra_extra) - { - orientation_sizes[i].minimum_size++; - extra_extra--; - } - } - - gtk_cell_area_request_renderer (area, info->renderer, - OPPOSITE_ORIENTATION (priv->orientation), - widget, - orientation_sizes[i].minimum_size, - &cell_min, &cell_nat); - - min_size = MAX (min_size, cell_min); - nat_size = MAX (nat_size, cell_nat); - } + { + gint cell_min, cell_nat; + + info = orientation_sizes[i].data; + + if (info->expand) + { + orientation_sizes[i].minimum_size += extra_size; + if (extra_extra) + { + orientation_sizes[i].minimum_size++; + extra_extra--; + } + } + + gtk_cell_area_request_renderer (area, info->renderer, + OPPOSITE_ORIENTATION (priv->orientation), + widget, + orientation_sizes[i].minimum_size, + &cell_min, &cell_nat); + + min_size = MAX (min_size, cell_min); + nat_size = MAX (nat_size, cell_nat); + } *minimum_size = min_size; *natural_size = nat_size; @@ -1283,12 +1703,12 @@ compute_group_size_for_opposing_orientation (GtkCellAreaBox *box, } static void -compute_size_for_opposing_orientation (GtkCellAreaBox *box, - GtkCellAreaBoxIter *iter, - GtkWidget *widget, - gint for_size, - gint *minimum_size, - gint *natural_size) +compute_size_for_opposing_orientation (GtkCellAreaBox *box, + GtkCellAreaBoxContext *context, + GtkWidget *widget, + gint for_size, + gint *minimum_size, + gint *natural_size) { GtkCellAreaBoxPrivate *priv = box->priv; CellGroup *group; @@ -1301,16 +1721,19 @@ compute_size_for_opposing_orientation (GtkCellAreaBox *box, n_expand_groups = count_expand_groups (box); if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) - orientation_sizes = gtk_cell_area_box_iter_get_widths (iter, &n_groups); + orientation_sizes = _gtk_cell_area_box_context_get_widths (context, &n_groups); else - orientation_sizes = gtk_cell_area_box_iter_get_heights (iter, &n_groups); + orientation_sizes = _gtk_cell_area_box_context_get_heights (context, &n_groups); /* First start by naturally allocating space among groups of cells */ avail_size -= (n_groups - 1) * priv->spacing; for (i = 0; i < n_groups; i++) avail_size -= orientation_sizes[i].minimum_size; - avail_size = gtk_distribute_natural_allocation (avail_size, n_groups, orientation_sizes); + if (avail_size > 0) + avail_size = gtk_distribute_natural_allocation (avail_size, n_groups, orientation_sizes); + else + avail_size = 0; /* Calculate/distribute expand for groups */ if (n_expand_groups > 0) @@ -1322,73 +1745,80 @@ compute_size_for_opposing_orientation (GtkCellAreaBox *box, extra_size = extra_extra = 0; /* Now we need to naturally allocate sizes for cells in each group - * and push the height-for-width for each group accordingly while accumulating - * the overall height-for-width for this row. + * and push the height-for-width for each group accordingly while + * accumulating the overall height-for-width for this row. */ for (i = 0; i < n_groups; i++) { gint group_min, group_nat; gint group_idx = GPOINTER_TO_INT (orientation_sizes[i].data); - + group = &g_array_index (priv->groups, CellGroup, group_idx); if (group->expand_cells > 0) - { - orientation_sizes[i].minimum_size += extra_size; - if (extra_extra) - { - orientation_sizes[i].minimum_size++; - extra_extra--; - } - } - - /* Now we have the allocation for the group, request it's height-for-width */ + { + orientation_sizes[i].minimum_size += extra_size; + if (extra_extra) + { + orientation_sizes[i].minimum_size++; + extra_extra--; + } + } + + /* Now we have the allocation for the group, + * request its height-for-width + */ compute_group_size_for_opposing_orientation (box, group, widget, - orientation_sizes[i].minimum_size, - &group_min, &group_nat); + orientation_sizes[i].minimum_size, + &group_min, &group_nat); min_size = MAX (min_size, group_min); nat_size = MAX (nat_size, group_nat); if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) - { - gtk_cell_area_box_iter_push_group_height_for_width (iter, group_idx, for_size, - group_min, group_nat); - } + { + _gtk_cell_area_box_context_push_group_height_for_width (context, group_idx, for_size, + group_min, group_nat); + } else - { - gtk_cell_area_box_iter_push_group_width_for_height (iter, group_idx, for_size, - group_min, group_nat); - } + { + _gtk_cell_area_box_context_push_group_width_for_height (context, group_idx, for_size, + group_min, group_nat); + } } *minimum_size = min_size; *natural_size = nat_size; g_free (orientation_sizes); + + /* Update rtl state for focus navigation to work */ + priv->rtl = (priv->orientation == GTK_ORIENTATION_HORIZONTAL && + gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL); } static void gtk_cell_area_box_get_preferred_width (GtkCellArea *area, - GtkCellAreaIter *iter, - GtkWidget *widget, - gint *minimum_width, - gint *natural_width) + GtkCellAreaContext *context, + GtkWidget *widget, + gint *minimum_width, + gint *natural_width) { GtkCellAreaBox *box = GTK_CELL_AREA_BOX (area); - GtkCellAreaBoxIter *box_iter; + GtkCellAreaBoxContext *box_context; gint min_width, nat_width; - g_return_if_fail (GTK_IS_CELL_AREA_BOX_ITER (iter)); + g_return_if_fail (GTK_IS_CELL_AREA_BOX_CONTEXT (context)); - box_iter = GTK_CELL_AREA_BOX_ITER (iter); + box_context = GTK_CELL_AREA_BOX_CONTEXT (context); - /* Compute the size of all renderers for current row data, - * bumping cell alignments in the iter along the way */ + /* Compute the size of all renderers for current row data, + * bumping cell alignments in the context along the way + */ compute_size (box, GTK_ORIENTATION_HORIZONTAL, - box_iter, widget, -1, &min_width, &nat_width); + box_context, widget, -1, &min_width, &nat_width); if (minimum_width) *minimum_width = min_width; @@ -1399,23 +1829,24 @@ gtk_cell_area_box_get_preferred_width (GtkCellArea *area, static void gtk_cell_area_box_get_preferred_height (GtkCellArea *area, - GtkCellAreaIter *iter, - GtkWidget *widget, - gint *minimum_height, - gint *natural_height) + GtkCellAreaContext *context, + GtkWidget *widget, + gint *minimum_height, + gint *natural_height) { GtkCellAreaBox *box = GTK_CELL_AREA_BOX (area); - GtkCellAreaBoxIter *box_iter; + GtkCellAreaBoxContext *box_context; gint min_height, nat_height; - g_return_if_fail (GTK_IS_CELL_AREA_BOX_ITER (iter)); + g_return_if_fail (GTK_IS_CELL_AREA_BOX_CONTEXT (context)); - box_iter = GTK_CELL_AREA_BOX_ITER (iter); + box_context = GTK_CELL_AREA_BOX_CONTEXT (context); - /* Compute the size of all renderers for current row data, - * bumping cell alignments in the iter along the way */ + /* Compute the size of all renderers for current row data, + * bumping cell alignments in the context along the way + */ compute_size (box, GTK_ORIENTATION_VERTICAL, - box_iter, widget, -1, &min_height, &nat_height); + box_context, widget, -1, &min_height, &nat_height); if (minimum_height) *minimum_height = min_height; @@ -1426,33 +1857,36 @@ gtk_cell_area_box_get_preferred_height (GtkCellArea *area, static void gtk_cell_area_box_get_preferred_height_for_width (GtkCellArea *area, - GtkCellAreaIter *iter, - GtkWidget *widget, - gint width, - gint *minimum_height, - gint *natural_height) + GtkCellAreaContext *context, + GtkWidget *widget, + gint width, + gint *minimum_height, + gint *natural_height) { GtkCellAreaBox *box = GTK_CELL_AREA_BOX (area); - GtkCellAreaBoxIter *box_iter; + GtkCellAreaBoxContext *box_context; GtkCellAreaBoxPrivate *priv; gint min_height, nat_height; - g_return_if_fail (GTK_IS_CELL_AREA_BOX_ITER (iter)); + g_return_if_fail (GTK_IS_CELL_AREA_BOX_CONTEXT (context)); - box_iter = GTK_CELL_AREA_BOX_ITER (iter); - priv = box->priv; + box_context = GTK_CELL_AREA_BOX_CONTEXT (context); + priv = box->priv; if (priv->orientation == GTK_ORIENTATION_VERTICAL) { - /* Add up vertical requests of height for width and push the overall - * cached sizes for alignments */ - compute_size (box, priv->orientation, box_iter, widget, width, &min_height, &nat_height); + /* Add up vertical requests of height for width and push + * the overall cached sizes for alignments + */ + compute_size (box, priv->orientation, box_context, widget, width, &min_height, &nat_height); } else { - /* Juice: virtually allocate cells into the for_width using the - * alignments and then return the overall height for that width, and cache it */ - compute_size_for_opposing_orientation (box, box_iter, widget, width, &min_height, &nat_height); + /* Juice: virtually allocate cells into the for_width using the + * alignments and then return the overall height for that width, + * and cache it + */ + compute_size_for_opposing_orientation (box, box_context, widget, width, &min_height, &nat_height); } if (minimum_height) @@ -1464,33 +1898,36 @@ gtk_cell_area_box_get_preferred_height_for_width (GtkCellArea *area, static void gtk_cell_area_box_get_preferred_width_for_height (GtkCellArea *area, - GtkCellAreaIter *iter, - GtkWidget *widget, - gint height, - gint *minimum_width, - gint *natural_width) + GtkCellAreaContext *context, + GtkWidget *widget, + gint height, + gint *minimum_width, + gint *natural_width) { GtkCellAreaBox *box = GTK_CELL_AREA_BOX (area); - GtkCellAreaBoxIter *box_iter; + GtkCellAreaBoxContext *box_context; GtkCellAreaBoxPrivate *priv; gint min_width, nat_width; - g_return_if_fail (GTK_IS_CELL_AREA_BOX_ITER (iter)); + g_return_if_fail (GTK_IS_CELL_AREA_BOX_CONTEXT (context)); - box_iter = GTK_CELL_AREA_BOX_ITER (iter); - priv = box->priv; + box_context = GTK_CELL_AREA_BOX_CONTEXT (context); + priv = box->priv; if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) { - /* Add up horizontal requests of width for height and push the overall - * cached sizes for alignments */ - compute_size (box, priv->orientation, box_iter, widget, height, &min_width, &nat_width); + /* Add up horizontal requests of width for height and push + * the overall cached sizes for alignments + */ + compute_size (box, priv->orientation, box_context, widget, height, &min_width, &nat_width); } else { - /* Juice: horizontally allocate cells into the for_height using the - * alignments and then return the overall width for that height, and cache it */ - compute_size_for_opposing_orientation (box, box_iter, widget, height, &min_width, &nat_width); + /* Juice: horizontally allocate cells into the for_height using the + * alignments and then return the overall width for that height, + * and cache it + */ + compute_size_for_opposing_orientation (box, box_context, widget, height, &min_width, &nat_width); } if (minimum_width) @@ -1500,52 +1937,113 @@ gtk_cell_area_box_get_preferred_width_for_height (GtkCellArea *area, *natural_width = nat_width; } -static void -gtk_cell_area_box_grab_focus (GtkCellArea *area, - GtkDirectionType direction) +enum { + FOCUS_NONE, + FOCUS_PREV, + FOCUS_NEXT, + FOCUS_LAST_CELL +}; + +static gboolean +gtk_cell_area_box_focus (GtkCellArea *area, + GtkDirectionType direction) { - GtkCellAreaBox *box = GTK_CELL_AREA_BOX (area); - GtkCellAreaBoxPrivate *priv; - gboolean first_cell = FALSE; - gint i; - GList *list; + GtkCellAreaBox *box = GTK_CELL_AREA_BOX (area); + GtkCellAreaBoxPrivate *priv = box->priv; + gint cycle = FOCUS_NONE; + gboolean cycled_focus = FALSE; + GtkCellRenderer *focus_cell; - priv = box->priv; + focus_cell = gtk_cell_area_get_focus_cell (area); + + /* Special case, when there is no activatable cell, focus + * is painted around the entire area... in this case we + * let focus leave the area directly. + */ + if (focus_cell && !gtk_cell_area_is_activatable (area)) + { + gtk_cell_area_set_focus_cell (area, NULL); + return FALSE; + } switch (direction) { case GTK_DIR_TAB_FORWARD: - case GTK_DIR_DOWN: - case GTK_DIR_RIGHT: - first_cell = TRUE; + cycle = priv->rtl ? FOCUS_PREV : FOCUS_NEXT; break; - case GTK_DIR_TAB_BACKWARD: + cycle = priv->rtl ? FOCUS_NEXT : FOCUS_PREV; + break; case GTK_DIR_UP: + if (priv->orientation == GTK_ORIENTATION_VERTICAL || !priv->last_focus_cell) + cycle = FOCUS_PREV; + else if (!focus_cell) + cycle = FOCUS_LAST_CELL; + break; + case GTK_DIR_DOWN: + if (priv->orientation == GTK_ORIENTATION_VERTICAL || !priv->last_focus_cell) + cycle = FOCUS_NEXT; + else if (!focus_cell) + cycle = FOCUS_LAST_CELL; + break; case GTK_DIR_LEFT: + if (priv->orientation == GTK_ORIENTATION_HORIZONTAL || !priv->last_focus_cell) + cycle = priv->rtl ? FOCUS_NEXT : FOCUS_PREV; + else if (!focus_cell) + cycle = FOCUS_LAST_CELL; + break; + case GTK_DIR_RIGHT: + if (priv->orientation == GTK_ORIENTATION_HORIZONTAL || !priv->last_focus_cell) + cycle = priv->rtl ? FOCUS_PREV : FOCUS_NEXT; + else if (!focus_cell) + cycle = FOCUS_LAST_CELL; + break; default: - first_cell = FALSE; break; } - for (i = first_cell ? 0 : priv->groups->len -1; - i >= 0 && i < priv->groups->len; - i = first_cell ? i + 1 : i - 1) + if (cycle == FOCUS_LAST_CELL) { - CellGroup *group = &g_array_index (priv->groups, CellGroup, i); - - for (list = first_cell ? g_list_first (group->cells) : g_list_last (group->cells); - list; list = first_cell ? list->next : list->prev) - { - CellInfo *info = list->data; - - if (gtk_cell_renderer_can_focus (info->renderer)) - { - gtk_cell_area_set_focus_cell (area, info->renderer); - break; - } - } + gtk_cell_area_set_focus_cell (area, priv->last_focus_cell); + cycled_focus = TRUE; + } + else if (cycle != FOCUS_NONE) + { + gboolean found_cell = FALSE; + GList *list; + gint i; + + /* If there is no focused cell, focus on the first (or last) one */ + if (!focus_cell) + found_cell = TRUE; + + for (i = (cycle == FOCUS_NEXT) ? 0 : priv->groups->len -1; + cycled_focus == FALSE && i >= 0 && i < priv->groups->len; + i = (cycle == FOCUS_NEXT) ? i + 1 : i - 1) + { + CellGroup *group = &g_array_index (priv->groups, CellGroup, i); + + for (list = (cycle == FOCUS_NEXT) ? g_list_first (group->cells) : g_list_last (group->cells); + cycled_focus == FALSE && list; list = (cycle == FOCUS_NEXT) ? list->next : list->prev) + { + CellInfo *info = list->data; + + if (info->renderer == focus_cell) + found_cell = TRUE; + else if (found_cell && /* Dont give focus to cells that are siblings to a focus cell */ + gtk_cell_area_get_focus_from_sibling (area, info->renderer) == NULL) + { + gtk_cell_area_set_focus_cell (area, info->renderer); + cycled_focus = TRUE; + } + } + } } + + if (!cycled_focus) + gtk_cell_area_set_focus_cell (area, NULL); + + return cycled_focus; } @@ -1562,32 +2060,32 @@ gtk_cell_area_box_cell_layout_init (GtkCellLayoutIface *iface) static void gtk_cell_area_box_layout_pack_start (GtkCellLayout *cell_layout, - GtkCellRenderer *renderer, - gboolean expand) + GtkCellRenderer *renderer, + gboolean expand) { - gtk_cell_area_box_pack_start (GTK_CELL_AREA_BOX (cell_layout), renderer, expand, TRUE); + gtk_cell_area_box_pack_start (GTK_CELL_AREA_BOX (cell_layout), renderer, expand, FALSE, TRUE); } static void gtk_cell_area_box_layout_pack_end (GtkCellLayout *cell_layout, - GtkCellRenderer *renderer, - gboolean expand) + GtkCellRenderer *renderer, + gboolean expand) { - gtk_cell_area_box_pack_end (GTK_CELL_AREA_BOX (cell_layout), renderer, expand, TRUE); + gtk_cell_area_box_pack_end (GTK_CELL_AREA_BOX (cell_layout), renderer, expand, FALSE, TRUE); } static void gtk_cell_area_box_layout_reorder (GtkCellLayout *cell_layout, - GtkCellRenderer *renderer, - gint position) + GtkCellRenderer *renderer, + gint position) { GtkCellAreaBox *box = GTK_CELL_AREA_BOX (cell_layout); GtkCellAreaBoxPrivate *priv = box->priv; GList *node; CellInfo *info; - - node = g_list_find_custom (priv->cells, renderer, - (GCompareFunc)cell_info_find); + + node = g_list_find_custom (priv->cells, renderer, + (GCompareFunc)cell_info_find); if (node) { @@ -1600,20 +2098,64 @@ gtk_cell_area_box_layout_reorder (GtkCellLayout *cell_layout, } } +/************************************************************* + * Private interaction with GtkCellAreaBoxContext * + *************************************************************/ +gboolean +_gtk_cell_area_box_group_visible (GtkCellAreaBox *box, + gint group_idx) +{ + GtkCellAreaBoxPrivate *priv = box->priv; + CellGroup *group; + + g_assert (group_idx >= 0 && group_idx < priv->groups->len); + + group = &g_array_index (priv->groups, CellGroup, group_idx); + + return group->visible; +} + + /************************************************************* * API * *************************************************************/ +/** + * gtk_cell_area_box_new: + * + * Creates a new #GtkCellAreaBox. + * + * Return value: a newly created #GtkCellAreaBox + * + * Since: 3.0 + */ GtkCellArea * gtk_cell_area_box_new (void) { return (GtkCellArea *)g_object_new (GTK_TYPE_CELL_AREA_BOX, NULL); } +/** + * gtk_cell_area_box_pack_start: + * @box: a #GtkCellAreaBox + * @renderer: the #GtkCellRenderer to add + * @expand: whether @renderer should receive extra space when the area receives + * more than its natural size + * @align: whether @renderer should be aligned in adjacent rows + * @fixed: whether @renderer should have the same size in all rows + * + * Adds @renderer to @box, packed with reference to the start of @box. + * + * The @renderer is packed after any other #GtkCellRenderer packed + * with reference to the start of @box. + * + * Since: 3.0 + */ void gtk_cell_area_box_pack_start (GtkCellAreaBox *box, - GtkCellRenderer *renderer, - gboolean expand, - gboolean align) + GtkCellRenderer *renderer, + gboolean expand, + gboolean align, + gboolean fixed) { GtkCellAreaBoxPrivate *priv; CellInfo *info; @@ -1623,25 +2165,42 @@ gtk_cell_area_box_pack_start (GtkCellAreaBox *box, priv = box->priv; - if (g_list_find_custom (priv->cells, renderer, - (GCompareFunc)cell_info_find)) + if (g_list_find_custom (priv->cells, renderer, + (GCompareFunc)cell_info_find)) { g_warning ("Refusing to add the same cell renderer to a GtkCellAreaBox twice"); return; } - info = cell_info_new (renderer, GTK_PACK_START, expand, align); + info = cell_info_new (renderer, GTK_PACK_START, expand, align, fixed); priv->cells = g_list_append (priv->cells, info); cell_groups_rebuild (box); } +/** + * gtk_cell_area_box_pack_end: + * @box: a #GtkCellAreaBox + * @renderer: the #GtkCellRenderer to add + * @expand: whether @renderer should receive extra space when the area receives + * more than its natural size + * @align: whether @renderer should be aligned in adjacent rows + * @fixed: whether @renderer should have the same size in all rows + * + * Adds @renderer to @box, packed with reference to the end of @box. + * + * The @renderer is packed after (away from end of) any other + * #GtkCellRenderer packed with reference to the end of @box. + * + * Since: 3.0 + */ void gtk_cell_area_box_pack_end (GtkCellAreaBox *box, - GtkCellRenderer *renderer, - gboolean expand, - gboolean align) + GtkCellRenderer *renderer, + gboolean expand, + gboolean align, + gboolean fixed) { GtkCellAreaBoxPrivate *priv; CellInfo *info; @@ -1651,20 +2210,30 @@ gtk_cell_area_box_pack_end (GtkCellAreaBox *box, priv = box->priv; - if (g_list_find_custom (priv->cells, renderer, - (GCompareFunc)cell_info_find)) + if (g_list_find_custom (priv->cells, renderer, + (GCompareFunc)cell_info_find)) { g_warning ("Refusing to add the same cell renderer to a GtkCellArea twice"); return; } - info = cell_info_new (renderer, GTK_PACK_END, expand, align); + info = cell_info_new (renderer, GTK_PACK_END, expand, align, fixed); priv->cells = g_list_append (priv->cells, info); cell_groups_rebuild (box); } +/** + * gtk_cell_area_box_get_spacing: + * @box: a #GtkCellAreaBox + * + * Gets the spacing added between cell renderers. + * + * Return value: the space added between cell renderers in @box. + * + * Since: 3.0 + */ gint gtk_cell_area_box_get_spacing (GtkCellAreaBox *box) { @@ -1673,9 +2242,18 @@ gtk_cell_area_box_get_spacing (GtkCellAreaBox *box) return box->priv->spacing; } +/** + * gtk_cell_area_box_set_spacing: + * @box: a #GtkCellAreaBox + * @spacing: the space to add between #GtkCellRenderers + * + * Sets the spacing to add between cell renderers in @box. + * + * Since: 3.0 + */ void gtk_cell_area_box_set_spacing (GtkCellAreaBox *box, - gint spacing) + gint spacing) { GtkCellAreaBoxPrivate *priv; @@ -1690,6 +2268,6 @@ gtk_cell_area_box_set_spacing (GtkCellAreaBox *box, g_object_notify (G_OBJECT (box), "spacing"); /* Notify that size needs to be requested again */ - flush_iters (box); + reset_contexts (box); } }