* Boston, MA 02111-1307, USA.
*/
+#include <string.h>
#include "gtktreeviewcolumn.h"
#include "gtktreeview.h"
#include "gtktreeprivate.h"
-#include "gtksignal.h"
#include "gtkbutton.h"
#include "gtkalignment.h"
#include "gtklabel.h"
#include "gtkmarshalers.h"
#include "gtkarrow.h"
#include "gtkintl.h"
-#include <string.h>
enum
{
gpointer func_data;
GtkDestroyNotify destroy;
gint requested_width;
+ gint real_width;
guint expand : 1;
guint pack : 1;
guint has_focus : 1;
+ guint in_editing_mode : 1;
};
/* Type methods */
GParamSpec *pspec);
static void gtk_tree_view_column_finalize (GObject *object);
-/* Button handling code */
+/* Button handling code */
static void gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column);
static void gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column);
static GtkTreeViewColumnCellInfo *gtk_tree_view_column_get_cell_info (GtkTreeViewColumn *tree_column,
GtkCellRenderer *cell_renderer);
-
+/* cell list manipulation */
+static GList *gtk_tree_view_column_cell_first (GtkTreeViewColumn *tree_column);
+static GList *gtk_tree_view_column_cell_last (GtkTreeViewColumn *tree_column);
+static GList *gtk_tree_view_column_cell_next (GtkTreeViewColumn *tree_column,
+ GList *current);
+static GList *gtk_tree_view_column_cell_prev (GtkTreeViewColumn *tree_column,
+ GList *current);
+static void gtk_tree_view_column_clear_attributes_by_info (GtkTreeViewColumn *tree_column,
+ GtkTreeViewColumnCellInfo *info);
static GtkObjectClass *parent_class = NULL;
static guint tree_column_signals[LAST_SIGNAL] = { 0 };
-GtkType
+GType
gtk_tree_view_column_get_type (void)
{
- static GtkType tree_column_type = 0;
+ static GType tree_column_type = 0;
if (!tree_column_type)
{
(GInstanceInitFunc) gtk_tree_view_column_init,
};
- tree_column_type = g_type_register_static (GTK_TYPE_OBJECT, "GtkTreeViewColumn", &tree_column_info, 0);
+ tree_column_type =
+ g_type_register_static (GTK_TYPE_OBJECT, "GtkTreeViewColumn",
+ &tree_column_info, 0);
}
return tree_column_type;
tree_column_signals[CLICKED] =
g_signal_new ("clicked",
- GTK_CLASS_TYPE (object_class),
+ G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTreeViewColumnClass, clicked),
NULL, NULL,
_gtk_marshal_VOID__VOID,
- GTK_TYPE_NONE, 0);
+ G_TYPE_NONE, 0);
g_object_class_install_property (object_class,
PROP_VISIBLE,
info->destroy = NULL;
d (info->func_data);
}
- gtk_tree_view_column_clear_attributes (tree_column, info->cell);
- g_object_unref (G_OBJECT (info->cell));
+ gtk_tree_view_column_clear_attributes_by_info (tree_column, info);
+ g_object_unref (info->cell);
g_free (info);
}
g_free (tree_column->title);
+ g_list_free (tree_column->cell_list);
+
+ if (tree_column->child)
+ g_object_unref (G_OBJECT (tree_column->child));
G_OBJECT_CLASS (parent_class)->finalize (object);
}
gtk_widget_set_parent_window (tree_column->button, tree_view->priv->header_window);
gtk_widget_set_parent (tree_column->button, GTK_WIDGET (tree_view));
- g_signal_connect (G_OBJECT (tree_column->button), "event",
+ g_signal_connect (tree_column->button, "event",
G_CALLBACK (gtk_tree_view_column_button_event),
- (gpointer) tree_column);
- g_signal_connect (G_OBJECT (tree_column->button), "clicked",
- (GtkSignalFunc) gtk_tree_view_column_button_clicked,
- (gpointer) tree_column);
+ tree_column);
+ g_signal_connect (tree_column->button, "clicked",
+ G_CALLBACK (gtk_tree_view_column_button_clicked),
+ tree_column);
tree_column->alignment = gtk_alignment_new (tree_column->xalign, 0.5, 0.0, 0.0);
gtk_widget_show (child);
}
- g_signal_connect (G_OBJECT (child), "mnemonic_activate",
+ g_signal_connect (child, "mnemonic_activate",
G_CALLBACK (gtk_tree_view_column_mnemonic_activate),
- (gpointer) tree_column);
+ tree_column);
if (tree_column->xalign <= 0.5)
gtk_box_pack_end (GTK_BOX (hbox), tree_column->arrow, FALSE, FALSE, 0);
* left otherwise; do this by packing boxes, so flipping text direction will
* reverse things
*/
- gtk_widget_ref (arrow);
+ g_object_ref (arrow);
gtk_container_remove (GTK_CONTAINER (hbox), arrow);
if (tree_column->xalign <= 0.5)
/* move it to the front */
gtk_box_reorder_child (GTK_BOX (hbox), arrow, 0);
}
- gtk_widget_unref (arrow);
+ g_object_unref (arrow);
if (tree_column->show_sort_indicator)
gtk_widget_show (arrow);
static void
gtk_tree_view_column_button_clicked (GtkWidget *widget, gpointer data)
{
- g_signal_emit_by_name (G_OBJECT (data), "clicked");
+ g_signal_emit_by_name (data, "clicked");
}
static gboolean
GtkSortType real_order;
if (tree_column->sort_column_changed_signal == 0)
- tree_column->sort_column_changed_signal =
- g_signal_connect (G_OBJECT (model), "sort_column_changed",
- GTK_SIGNAL_FUNC (gtk_tree_view_model_sort_column_changed),
- tree_column);
+ tree_column->sort_column_changed_signal =
+ g_signal_connect (model, "sort_column_changed",
+ G_CALLBACK (gtk_tree_view_model_sort_column_changed),
+ tree_column);
if (gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (model),
&real_sort_column_id,
GDK_POINTER_MOTION_HINT_MASK |
GDK_KEY_PRESS_MASK);
attributes_mask = GDK_WA_CURSOR | GDK_WA_X | GDK_WA_Y;
- attr.cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);
-
+ attr.cursor = gdk_cursor_new_for_display (gdk_drawable_get_display (tree_view->priv->header_window),
+ GDK_SB_H_DOUBLE_ARROW);
attr.y = 0;
attr.width = TREE_VIEW_DRAG_WIDTH;
attr.height = tree_view->priv->header_height;
column->window = NULL;
}
+void
+_gtk_tree_view_column_unset_model (GtkTreeViewColumn *column,
+ GtkTreeModel *old_model)
+{
+ if (column->sort_column_changed_signal)
+ {
+ g_signal_handler_disconnect (old_model,
+ column->sort_column_changed_signal);
+ column->sort_column_changed_signal = 0;
+ }
+}
+
void
_gtk_tree_view_column_set_tree_view (GtkTreeViewColumn *column,
GtkTreeView *tree_view)
gtk_tree_view_column_create_button (column);
column->property_changed_signal =
- g_signal_connect_swapped (GTK_OBJECT (tree_view),
+ g_signal_connect_swapped (tree_view,
"notify::model",
- GTK_SIGNAL_FUNC (gtk_tree_view_column_setup_sort_column_id_callback),
+ G_CALLBACK (gtk_tree_view_column_setup_sort_column_id_callback),
column);
gtk_tree_view_column_setup_sort_column_id_callback (column);
}
if (column->property_changed_signal)
{
- g_signal_handler_disconnect (G_OBJECT (column->tree_view), column->property_changed_signal);
+ g_signal_handler_disconnect (column->tree_view, column->property_changed_signal);
column->property_changed_signal = 0;
}
if (column->sort_column_changed_signal)
{
- g_signal_handler_disconnect (G_OBJECT (gtk_tree_view_get_model (GTK_TREE_VIEW (column->tree_view))),
+ g_signal_handler_disconnect (gtk_tree_view_get_model (GTK_TREE_VIEW (column->tree_view)),
column->sort_column_changed_signal);
column->sort_column_changed_signal = 0;
}
column->button = NULL;
}
+gboolean
+_gtk_tree_view_column_has_editable_cell (GtkTreeViewColumn *column)
+{
+ GList *list;
+
+ for (list = column->cell_list; list; list = list->next)
+ if (((GtkTreeViewColumnCellInfo *)list->data)->cell->mode ==
+ GTK_CELL_RENDERER_MODE_EDITABLE)
+ return TRUE;
+
+ return FALSE;
+}
+
+/* gets cell being edited */
+GtkCellRenderer *
+_gtk_tree_view_column_get_edited_cell (GtkTreeViewColumn *column)
+{
+ GList *list;
+
+ for (list = column->cell_list; list; list = list->next)
+ if (((GtkTreeViewColumnCellInfo *)list->data)->in_editing_mode)
+ return ((GtkTreeViewColumnCellInfo *)list->data)->cell;
+
+ return NULL;
+}
+
+gint
+_gtk_tree_view_column_count_special_cells (GtkTreeViewColumn *column)
+{
+ gint i = 0;
+ GList *list;
+
+ for (list = column->cell_list; list; list = list->next)
+ {
+ GtkTreeViewColumnCellInfo *cellinfo = list->data;
+
+ if (cellinfo->cell->mode == GTK_CELL_RENDERER_MODE_EDITABLE ||
+ cellinfo->cell->mode == GTK_CELL_RENDERER_MODE_ACTIVATABLE)
+ i++;
+ }
+
+ return i;
+}
+
+GtkCellRenderer *
+_gtk_tree_view_column_get_cell_at_pos (GtkTreeViewColumn *column,
+ gint x)
+{
+ GList *list;
+ gint current_x = 0;
+
+ list = gtk_tree_view_column_cell_first (column);
+ for (; list; list = gtk_tree_view_column_cell_next (column, list))
+ {
+ GtkTreeViewColumnCellInfo *cellinfo = list->data;
+ if (current_x <= x && x <= current_x + cellinfo->real_width)
+ return cellinfo->cell;
+ current_x += cellinfo->real_width;
+ }
+
+ return NULL;
+}
+
/* Public Functions */
{
GtkTreeViewColumn *tree_column;
- tree_column = GTK_TREE_VIEW_COLUMN (gtk_type_new (GTK_TYPE_TREE_VIEW_COLUMN));
+ tree_column = g_object_new (GTK_TYPE_TREE_VIEW_COLUMN, NULL);
return tree_column;
}
*
* Here's a simple example:
* <informalexample><programlisting>
- * <!>enum { TEXT_COLUMN, COLOR_COLUMN, N_COLUMNS };
- * <!>...
- * <!>{
- * <!> GtkTreeViewColumn *column;
- * <!> GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
- * <!>
- * <!> column = gtk_tree_view_column_new_with_attributes ("Title",
- * <!> renderer,
- * <!> "text", TEXT_COLUMN,
- * <!> "foreground", COLOR_COLUMN,
- * <!> NULL);
- * <!>}
+ * enum { TEXT_COLUMN, COLOR_COLUMN, N_COLUMNS };
+ * ...
+ * {
+ * GtkTreeViewColumn *column;
+ * GtkCellRenderer *renderer = gtk_cell_renderer_text_new (<!-- -->);
+ *
+ * column = gtk_tree_view_column_new_with_attributes ("Title",
+ * renderer,
+ * "text", TEXT_COLUMN,
+ * "foreground", COLOR_COLUMN,
+ * NULL);
+ * }
* </programlisting></informalexample>
*
* Return value: A newly created #GtkTreeViewColumn.
* @cell: The #GtkCellRenderer.
* @expand: %TRUE if @cell is to be given extra space allocated to box.
*
- * Packs the @cell into the beginning column. If @expand is %TRUE, then the
- * @cell is allocated a share of all available space that the @tree_column has.
+ * Packs the @cell into the beginning of the column. If @expand is FALSE, then
+ * the @cell is allocated no more space than it needs. Any unused space is divided
+ * evenly between cells for which @expand is TRUE.
**/
void
gtk_tree_view_column_pack_start (GtkTreeViewColumn *tree_column,
g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
g_return_if_fail (! gtk_tree_view_column_get_cell_info (tree_column, cell));
- g_object_ref (G_OBJECT (cell));
+ g_object_ref (cell);
gtk_object_sink (GTK_OBJECT (cell));
cell_info = g_new0 (GtkTreeViewColumnCellInfo, 1);
* @cell: The #GtkCellRenderer.
* @expand: %TRUE if @cell is to be given extra space allocated to box.
*
- * Packs the @cell into the column. If @expand is %TRUE, then the @cell is
- * allocated a share of all available space that the @tree_column has.
+ * Adds the @cell to end of the column. If @expand is FALSE, then the @cell
+ * is allocated no more space than it needs. Any unused space is divided
+ * evenly between cells for which @expand is TRUE.
**/
void
gtk_tree_view_column_pack_end (GtkTreeViewColumn *tree_column,
g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
g_return_if_fail (! gtk_tree_view_column_get_cell_info (tree_column, cell));
- g_object_ref (G_OBJECT (cell));
+ g_object_ref (cell);
gtk_object_sink (GTK_OBJECT (cell));
- cell_info = g_new (GtkTreeViewColumnCellInfo, 1);
+ cell_info = g_new0 (GtkTreeViewColumnCellInfo, 1);
cell_info->cell = cell;
cell_info->expand = expand ? TRUE : FALSE;
cell_info->pack = GTK_PACK_END;
{
GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *)list->data;
- g_object_unref (G_OBJECT (info->cell));
gtk_tree_view_column_clear_attributes (tree_column, info->cell);
+ g_object_unref (info->cell);
g_free (info);
}
GtkCellRenderer *cell_renderer)
{
GtkTreeViewColumnCellInfo *info;
- GSList *list;
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
g_return_if_fail (GTK_IS_CELL_RENDERER (cell_renderer));
+
info = gtk_tree_view_column_get_cell_info (tree_column, cell_renderer);
+ gtk_tree_view_column_clear_attributes_by_info (tree_column, info);
+}
+
+static void
+gtk_tree_view_column_clear_attributes_by_info (GtkTreeViewColumn *tree_column,
+ GtkTreeViewColumnCellInfo *info)
+{
+ GSList *list;
+
list = info->attributes;
while (list && list->next)
}
g_object_notify (G_OBJECT (tree_column), "min_width");
g_object_thaw_notify (G_OBJECT (tree_column));
+
+ if (tree_column->column_type == GTK_TREE_VIEW_COLUMN_AUTOSIZE)
+ _gtk_tree_view_column_autosize (GTK_TREE_VIEW (tree_column->tree_view),
+ tree_column);
}
/**
}
g_object_notify (G_OBJECT (tree_column), "max_width");
g_object_thaw_notify (G_OBJECT (tree_column));
+
+ if (tree_column->column_type == GTK_TREE_VIEW_COLUMN_AUTOSIZE)
+ _gtk_tree_view_column_autosize (GTK_TREE_VIEW (tree_column->tree_view),
+ tree_column);
}
/**
* gtk_tree_view_column_get_title:
* @tree_column: A #GtkTreeViewColumn.
*
- * Returns the title of the widget. This value should not be modified.
+ * Returns the title of the widget.
*
- * Return value: the title of the column.
+ * Return value: the title of the column. This string should not be
+ * modified or freed.
**/
G_CONST_RETURN gchar *
gtk_tree_view_column_get_title (GtkTreeViewColumn *tree_column)
if (widget)
{
- gtk_object_ref (GTK_OBJECT (widget));
+ g_object_ref (widget);
gtk_object_sink (GTK_OBJECT (widget));
}
if (tree_column->child)
- gtk_object_unref (GTK_OBJECT (tree_column->child));
+ g_object_unref (tree_column->child);
tree_column->child = widget;
gtk_tree_view_column_update_button (tree_column);
* gtk_tree_view_column_set_sort_column_id:
* @tree_column: a #GtkTreeViewColumn
* @sort_column_id: The @sort_column_id of the model to sort on.
- *
+ *
* Sets the logical @sort_column_id that this column sorts on when this column
* is selected for sorting. Doing so makes the column header clickable.
**/
{
if (tree_column->sort_clicked_signal)
{
- g_signal_handler_disconnect (G_OBJECT (tree_column), tree_column->sort_clicked_signal);
+ g_signal_handler_disconnect (tree_column, tree_column->sort_clicked_signal);
tree_column->sort_clicked_signal = 0;
}
if (tree_column->sort_column_changed_signal)
{
- g_signal_handler_disconnect (G_OBJECT (tree_column), tree_column->sort_column_changed_signal);
+ g_signal_handler_disconnect (tree_column, tree_column->sort_column_changed_signal);
tree_column->sort_column_changed_signal = 0;
}
gtk_tree_view_column_set_clickable (tree_column, TRUE);
if (! tree_column->sort_clicked_signal)
- tree_column->sort_clicked_signal = g_signal_connect (G_OBJECT (tree_column),
+ tree_column->sort_clicked_signal = g_signal_connect (tree_column,
"clicked",
G_CALLBACK (gtk_tree_view_column_sort),
NULL);
* @tree_column: a #GtkTreeViewColumn
*
* Gets the logical @sort_column_id that the model sorts on when this
- * column is selected for sorting. See gtk_tree_view_column_set_sort_column_id().
+ * column is selected for sorting.
+ * See gtk_tree_view_column_set_sort_column_id().
*
* Return value: the current @sort_column_id for this column, or -1 if
* this column can't be used for sorting.
* @is_expander: %TRUE, if the row has children
* @is_expanded: %TRUE, if the row has visible children
*
- * Sets the cell renderer based on the @tree_model and @tree_node. That is, for
+ * Sets the cell renderer based on the @tree_model and @iter. That is, for
* every attribute mapping in @tree_column, it will get a value from the set
- * column on the @tree_node, and use that value to set the attribute on the cell
+ * column on the @iter, and use that value to set the attribute on the cell
* renderer. This is used primarily by the #GtkTreeView.
**/
void
/**
* gtk_tree_view_column_cell_get_size:
* @tree_column: A #GtkTreeViewColumn.
- * @cell_area: The area a the column will be allocated, or %NULL
- * @x_offset: location to return x offset of cell relative to @cell_area, or %NULL
- * @y_offset: location to return y offset of cell relative to @cell_area, or %NULL
+ * @cell_area: The area a cell in the column will be allocated, or %NULL
+ * @x_offset: location to return x offset of a cell relative to @cell_area, or %NULL
+ * @y_offset: location to return y offset of a cell relative to @cell_area, or %NULL
* @width: location to return width needed to render a cell, or %NULL
* @height: location to return height needed to render a cell, or %NULL
*
{
GList *list;
GdkRectangle real_cell_area;
+ GdkRectangle real_background_area;
gint expand_cell_count = 0;
gint full_requested_width = 0;
gint extra_space;
gint min_x, min_y, max_x, max_y;
gint focus_line_width;
+ gint dx;
+ gint special_cells;
min_x = G_MAXINT;
min_y = G_MAXINT;
max_x = 0;
max_y = 0;
- real_cell_area = *cell_area;
+ special_cells = _gtk_tree_view_column_count_special_cells (tree_column);
+
+ if (special_cells > 1 && action == CELL_ACTION_FOCUS)
+ {
+ GtkTreeViewColumnCellInfo *info = NULL;
+ gboolean found_has_focus = FALSE;
+
+ /* one should have focus */
+ for (list = tree_column->cell_list; list; list = list->next)
+ {
+ info = list->data;
+ if (info && info->has_focus)
+ {
+ found_has_focus = TRUE;
+ break;
+ }
+ }
+
+ if (!found_has_focus)
+ {
+ /* give the first one focus */
+ info = gtk_tree_view_column_cell_first (tree_column)->data;
+ info->has_focus = TRUE;
+ }
+ }
gtk_widget_style_get (GTK_WIDGET (tree_column->tree_view),
"focus-line-width", &focus_line_width,
NULL);
- /* Find out how my extra space we have to allocate */
+
+ real_cell_area = *cell_area;
+ real_background_area = *background_area;
+ dx = real_cell_area.x - real_background_area.x - focus_line_width;
+
+ real_cell_area.x += focus_line_width;
+
+ /* Find out how many extra space we have to allocate */
for (list = tree_column->cell_list; list; list = list->next)
{
- GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *) list->data;
+ GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *)list->data;
if (! info->cell->visible)
continue;
full_requested_width += info->requested_width;
}
- extra_space = cell_area->width - full_requested_width;
+ extra_space = background_area->width - full_requested_width;
if (extra_space < 0)
extra_space = 0;
+ else if (extra_space > 0 && expand_cell_count > 0)
+ extra_space /= expand_cell_count;
+ /* iterate list for GTK_PACK_START cells */
for (list = tree_column->cell_list; list; list = list->next)
{
GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *) list->data;
if (! info->cell->visible)
continue;
- real_cell_area.width = info->requested_width +
+ if (info->has_focus)
+ flags |= GTK_CELL_RENDERER_FOCUSED;
+
+ real_background_area.width = info->requested_width +
(info->expand?extra_space:0);
- real_cell_area.x += focus_line_width;
+ info->real_width = real_background_area.width;
+
+ real_cell_area.width = real_background_area.width;
+ real_cell_area.width -= 2 * focus_line_width;
+
if (action == CELL_ACTION_RENDER)
{
gtk_cell_renderer_render (info->cell,
window,
tree_column->tree_view,
- background_area,
+ &real_background_area,
&real_cell_area,
expose_area,
flags);
&x_offset, &y_offset,
&width, &height);
- if (min_x > (real_cell_area.x + x_offset))
- min_x = real_cell_area.x + x_offset;
- if (max_x < real_cell_area.x + x_offset + width)
- max_x = real_cell_area.x + x_offset + width;
- if (min_y > (real_cell_area.y + y_offset))
- min_y = real_cell_area.y + y_offset;
- if (max_y < real_cell_area.y + y_offset + height)
- max_y = real_cell_area.y + y_offset + height;
+ if (special_cells > 1)
+ {
+ if (info->has_focus)
+ {
+ min_x = real_cell_area.x + x_offset;
+ max_x = min_x + width;
+ min_y = real_cell_area.y + y_offset;
+ max_y = min_y + height;
+ }
+ }
+ else
+ {
+ if (min_x > (real_cell_area.x + x_offset))
+ min_x = real_cell_area.x + x_offset;
+ if (max_x < real_cell_area.x + x_offset + width)
+ max_x = real_cell_area.x + x_offset + width;
+ if (min_y > (real_cell_area.y + y_offset))
+ min_y = real_cell_area.y + y_offset;
+ if (max_y < real_cell_area.y + y_offset + height)
+ max_y = real_cell_area.y + y_offset + height;
+ }
}
else if (action == CELL_ACTION_EVENT)
{
if (event)
{
- if (real_cell_area.x <= ((GdkEventButton *)event)->x &&
+ if (special_cells == 1)
+ {
+ /* only 1 activatable cell -> whole column can activate */
+ if (cell_area->x <= ((GdkEventButton *)event)->x &&
+ cell_area->x + cell_area->width > ((GdkEventButton *)event)->x)
+ try_event = TRUE;
+ }
+ else if (real_cell_area.x <= ((GdkEventButton *)event)->x &&
real_cell_area.x + real_cell_area.width > ((GdkEventButton *)event)->x)
+ /* only activate cell if the user clicked on an individual
+ * cell
+ */
try_event = TRUE;
}
- else /* if (info->has_focus)*/
- /* FIXME 73676: allow focusing individual cells */
- {
- try_event = TRUE;
- }
+ else if (special_cells > 1 && info->has_focus)
+ try_event = TRUE;
+ else if (special_cells == 1)
+ try_event = TRUE;
+
if (try_event)
{
gboolean visible, mode;
background_area,
cell_area,
flags))
- return TRUE;
+ {
+ flags &= ~GTK_CELL_RENDERER_FOCUSED;
+ return TRUE;
+ }
}
else if (visible && mode == GTK_CELL_RENDERER_MODE_EDITABLE)
{
if (*editable_widget != NULL)
{
g_return_val_if_fail (GTK_IS_CELL_EDITABLE (*editable_widget), FALSE);
+ info->in_editing_mode = TRUE;
+ gtk_tree_view_column_focus_cell (tree_column, info->cell);
+ flags &= ~GTK_CELL_RENDERER_FOCUSED;
+
return TRUE;
}
}
}
}
- real_cell_area.x += (info->requested_width + tree_column->spacing);
+
+ flags &= ~GTK_CELL_RENDERER_FOCUSED;
+
+ real_cell_area.x += (info->real_width + tree_column->spacing);
+ real_background_area.x += (info->real_width + tree_column->spacing);
}
+
+ /* iterate list for PACK_END cells */
for (list = g_list_last (tree_column->cell_list); list; list = list->prev)
{
GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *) list->data;
if (! info->cell->visible)
continue;
- real_cell_area.width = info->requested_width +
+ if (info->has_focus)
+ flags |= GTK_CELL_RENDERER_FOCUSED;
+
+ real_background_area.width = info->requested_width +
(info->expand?extra_space:0);
+ info->real_width = real_background_area.width;
+
+ real_cell_area.width = real_background_area.width;
+ real_cell_area.width -= 2 * focus_line_width;
+
if (action == CELL_ACTION_RENDER)
{
gtk_cell_renderer_render (info->cell,
window,
tree_column->tree_view,
- background_area,
+ &real_background_area,
&real_cell_area,
expose_area,
flags);
&x_offset, &y_offset,
&width, &height);
- if (min_x > (real_cell_area.x + x_offset))
- min_x = real_cell_area.x + x_offset;
- if (max_x < real_cell_area.x + x_offset + width)
- max_x = real_cell_area.x + x_offset + width;
- if (min_y > (real_cell_area.y + y_offset))
- min_y = real_cell_area.y + y_offset;
- if (max_y < real_cell_area.y + y_offset + height)
- max_y = real_cell_area.y + y_offset + height;
+ if (special_cells > 1)
+ {
+ if (info->has_focus)
+ {
+ min_x = real_cell_area.x + x_offset;
+ max_x = min_x + width;
+ min_y = real_cell_area.y + y_offset;
+ max_y = min_y + height;
+ }
+ }
+ else
+ {
+ if (min_x > (real_cell_area.x + x_offset))
+ min_x = real_cell_area.x + x_offset;
+ if (max_x < real_cell_area.x + x_offset + width)
+ max_x = real_cell_area.x + x_offset + width;
+ if (min_y > (real_cell_area.y + y_offset))
+ min_y = real_cell_area.y + y_offset;
+ if (max_y < real_cell_area.y + y_offset + height)
+ max_y = real_cell_area.y + y_offset + height;
+ }
+ }
+ else if (action == CELL_ACTION_EVENT)
+ {
+ gboolean try_event = FALSE;
+
+ if (event)
+ {
+ if (special_cells == 1)
+ {
+ /* only 1 activatable cell -> whole column can activate */
+ if (cell_area->x <= ((GdkEventButton *)event)->x &&
+ cell_area->x + cell_area->width > ((GdkEventButton *)event)->x)
+ try_event = TRUE;
+ }
+ else if (real_cell_area.x <= ((GdkEventButton *)event)->x &&
+ real_cell_area.x + real_cell_area.width > ((GdkEventButton *)event)->x)
+ /* only activate cell if the user clicked on an individual
+ * cell
+ */
+ try_event = TRUE;
+ }
+ else if (special_cells > 1 && info->has_focus)
+ try_event = TRUE;
+ else if (special_cells == 1)
+ try_event = TRUE;
+
+ if (try_event)
+ {
+ gboolean visible, mode;
+
+ g_object_get (G_OBJECT (info->cell),
+ "visible", &visible,
+ "mode", &mode,
+ NULL);
+ if (visible && mode == GTK_CELL_RENDERER_MODE_ACTIVATABLE)
+ {
+ if (gtk_cell_renderer_activate (info->cell,
+ event,
+ tree_column->tree_view,
+ path_string,
+ background_area,
+ cell_area,
+ flags))
+ {
+ flags &= ~GTK_CELL_RENDERER_FOCUSED;
+ return TRUE;
+ }
+ }
+ else if (visible && mode == GTK_CELL_RENDERER_MODE_EDITABLE)
+ {
+ *editable_widget =
+ gtk_cell_renderer_start_editing (info->cell,
+ event,
+ tree_column->tree_view,
+ path_string,
+ background_area,
+ cell_area,
+ flags);
+
+ if (*editable_widget != NULL)
+ {
+ g_return_val_if_fail (GTK_IS_CELL_EDITABLE (*editable_widget), FALSE);
+ info->in_editing_mode = TRUE;
+ gtk_tree_view_column_focus_cell (tree_column, info->cell);
+
+ flags &= ~GTK_CELL_RENDERER_FOCUSED;
+ return TRUE;
+ }
+ }
+ }
}
- real_cell_area.x += (info->requested_width + tree_column->spacing);
+
+ flags &= ~GTK_CELL_RENDERER_FOCUSED;
+
+ real_cell_area.x += (info->real_width + tree_column->spacing);
+ real_background_area.x += (info->real_width + tree_column->spacing);
}
+ /* fill focus_rectangle when required */
if (action == CELL_ACTION_FOCUS)
{
if (min_x >= max_x || min_y >= max_y)
path_string);
}
+/* cell list manipulation */
+static GList *
+gtk_tree_view_column_cell_first (GtkTreeViewColumn *tree_column)
+{
+ GList *list = tree_column->cell_list;
+
+ /* first GTK_PACK_START cell we find */
+ for ( ; list; list = list->next)
+ {
+ GtkTreeViewColumnCellInfo *info = list->data;
+ if (info->pack == GTK_PACK_START)
+ return list;
+ }
+
+ /* hmm, else the *last* GTK_PACK_END cell */
+ list = g_list_last (tree_column->cell_list);
+
+ for ( ; list; list = list->prev)
+ {
+ GtkTreeViewColumnCellInfo *info = list->data;
+ if (info->pack == GTK_PACK_END)
+ return list;
+ }
+
+ return NULL;
+}
+
+static GList *
+gtk_tree_view_column_cell_last (GtkTreeViewColumn *tree_column)
+{
+ GList *list = tree_column->cell_list;
+
+ /* *first* GTK_PACK_END cell we find */
+ for ( ; list ; list = list->next)
+ {
+ GtkTreeViewColumnCellInfo *info = list->data;
+ if (info->pack == GTK_PACK_END)
+ return list;
+ }
+
+ /* hmm, else the last GTK_PACK_START cell */
+ list = g_list_last (tree_column->cell_list);
+
+ for ( ; list; list = list->prev)
+ {
+ GtkTreeViewColumnCellInfo *info = list->data;
+ if (info->pack == GTK_PACK_START)
+ return list;
+ }
+
+ return NULL;
+}
+
+static GList *
+gtk_tree_view_column_cell_next (GtkTreeViewColumn *tree_column,
+ GList *current)
+{
+ GList *list;
+ GtkTreeViewColumnCellInfo *info = current->data;
+
+ if (info->pack == GTK_PACK_START)
+ {
+ for (list = current->next; list; list = list->next)
+ {
+ GtkTreeViewColumnCellInfo *inf = list->data;
+ if (inf->pack == GTK_PACK_START)
+ return list;
+ }
+
+ /* out of GTK_PACK_START cells, get *last* GTK_PACK_END one */
+ list = g_list_last (tree_column->cell_list);
+ for (; list; list = list->prev)
+ {
+ GtkTreeViewColumnCellInfo *inf = list->data;
+ if (inf->pack == GTK_PACK_END)
+ return list;
+ }
+ }
+
+ for (list = current->prev; list; list = list->prev)
+ {
+ GtkTreeViewColumnCellInfo *inf = list->data;
+ if (inf->pack == GTK_PACK_END)
+ return list;
+ }
+
+ return NULL;
+}
+
+static GList *
+gtk_tree_view_column_cell_prev (GtkTreeViewColumn *tree_column,
+ GList *current)
+{
+ GList *list;
+ GtkTreeViewColumnCellInfo *info = current->data;
+
+ if (info->pack == GTK_PACK_END)
+ {
+ for (list = current->next; list; list = list->next)
+ {
+ GtkTreeViewColumnCellInfo *inf = list->data;
+ if (inf->pack == GTK_PACK_END)
+ return list;
+ }
+
+ /* out of GTK_PACK_END, get last GTK_PACK_START one */
+ list = g_list_last (tree_column->cell_list);
+ for ( ; list; list = list->prev)
+ {
+ GtkTreeViewColumnCellInfo *inf = list->data;
+ if (inf->pack == GTK_PACK_START)
+ return list;
+ }
+ }
+
+ for (list = current->prev; list; list = list->prev)
+ {
+ GtkTreeViewColumnCellInfo *inf = list->data;
+ if (inf->pack == GTK_PACK_START)
+ return list;
+ }
+
+ return NULL;
+}
gboolean
_gtk_tree_view_column_cell_focus (GtkTreeViewColumn *tree_column,
- gint direction)
+ gint direction,
+ gboolean left,
+ gboolean right)
{
- /* FIXME 73676: allow focusing individual cells */
+ gint count;
+
+ count = _gtk_tree_view_column_count_special_cells (tree_column);
+
+ /* if we are the current focus column and have multiple editable cells,
+ * try to select the next one, else move the focus to the next column
+ */
if (GTK_TREE_VIEW (tree_column->tree_view)->priv->focus_column == tree_column)
- return FALSE;
+ {
+ if (count > 1)
+ {
+ GList *next, *prev;
+ GList *list = tree_column->cell_list;
+ GtkTreeViewColumnCellInfo *info = NULL;
+
+ /* find current focussed cell */
+ for ( ; list; list = list->next)
+ {
+ info = list->data;
+ if (info->has_focus)
+ break;
+ }
+
+ /* not a focussed cell in the focus column? */
+ if (!list || !info || !info->has_focus)
+ return FALSE;
+
+ next = gtk_tree_view_column_cell_next (tree_column, list);
+ prev = gtk_tree_view_column_cell_prev (tree_column, list);
+
+ info->has_focus = FALSE;
+ if (direction > 0 && next)
+ {
+ info = next->data;
+ info->has_focus = TRUE;
+ return TRUE;
+ }
+ else if (direction > 0 && !next && !right)
+ {
+ /* keep focus on latest cell */
+ info = gtk_tree_view_column_cell_last (tree_column)->data;
+ info->has_focus = TRUE;
+ return TRUE;
+ }
+ else if (direction < 0 && prev)
+ {
+ info = prev->data;
+ info->has_focus = TRUE;
+ return TRUE;
+ }
+ else if (direction < 0 && !prev && !left)
+ {
+ /* keep focus on first cell */
+ info = gtk_tree_view_column_cell_first (tree_column)->data;
+ info->has_focus = TRUE;
+ return TRUE;
+ }
+ }
+ return FALSE;
+ }
+
+ /* we get focus, if we have multiple editable cells, give the correct one
+ * focus
+ */
+ if (count > 1)
+ {
+ GList *list = tree_column->cell_list;
+
+ /* clear focus first */
+ for ( ; list ; list = list->next)
+ {
+ GtkTreeViewColumnCellInfo *info = list->data;
+ if (info->has_focus)
+ info->has_focus = FALSE;
+ }
+
+ if (direction > 0)
+ ((GtkTreeViewColumnCellInfo *)gtk_tree_view_column_cell_first (tree_column)->data)->has_focus = TRUE;
+ else if (direction < 0)
+ ((GtkTreeViewColumnCellInfo *)gtk_tree_view_column_cell_last (tree_column)->data)->has_focus = TRUE;
+ }
return TRUE;
}
{
GList *list;
+ g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), FALSE);
+
for (list = tree_column->cell_list; list; list = list->next)
{
GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *) list->data;
return FALSE;
}
+/**
+ * gtk_tree_view_column_focus_cell:
+ * @tree_column: A #GtkTreeViewColumn
+ * @cell: A #GtkCellRenderer
+ *
+ * Sets the current keyboard focus to be at @cell, if the column contains
+ * 2 or more editable and activatable cells.
+ *
+ * Since: 2.2
+ **/
+void
+gtk_tree_view_column_focus_cell (GtkTreeViewColumn *tree_column,
+ GtkCellRenderer *cell)
+{
+ GList *list;
+ gboolean found_cell = FALSE;
+
+ g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
+ g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
+
+ if (_gtk_tree_view_column_count_special_cells (tree_column) < 2)
+ return;
+
+ for (list = tree_column->cell_list; list; list = list->next)
+ {
+ GtkTreeViewColumnCellInfo *info = list->data;
+
+ if (info->cell == cell)
+ {
+ info->has_focus = TRUE;
+ found_cell = TRUE;
+ break;
+ }
+ }
+
+ if (found_cell)
+ {
+ for (list = tree_column->cell_list; list; list = list->next)
+ {
+ GtkTreeViewColumnCellInfo *info = list->data;
+
+ if (info->cell != cell)
+ info->has_focus = FALSE;
+ }
+
+ /* FIXME: redraw? */
+ }
+}
+
void
_gtk_tree_view_column_cell_set_dirty (GtkTreeViewColumn *tree_column,
gboolean install_handler)
void
_gtk_tree_view_column_stop_editing (GtkTreeViewColumn *tree_column)
{
+ GList *list;
+
g_return_if_fail (tree_column->editable_widget != NULL);
tree_column->editable_widget = NULL;
+ for (list = tree_column->cell_list; list; list = list->next)
+ ((GtkTreeViewColumnCellInfo *)list->data)->in_editing_mode = FALSE;
+}
+
+void
+_gtk_tree_view_column_get_neighbor_sizes (GtkTreeViewColumn *column,
+ GtkCellRenderer *cell,
+ gint *left,
+ gint *right)
+{
+ GList *list;
+
+ if (left)
+ {
+ *left = 0;
+ list = gtk_tree_view_column_cell_first (column);
+
+ for (; list; list = gtk_tree_view_column_cell_next (column, list))
+ {
+ GtkTreeViewColumnCellInfo *info =
+ (GtkTreeViewColumnCellInfo *)list->data;
+
+ if (info->cell == cell)
+ break;
+
+ *left += info->real_width;
+ }
+ }
+
+ if (right)
+ {
+ GList *next;
+
+ *right = 0;
+ list = gtk_tree_view_column_cell_first (column);
+
+ for (; list; list = gtk_tree_view_column_cell_next (column, list))
+ {
+ GtkTreeViewColumnCellInfo *info =
+ (GtkTreeViewColumnCellInfo *)list->data;
+
+ if (info->cell == cell)
+ break;
+ }
+
+ /* skip cell */
+ next = gtk_tree_view_column_cell_next (column, list);
+ if (list && next)
+ {
+ list = next;
+ for ( ; list; list = gtk_tree_view_column_cell_next (column, list))
+ {
+ GtkTreeViewColumnCellInfo *info =
+ (GtkTreeViewColumnCellInfo *)list->data;
+
+ *right += info->real_width;
+ }
+ }
+ }
+}
+
+gboolean
+gtk_tree_view_column_cell_get_position (GtkTreeViewColumn *tree_column,
+ GtkCellRenderer *cell_renderer,
+ gint *start_pos,
+ gint *width)
+{
+ GList *list;
+ gint current_x = 0;
+ gboolean found_cell = FALSE;
+ GtkTreeViewColumnCellInfo *cellinfo = NULL;
+
+ list = gtk_tree_view_column_cell_first (tree_column);
+ for (; list; list = gtk_tree_view_column_cell_next (tree_column, list))
+ {
+ cellinfo = list->data;
+ if (cellinfo->cell == cell_renderer)
+ {
+ found_cell = TRUE;
+ break;
+ }
+ current_x += cellinfo->real_width;
+ }
+
+ if (found_cell)
+ {
+ if (start_pos)
+ *start_pos = current_x;
+ if (width)
+ *width = cellinfo->real_width;
+ }
+
+ return found_cell;
}
projects / ~andy / gtk / blobdiff