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

Fixed GtkCellArea to always activate a cell at gtk_cell_area_activate() time even if no cells have focus.

Browse Source
This commit is contained in:
Tristan Van Berkom 2010-12-01 16:21:09 +09:00
parent 26ac551b74
commit a852deeb03
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gtk/gtkcellarea.c
View File

@ -1023,20 +1023,42 @@ gtk_cell_area_real_activate (GtkCellArea *area,
{ {
GtkCellAreaPrivate *priv = area->priv; GtkCellAreaPrivate *priv = area->priv;
GdkRectangle background_area; GdkRectangle background_area;
GtkCellRenderer *activate_cell = NULL;
if (priv->focus_cell) if (priv->focus_cell)
activate_cell = priv->focus_cell;
else
{
GList *cells, *l;
/* GtkTreeView sometimes wants to activate a cell when no
* cells are in focus.
*/
cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (area));
for (l = cells; l && !activate_cell; l = l->next)
{
GtkCellRenderer *renderer = l->data;
if (gtk_cell_renderer_is_activatable (renderer))
activate_cell = renderer;
}
g_list_free (cells);
}
if (activate_cell)
{ {
/* Get the allocation of the focused cell. /* Get the allocation of the focused cell.
*/ */
gtk_cell_area_get_cell_allocation (area, context, widget, priv->focus_cell, gtk_cell_area_get_cell_allocation (area, context, widget, activate_cell,
cell_area, &background_area); cell_area, &background_area);
/* Activate or Edit the currently focused cell /* Activate or Edit the cell
* *
* Currently just not sending an event, renderers afaics dont use * Currently just not sending an event, renderers afaics dont use
* the event argument anyway, worst case is we can synthesize one. * the event argument anyway, worst case is we can synthesize one.
*/ */
if (gtk_cell_area_activate_cell (area, widget, priv->focus_cell, NULL, if (gtk_cell_area_activate_cell (area, widget, activate_cell, NULL,
&background_area, flags)) &background_area, flags))
return TRUE; return TRUE;
} }