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

Removed cell_layout implementation details in GtkTreeViewColumn in favor of cell_layout->get_area

Browse Source
This commit is contained in:
Tristan Van Berkom 2010-11-29 13:01:49 +09:00
parent 2394f5e49b
commit d3aed12b65
2 changed files with 80 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

226
gtk/gtktreeviewcolumn.c
View File

@ -97,30 +97,10 @@ static void gtk_tree_view_column_get_property (GObject
GValue *value, GValue *value,
GParamSpec *pspec); GParamSpec *pspec);
static void gtk_tree_view_column_finalize (GObject *object); static void gtk_tree_view_column_finalize (GObject *object);
static void gtk_tree_view_column_dispose (GObject *object);
/* GtkCellLayout implementation */ /* GtkCellLayout implementation */
static void gtk_tree_view_column_cell_layout_pack_start (GtkCellLayout *cell_layout, static GtkCellArea *gtk_tree_view_column_cell_layout_get_area (GtkCellLayout *cell_layout);
GtkCellRenderer *cell,
gboolean expand);
static void gtk_tree_view_column_cell_layout_pack_end (GtkCellLayout *cell_layout,
GtkCellRenderer *cell,
gboolean expand);
static void gtk_tree_view_column_cell_layout_clear (GtkCellLayout *cell_layout);
static void gtk_tree_view_column_cell_layout_add_attribute (GtkCellLayout *cell_layout,
GtkCellRenderer *cell,
const gchar *attribute,
gint column);
static void gtk_tree_view_column_cell_layout_set_cell_data_func (GtkCellLayout *cell_layout,
GtkCellRenderer *cell,
GtkCellLayoutDataFunc func,
gpointer func_data,
GDestroyNotify destroy);
static void gtk_tree_view_column_cell_layout_clear_attributes (GtkCellLayout *cell_layout,
GtkCellRenderer *cell);
static void gtk_tree_view_column_cell_layout_reorder (GtkCellLayout *cell_layout,
GtkCellRenderer *cell,
gint position);
static GList *gtk_tree_view_column_cell_layout_get_cells (GtkCellLayout *cell_layout);
/* Button handling code */ /* Button handling code */
static void gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column); static void gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column);
@ -140,6 +120,21 @@ static gboolean gtk_tree_view_column_mnemonic_activate (GtkWidget *widge
static void gtk_tree_view_model_sort_column_changed (GtkTreeSortable *sortable, static void gtk_tree_view_model_sort_column_changed (GtkTreeSortable *sortable,
GtkTreeViewColumn *tree_column); GtkTreeViewColumn *tree_column);
/* GtkCellArea/GtkCellAreaContext callbacks */
static void gtk_tree_view_column_context_changed (GtkCellAreaContext *context,
GParamSpec *pspec,
GtkTreeViewColumn *tree_column);
static void gtk_tree_view_column_add_editable_callback (GtkCellArea *area,
GtkCellRenderer *renderer,
GtkCellEditable *edit_widget,
GdkRectangle *cell_area,
const gchar *path_string,
gpointer user_data);
static void gtk_tree_view_column_remove_editable_callback (GtkCellArea *area,
GtkCellRenderer *renderer,
GtkCellEditable *edit_widget,
gpointer user_data);
/* Internal functions */ /* Internal functions */
static void gtk_tree_view_column_sort (GtkTreeViewColumn *tree_column, static void gtk_tree_view_column_sort (GtkTreeViewColumn *tree_column,
gpointer data); gpointer data);
@ -170,6 +165,7 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
class->clicked = NULL; class->clicked = NULL;
object_class->finalize = gtk_tree_view_column_finalize; object_class->finalize = gtk_tree_view_column_finalize;
object_class->dispose = gtk_tree_view_column_dispose;
object_class->set_property = gtk_tree_view_column_set_property; object_class->set_property = gtk_tree_view_column_set_property;
object_class->get_property = gtk_tree_view_column_get_property; object_class->get_property = gtk_tree_view_column_get_property;
@ -353,14 +349,7 @@ gtk_tree_view_column_buildable_init (GtkBuildableIface *iface)
static void static void
gtk_tree_view_column_cell_layout_init (GtkCellLayoutIface *iface) gtk_tree_view_column_cell_layout_init (GtkCellLayoutIface *iface)
{ {
iface->pack_start = gtk_tree_view_column_cell_layout_pack_start; iface->get_area = gtk_tree_view_column_cell_layout_get_area;
iface->pack_end = gtk_tree_view_column_cell_layout_pack_end;
iface->clear = gtk_tree_view_column_cell_layout_clear;
iface->add_attribute = gtk_tree_view_column_cell_layout_add_attribute;
iface->set_cell_data_func = gtk_tree_view_column_cell_layout_set_cell_data_func;
iface->clear_attributes = gtk_tree_view_column_cell_layout_clear_attributes;
iface->reorder = gtk_tree_view_column_cell_layout_reorder;
iface->get_cells = gtk_tree_view_column_cell_layout_get_cells;
} }
static void static void
@ -394,6 +383,39 @@ gtk_tree_view_column_init (GtkTreeViewColumn *tree_column)
tree_column->cell_area = gtk_cell_area_box_new (); tree_column->cell_area = gtk_cell_area_box_new ();
gtk_cell_area_set_style_detail (tree_column->cell_area, "treeview"); gtk_cell_area_set_style_detail (tree_column->cell_area, "treeview");
tree_column->cell_area_context = gtk_cell_area_create_context (tree_column->cell_area); tree_column->cell_area_context = gtk_cell_area_create_context (tree_column->cell_area);
tree_column->context_changed_signal =
g_signal_connect (tree_column->cell_area_context, "notify",
G_CALLBACK (gtk_tree_view_column_context_changed), tree_column);
}
static void
gtk_tree_view_column_dispose (GObject *object)
{
GtkTreeViewColumn *tree_column = (GtkTreeViewColumn *) object;
if (tree_column->cell_area_context)
{
g_object_unref (tree_column->cell_area_context);
g_signal_handler_disconnect (tree_column->cell_area_context,
tree_column->context_changed_signal);
tree_column->context_changed_signal = 0;
}
if (tree_column->cell_area)
{
g_object_unref (tree_column->cell_area);
}
if (tree_column->child)
{
g_object_unref (tree_column->child);
tree_column->child = NULL;
}
G_OBJECT_CLASS (gtk_tree_view_column_parent_class)->dispose (object);
} }
static void static void
@ -401,14 +423,8 @@ gtk_tree_view_column_finalize (GObject *object)
{ {
GtkTreeViewColumn *tree_column = (GtkTreeViewColumn *) object; GtkTreeViewColumn *tree_column = (GtkTreeViewColumn *) object;
g_object_unref (tree_column->cell_area_context);
g_object_unref (tree_column->cell_area);
g_free (tree_column->title); g_free (tree_column->title);
if (tree_column->child)
g_object_unref (tree_column->child);
G_OBJECT_CLASS (gtk_tree_view_column_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_tree_view_column_parent_class)->finalize (object);
} }
@ -615,111 +631,15 @@ gtk_tree_view_column_get_property (GObject *object,
/* Implementation of GtkCellLayout interface /* Implementation of GtkCellLayout interface
*/ */
static GtkCellArea *
static void gtk_tree_view_column_cell_layout_get_area (GtkCellLayout *cell_layout)
gtk_tree_view_column_cell_layout_pack_start (GtkCellLayout *cell_layout,
GtkCellRenderer *cell,
gboolean expand)
{ {
GtkTreeViewColumn *column; GtkTreeViewColumn *column;
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (cell_layout)); g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (cell_layout), NULL);
column = GTK_TREE_VIEW_COLUMN (cell_layout); column = GTK_TREE_VIEW_COLUMN (cell_layout);
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (column->cell_area), return column->cell_area;
cell, expand);
}
static void
gtk_tree_view_column_cell_layout_pack_end (GtkCellLayout *cell_layout,
GtkCellRenderer *cell,
gboolean expand)
{
GtkTreeViewColumn *column;
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (cell_layout));
column = GTK_TREE_VIEW_COLUMN (cell_layout);
gtk_cell_layout_pack_end (GTK_CELL_LAYOUT (column->cell_area),
cell, expand);
}
static void
gtk_tree_view_column_cell_layout_clear (GtkCellLayout *cell_layout)
{
GtkTreeViewColumn *column;
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (cell_layout));
column = GTK_TREE_VIEW_COLUMN (cell_layout);
gtk_cell_layout_clear (GTK_CELL_LAYOUT (column->cell_area));
}
static void
gtk_tree_view_column_cell_layout_add_attribute (GtkCellLayout *cell_layout,
GtkCellRenderer *cell,
const gchar *attribute,
gint column)
{
GtkTreeViewColumn *tree_column;
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (cell_layout));
tree_column = GTK_TREE_VIEW_COLUMN (cell_layout);
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (tree_column->cell_area),
cell, attribute, column);
if (tree_column->tree_view)
_gtk_tree_view_column_cell_set_dirty (tree_column, TRUE);
}
static void
gtk_tree_view_column_cell_layout_set_cell_data_func (GtkCellLayout *cell_layout,
GtkCellRenderer *cell,
GtkCellLayoutDataFunc func,
gpointer func_data,
GDestroyNotify destroy)
{
GtkTreeViewColumn *column;
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (cell_layout));
column = GTK_TREE_VIEW_COLUMN (cell_layout);
gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (column->cell_area),
cell, func, func_data, destroy);
if (column->tree_view)
_gtk_tree_view_column_cell_set_dirty (column, TRUE);
}
static void
gtk_tree_view_column_cell_layout_clear_attributes (GtkCellLayout *cell_layout,
GtkCellRenderer *cell_renderer)
{
GtkTreeViewColumn *column;
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (cell_layout));
column = GTK_TREE_VIEW_COLUMN (cell_layout);
gtk_cell_layout_clear_attributes (GTK_CELL_LAYOUT (column->cell_area),
cell_renderer);
}
static void
gtk_tree_view_column_cell_layout_reorder (GtkCellLayout *cell_layout,
GtkCellRenderer *cell,
gint position)
{
GtkTreeViewColumn *column;
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (cell_layout));
column = GTK_TREE_VIEW_COLUMN (cell_layout);
gtk_cell_layout_reorder (GTK_CELL_LAYOUT (column->cell_area),
cell, position);
if (column->tree_view)
gtk_widget_queue_draw (column->tree_view);
} }
/* Button handling code /* Button handling code
@ -1159,6 +1079,24 @@ gtk_tree_view_column_setup_sort_column_id_callback (GtkTreeViewColumn *tree_colu
} }
} }
static void
gtk_tree_view_column_context_changed (GtkCellAreaContext *context,
GParamSpec *pspec,
GtkTreeViewColumn *tree_column)
{
if (!strcmp (pspec->name, "minimum-width") ||
!strcmp (pspec->name, "natural-width") ||
!strcmp (pspec->name, "minimum-height") ||
!strcmp (pspec->name, "natural-height"))
{
/* XXX We want to do something specific if the size actually got cleared
* or if it just grew a little bit because of a data change and we
* are in GROW_ONLY mode.
*/
_gtk_tree_view_column_cell_set_dirty (tree_column, TRUE);
}
}
static void static void
gtk_tree_view_column_add_editable_callback (GtkCellArea *area, gtk_tree_view_column_add_editable_callback (GtkCellArea *area,
GtkCellRenderer *renderer, GtkCellRenderer *renderer,
@ -1473,14 +1411,6 @@ gtk_tree_view_column_clear (GtkTreeViewColumn *tree_column)
gtk_cell_layout_clear (GTK_CELL_LAYOUT (tree_column)); gtk_cell_layout_clear (GTK_CELL_LAYOUT (tree_column));
} }
static GList *
gtk_tree_view_column_cell_layout_get_cells (GtkCellLayout *layout)
{
GtkTreeViewColumn *tree_column = GTK_TREE_VIEW_COLUMN (layout);
return gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (tree_column->cell_area));
}
/** /**
* gtk_tree_view_column_add_attribute: * gtk_tree_view_column_add_attribute:
* @tree_column: A #GtkTreeViewColumn. * @tree_column: A #GtkTreeViewColumn.
@ -2492,7 +2422,8 @@ gtk_tree_view_column_cell_get_size (GtkTreeViewColumn *tree_column,
"focus-line-width", &focus_line_width, "focus-line-width", &focus_line_width,
NULL); NULL);
gtk_cell_area_context_sum_preferred_width (tree_column->cell_area_context); g_signal_handler_block (tree_column->cell_area_context,
tree_column->context_changed_signal);
gtk_cell_area_get_preferred_width (tree_column->cell_area, gtk_cell_area_get_preferred_width (tree_column->cell_area,
tree_column->cell_area_context, tree_column->cell_area_context,
@ -2505,6 +2436,9 @@ gtk_tree_view_column_cell_get_size (GtkTreeViewColumn *tree_column,
height, height,
NULL); NULL);
g_signal_handler_unblock (tree_column->cell_area_context,
tree_column->context_changed_signal);
} }
/** /**
@ -2690,8 +2624,6 @@ void
_gtk_tree_view_column_cell_set_dirty (GtkTreeViewColumn *tree_column, _gtk_tree_view_column_cell_set_dirty (GtkTreeViewColumn *tree_column,
gboolean install_handler) gboolean install_handler)
{ {
gtk_cell_area_context_reset (tree_column->cell_area_context);
tree_column->dirty = TRUE; tree_column->dirty = TRUE;
tree_column->requested_width = -1; tree_column->requested_width = -1;
tree_column->width = 0; tree_column->width = 0;

1
gtk/gtktreeviewcolumn.h
View File

@ -124,6 +124,7 @@ struct _GtkTreeViewColumn
gulong add_editable_signal; gulong add_editable_signal;
gulong remove_editable_signal; gulong remove_editable_signal;
gulong context_changed_signal;
/* Flags */ /* Flags */
guint GSEAL (visible) : 1; guint GSEAL (visible) : 1;