#include "gtkhbox.h"
#include "gtkmarshalers.h"
#include "gtkarrow.h"
+#include "gtkcellareacontext.h"
+#include "gtkcellareabox.h"
#include "gtkprivate.h"
#include "gtkintl.h"
*/
-enum
-{
- PROP_0,
- PROP_VISIBLE,
- PROP_RESIZABLE,
- PROP_WIDTH,
- PROP_SPACING,
- PROP_SIZING,
- PROP_FIXED_WIDTH,
- PROP_MIN_WIDTH,
- PROP_MAX_WIDTH,
- PROP_TITLE,
- PROP_EXPAND,
- PROP_CLICKABLE,
- PROP_WIDGET,
- PROP_ALIGNMENT,
- PROP_REORDERABLE,
- PROP_SORT_INDICATOR,
- PROP_SORT_ORDER,
- PROP_SORT_COLUMN_ID
-};
-
-enum
-{
- CLICKED,
- LAST_SIGNAL
-};
-
-typedef struct _GtkTreeViewColumnCellInfo GtkTreeViewColumnCellInfo;
-struct _GtkTreeViewColumnCellInfo
-{
- GtkCellRenderer *cell;
- GSList *attributes;
- GtkTreeCellDataFunc func;
- gpointer func_data;
- GDestroyNotify destroy;
- gint requested_width;
- gint real_width;
- guint expand : 1;
- guint pack : 1;
- guint has_focus : 1;
- guint in_editing_mode : 1;
-};
-
/* Type methods */
static void gtk_tree_view_column_cell_layout_init (GtkCellLayoutIface *iface);
GValue *value,
GParamSpec *pspec);
static void gtk_tree_view_column_finalize (GObject *object);
+static void gtk_tree_view_column_dispose (GObject *object);
+static GObject *gtk_tree_view_column_constructor (GType type,
+ guint n_construct_properties,
+ GObjectConstructParam *construct_properties);
/* GtkCellLayout implementation */
-static void gtk_tree_view_column_cell_layout_pack_start (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);
+static GtkCellArea *gtk_tree_view_column_cell_layout_get_area (GtkCellLayout *cell_layout);
/* Button handling code */
static void gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column);
static void gtk_tree_view_model_sort_column_changed (GtkTreeSortable *sortable,
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 */
static void gtk_tree_view_column_sort (GtkTreeViewColumn *tree_column,
gpointer data);
static void gtk_tree_view_column_set_attributesv (GtkTreeViewColumn *tree_column,
GtkCellRenderer *cell_renderer,
va_list args);
-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);
+
/* GtkBuildable implementation */
static void gtk_tree_view_column_buildable_init (GtkBuildableIface *iface);
+
+struct _GtkTreeViewColumnPrivate
+{
+ GtkWidget *tree_view;
+ GtkWidget *button;
+ GtkWidget *child;
+ GtkWidget *arrow;
+ GtkWidget *alignment;
+ GdkWindow *window;
+ gfloat xalign;
+ gulong property_changed_signal;
+
+ /* Sizing fields */
+ /* see gtk+/doc/tree-column-sizing.txt for more information on them */
+ GtkTreeViewColumnSizing column_type;
+ gint requested_width;
+ gint resized_width;
+ gint width;
+ gint fixed_width;
+ gint min_width;
+ gint max_width;
+
+ /* dragging columns */
+ gint drag_x;
+ gint drag_y;
+
+ gchar *title;
+
+ /* Sorting */
+ gulong sort_clicked_signal;
+ gulong sort_column_changed_signal;
+ gint sort_column_id;
+ GtkSortType sort_order;
+
+ /* Cell area */
+ GtkCellArea *cell_area;
+ GtkCellAreaContext *cell_area_context;
+ gulong add_editable_signal;
+ gulong remove_editable_signal;
+ gulong context_changed_signal;
+
+ /* Flags */
+ guint visible : 1;
+ guint resizable : 1;
+ guint clickable : 1;
+ guint dirty : 1;
+ guint show_sort_indicator : 1;
+ guint maybe_reordered : 1;
+ guint reorderable : 1;
+ guint use_resized_width : 1;
+ guint expand : 1;
+};
+
+enum
+{
+ PROP_0,
+ PROP_VISIBLE,
+ PROP_RESIZABLE,
+ PROP_WIDTH,
+ PROP_SPACING,
+ PROP_SIZING,
+ PROP_FIXED_WIDTH,
+ PROP_MIN_WIDTH,
+ PROP_MAX_WIDTH,
+ PROP_TITLE,
+ PROP_EXPAND,
+ PROP_CLICKABLE,
+ PROP_WIDGET,
+ PROP_ALIGNMENT,
+ PROP_REORDERABLE,
+ PROP_SORT_INDICATOR,
+ PROP_SORT_ORDER,
+ PROP_SORT_COLUMN_ID,
+ PROP_CELL_AREA
+};
+
+enum
+{
+ CLICKED,
+ LAST_SIGNAL
+};
+
static guint tree_column_signals[LAST_SIGNAL] = { 0 };
G_DEFINE_TYPE_WITH_CODE (GtkTreeViewColumn, gtk_tree_view_column, G_TYPE_INITIALLY_UNOWNED,
class->clicked = NULL;
+ object_class->constructor = gtk_tree_view_column_constructor;
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->get_property = gtk_tree_view_column_get_property;
G_MAXINT,
-1,
GTK_PARAM_READWRITE));
+
+ /**
+ * GtkTreeViewColumn:cell-area:
+ *
+ * The #GtkCellArea used to layout cell renderers for this column.
+ *
+ * Since: 3.0
+ */
+ g_object_class_install_property (object_class,
+ PROP_CELL_AREA,
+ g_param_spec_object ("cell-area",
+ P_("Cell Area"),
+ P_("The GtkCellArea used to layout cells"),
+ GTK_TYPE_CELL_AREA,
+ GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+ g_type_class_add_private (class, sizeof (GtkTreeViewColumnPrivate));
+}
+
+static void
+gtk_tree_view_column_custom_tag_end (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *tagname,
+ gpointer *data)
+{
+ /* Just ignore the boolean return from here */
+ _gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname, data);
}
static void
{
iface->add_child = _gtk_cell_layout_buildable_add_child;
iface->custom_tag_start = _gtk_cell_layout_buildable_custom_tag_start;
- iface->custom_tag_end = _gtk_cell_layout_buildable_custom_tag_end;
+ iface->custom_tag_end = gtk_tree_view_column_custom_tag_end;
}
static void
gtk_tree_view_column_cell_layout_init (GtkCellLayoutIface *iface)
{
- iface->pack_start = gtk_tree_view_column_cell_layout_pack_start;
- 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;
+ iface->get_area = gtk_tree_view_column_cell_layout_get_area;
}
static void
gtk_tree_view_column_init (GtkTreeViewColumn *tree_column)
{
- tree_column->button = NULL;
- tree_column->xalign = 0.0;
- tree_column->width = 0;
- tree_column->spacing = 0;
- tree_column->requested_width = -1;
- tree_column->min_width = -1;
- tree_column->max_width = -1;
- tree_column->resized_width = 0;
- tree_column->column_type = GTK_TREE_VIEW_COLUMN_GROW_ONLY;
- tree_column->visible = TRUE;
- tree_column->resizable = FALSE;
- tree_column->expand = FALSE;
- tree_column->clickable = FALSE;
- tree_column->dirty = TRUE;
- tree_column->sort_order = GTK_SORT_ASCENDING;
- tree_column->show_sort_indicator = FALSE;
- tree_column->property_changed_signal = 0;
- tree_column->sort_clicked_signal = 0;
- tree_column->sort_column_changed_signal = 0;
- tree_column->sort_column_id = -1;
- tree_column->reorderable = FALSE;
- tree_column->maybe_reordered = FALSE;
- tree_column->fixed_width = 1;
- tree_column->use_resized_width = FALSE;
- tree_column->title = g_strdup ("");
+ GtkTreeViewColumnPrivate *priv;
+
+ tree_column->priv = G_TYPE_INSTANCE_GET_PRIVATE (tree_column,
+ GTK_TYPE_TREE_VIEW_COLUMN,
+ GtkTreeViewColumnPrivate);
+ priv = tree_column->priv;
+
+ priv->button = NULL;
+ priv->xalign = 0.0;
+ priv->width = 0;
+ priv->requested_width = -1;
+ priv->min_width = -1;
+ priv->max_width = -1;
+ priv->resized_width = 0;
+ priv->column_type = GTK_TREE_VIEW_COLUMN_GROW_ONLY;
+ priv->visible = TRUE;
+ priv->resizable = FALSE;
+ priv->expand = FALSE;
+ priv->clickable = FALSE;
+ priv->dirty = TRUE;
+ priv->sort_order = GTK_SORT_ASCENDING;
+ priv->show_sort_indicator = FALSE;
+ priv->property_changed_signal = 0;
+ priv->sort_clicked_signal = 0;
+ priv->sort_column_changed_signal = 0;
+ priv->sort_column_id = -1;
+ priv->reorderable = FALSE;
+ priv->maybe_reordered = FALSE;
+ priv->fixed_width = 1;
+ priv->use_resized_width = FALSE;
+ priv->title = g_strdup ("");
}
-static void
-gtk_tree_view_column_finalize (GObject *object)
+static GObject *
+gtk_tree_view_column_constructor (GType type,
+ guint n_construct_properties,
+ GObjectConstructParam *construct_properties)
{
- GtkTreeViewColumn *tree_column = (GtkTreeViewColumn *) object;
- GList *list;
+ GtkTreeViewColumn *tree_column;
+ GtkTreeViewColumnPrivate *priv;
+ GObject *object;
+
+ object = G_OBJECT_CLASS (gtk_tree_view_column_parent_class)->constructor
+ (type, n_construct_properties, construct_properties);
+
+ tree_column = (GtkTreeViewColumn *) object;
+ priv = tree_column->priv;
- for (list = tree_column->cell_list; list; list = list->next)
+ if (!priv->cell_area)
{
- GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *) list->data;
+ priv->cell_area = gtk_cell_area_box_new ();
+ g_object_ref_sink (priv->cell_area);
+ }
- if (info->destroy)
- {
- GDestroyNotify d = info->destroy;
+ gtk_cell_area_set_style_detail (priv->cell_area, "treeview");
- info->destroy = NULL;
- d (info->func_data);
- }
- gtk_tree_view_column_clear_attributes_by_info (tree_column, info);
- g_object_unref (info->cell);
- g_free (info);
+ priv->add_editable_signal =
+ g_signal_connect (priv->cell_area, "add-editable",
+ G_CALLBACK (gtk_tree_view_column_add_editable_callback),
+ tree_column);
+ priv->remove_editable_signal =
+ g_signal_connect (priv->cell_area, "remove-editable",
+ G_CALLBACK (gtk_tree_view_column_remove_editable_callback),
+ tree_column);
+
+ priv->cell_area_context = gtk_cell_area_create_context (priv->cell_area);
+
+ priv->context_changed_signal =
+ g_signal_connect (priv->cell_area_context, "notify",
+ G_CALLBACK (gtk_tree_view_column_context_changed), tree_column);
+
+ return object;
+}
+
+static void
+gtk_tree_view_column_dispose (GObject *object)
+{
+ GtkTreeViewColumn *tree_column = (GtkTreeViewColumn *) object;
+ GtkTreeViewColumnPrivate *priv = tree_column->priv;
+
+ if (priv->cell_area_context)
+ {
+ g_signal_handler_disconnect (priv->cell_area_context,
+ priv->context_changed_signal);
+
+ g_object_unref (priv->cell_area_context);
+
+ priv->cell_area_context = NULL;
+ priv->context_changed_signal = 0;
+ }
+
+ if (priv->cell_area)
+ {
+ g_signal_handler_disconnect (priv->cell_area,
+ priv->add_editable_signal);
+ g_signal_handler_disconnect (priv->cell_area,
+ priv->remove_editable_signal);
+
+ g_object_unref (priv->cell_area);
+ priv->cell_area = NULL;
+ priv->add_editable_signal = 0;
+ priv->remove_editable_signal = 0;
+ }
+
+ if (priv->child)
+ {
+ g_object_unref (priv->child);
+ priv->child = NULL;
}
- g_free (tree_column->title);
- g_list_free (tree_column->cell_list);
+ G_OBJECT_CLASS (gtk_tree_view_column_parent_class)->dispose (object);
+}
+
+static void
+gtk_tree_view_column_finalize (GObject *object)
+{
+ GtkTreeViewColumn *tree_column = (GtkTreeViewColumn *) object;
+ GtkTreeViewColumnPrivate *priv = tree_column->priv;
- if (tree_column->child)
- g_object_unref (tree_column->child);
+ g_free (priv->title);
G_OBJECT_CLASS (gtk_tree_view_column_parent_class)->finalize (object);
}
GParamSpec *pspec)
{
GtkTreeViewColumn *tree_column;
+ GtkCellArea *area;
tree_column = GTK_TREE_VIEW_COLUMN (object);
gtk_tree_view_column_set_sort_column_id (tree_column,
g_value_get_int (value));
break;
+
+ case PROP_CELL_AREA:
+ /* Construct-only, can only be assigned once */
+ area = g_value_get_object (value);
+
+ if (area)
+ tree_column->priv->cell_area = g_object_ref_sink (area);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
g_value_set_int (value,
gtk_tree_view_column_get_sort_column_id (tree_column));
break;
+
+ case PROP_CELL_AREA:
+ g_value_set_object (value, tree_column->priv->cell_area);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
/* Implementation of GtkCellLayout interface
*/
-
-static void
-gtk_tree_view_column_cell_layout_pack_start (GtkCellLayout *cell_layout,
- GtkCellRenderer *cell,
- gboolean expand)
-{
- GtkTreeViewColumn *column;
- GtkTreeViewColumnCellInfo *cell_info;
-
- g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (cell_layout));
- column = GTK_TREE_VIEW_COLUMN (cell_layout);
- g_return_if_fail (! gtk_tree_view_column_get_cell_info (column, cell));
-
- g_object_ref_sink (cell);
-
- cell_info = g_new0 (GtkTreeViewColumnCellInfo, 1);
- cell_info->cell = cell;
- cell_info->expand = expand ? TRUE : FALSE;
- cell_info->pack = GTK_PACK_START;
- cell_info->has_focus = 0;
- cell_info->attributes = NULL;
-
- column->cell_list = g_list_append (column->cell_list, cell_info);
-}
-
-static void
-gtk_tree_view_column_cell_layout_pack_end (GtkCellLayout *cell_layout,
- GtkCellRenderer *cell,
- gboolean expand)
+static GtkCellArea *
+gtk_tree_view_column_cell_layout_get_area (GtkCellLayout *cell_layout)
{
- GtkTreeViewColumn *column;
- GtkTreeViewColumnCellInfo *cell_info;
+ GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN (cell_layout);
+ GtkTreeViewColumnPrivate *priv = column->priv;
- g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (cell_layout));
- column = GTK_TREE_VIEW_COLUMN (cell_layout);
- g_return_if_fail (! gtk_tree_view_column_get_cell_info (column, cell));
-
- g_object_ref_sink (cell);
-
- cell_info = g_new0 (GtkTreeViewColumnCellInfo, 1);
- cell_info->cell = cell;
- cell_info->expand = expand ? TRUE : FALSE;
- cell_info->pack = GTK_PACK_END;
- cell_info->has_focus = 0;
- cell_info->attributes = NULL;
-
- column->cell_list = g_list_append (column->cell_list, cell_info);
-}
-
-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);
-
- while (column->cell_list)
- {
- GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *)column->cell_list->data;
-
- gtk_tree_view_column_cell_layout_clear_attributes (cell_layout, info->cell);
- g_object_unref (info->cell);
- g_free (info);
- column->cell_list = g_list_delete_link (column->cell_list,
- column->cell_list);
- }
-}
-
-static void
-gtk_tree_view_column_cell_layout_add_attribute (GtkCellLayout *cell_layout,
- GtkCellRenderer *cell,
- const gchar *attribute,
- gint column)
-{
- GtkTreeViewColumn *tree_column;
- GtkTreeViewColumnCellInfo *info;
-
- g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (cell_layout));
- tree_column = GTK_TREE_VIEW_COLUMN (cell_layout);
-
- info = gtk_tree_view_column_get_cell_info (tree_column, cell);
- g_return_if_fail (info != NULL);
-
- info->attributes = g_slist_prepend (info->attributes, GINT_TO_POINTER (column));
- info->attributes = g_slist_prepend (info->attributes, g_strdup (attribute));
-
- 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;
- GtkTreeViewColumnCellInfo *info;
-
- g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (cell_layout));
- column = GTK_TREE_VIEW_COLUMN (cell_layout);
-
- info = gtk_tree_view_column_get_cell_info (column, cell);
- g_return_if_fail (info != NULL);
-
- if (info->destroy)
- {
- GDestroyNotify d = info->destroy;
-
- info->destroy = NULL;
- d (info->func_data);
- }
-
- info->func = (GtkTreeCellDataFunc)func;
- info->func_data = func_data;
- info->destroy = 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;
- GtkTreeViewColumnCellInfo *info;
-
- g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (cell_layout));
- column = GTK_TREE_VIEW_COLUMN (cell_layout);
-
- info = gtk_tree_view_column_get_cell_info (column, cell_renderer);
- if (info)
- gtk_tree_view_column_clear_attributes_by_info (column, info);
-}
-
-static void
-gtk_tree_view_column_cell_layout_reorder (GtkCellLayout *cell_layout,
- GtkCellRenderer *cell,
- gint position)
-{
- GList *link;
- GtkTreeViewColumn *column;
- GtkTreeViewColumnCellInfo *info;
-
- g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (cell_layout));
- column = GTK_TREE_VIEW_COLUMN (cell_layout);
-
- info = gtk_tree_view_column_get_cell_info (column, cell);
-
- g_return_if_fail (info != NULL);
- g_return_if_fail (position >= 0);
-
- link = g_list_find (column->cell_list, info);
-
- g_return_if_fail (link != NULL);
-
- column->cell_list = g_list_delete_link (column->cell_list, link);
- column->cell_list = g_list_insert (column->cell_list, info, position);
-
- if (column->tree_view)
- gtk_widget_queue_draw (column->tree_view);
-}
-
-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_free (list->data);
- list = list->next->next;
- }
- g_slist_free (info->attributes);
- info->attributes = NULL;
-
- if (tree_column->tree_view)
- _gtk_tree_view_column_cell_set_dirty (tree_column, TRUE);
+ return priv->cell_area;
}
-/* Helper functions
- */
-
/* Button handling code
*/
static void
gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column)
{
+ GtkTreeViewColumnPrivate *priv = tree_column->priv;
GtkTreeView *tree_view;
GtkWidget *child;
GtkWidget *hbox;
- tree_view = (GtkTreeView *) tree_column->tree_view;
+ tree_view = (GtkTreeView *) priv->tree_view;
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
- g_return_if_fail (tree_column->button == NULL);
+ g_return_if_fail (priv->button == NULL);
gtk_widget_push_composite_child ();
- tree_column->button = gtk_button_new ();
- gtk_widget_add_events (tree_column->button, GDK_POINTER_MOTION_MASK);
+ priv->button = gtk_button_new ();
+ gtk_widget_add_events (priv->button, GDK_POINTER_MOTION_MASK);
gtk_widget_pop_composite_child ();
/* make sure we own a reference to it as well. */
- if (tree_view->priv->header_window)
- gtk_widget_set_parent_window (tree_column->button, tree_view->priv->header_window);
- gtk_widget_set_parent (tree_column->button, GTK_WIDGET (tree_view));
+ if (_gtk_tree_view_get_header_window (tree_view))
+ gtk_widget_set_parent_window (priv->button, _gtk_tree_view_get_header_window (tree_view));
+
+ gtk_widget_set_parent (priv->button, GTK_WIDGET (tree_view));
- g_signal_connect (tree_column->button, "event",
+ g_signal_connect (priv->button, "event",
G_CALLBACK (gtk_tree_view_column_button_event),
tree_column);
- g_signal_connect (tree_column->button, "clicked",
+ g_signal_connect (priv->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);
+ priv->alignment = gtk_alignment_new (priv->xalign, 0.5, 0.0, 0.0);
- hbox = gtk_hbox_new (FALSE, 2);
- tree_column->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_IN);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+ priv->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_IN);
- if (tree_column->child)
- child = tree_column->child;
+ if (priv->child)
+ child = priv->child;
else
{
- child = gtk_label_new (tree_column->title);
+ child = gtk_label_new (priv->title);
gtk_widget_show (child);
}
G_CALLBACK (gtk_tree_view_column_mnemonic_activate),
tree_column);
- if (tree_column->xalign <= 0.5)
- gtk_box_pack_end (GTK_BOX (hbox), tree_column->arrow, FALSE, FALSE, 0);
+ if (priv->xalign <= 0.5)
+ gtk_box_pack_end (GTK_BOX (hbox), priv->arrow, FALSE, FALSE, 0);
else
- gtk_box_pack_start (GTK_BOX (hbox), tree_column->arrow, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), priv->arrow, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), tree_column->alignment, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), priv->alignment, TRUE, TRUE, 0);
- gtk_container_add (GTK_CONTAINER (tree_column->alignment), child);
- gtk_container_add (GTK_CONTAINER (tree_column->button), hbox);
+ gtk_container_add (GTK_CONTAINER (priv->alignment), child);
+ gtk_container_add (GTK_CONTAINER (priv->button), hbox);
gtk_widget_show (hbox);
- gtk_widget_show (tree_column->alignment);
+ gtk_widget_show (priv->alignment);
gtk_tree_view_column_update_button (tree_column);
}
static void
gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column)
{
+ GtkTreeViewColumnPrivate *priv = tree_column->priv;
gint sort_column_id = -1;
GtkWidget *hbox;
GtkWidget *alignment;
GtkArrowType arrow_type = GTK_ARROW_NONE;
GtkTreeModel *model;
- if (tree_column->tree_view)
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree_column->tree_view));
+ if (priv->tree_view)
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->tree_view));
else
model = NULL;
/* Create a button if necessary */
- if (tree_column->visible &&
- tree_column->button == NULL &&
- tree_column->tree_view &&
- gtk_widget_get_realized (tree_column->tree_view))
+ if (priv->visible &&
+ priv->button == NULL &&
+ priv->tree_view &&
+ gtk_widget_get_realized (priv->tree_view))
gtk_tree_view_column_create_button (tree_column);
- if (! tree_column->button)
+ if (! priv->button)
return;
- hbox = gtk_bin_get_child (GTK_BIN (tree_column->button));
- alignment = tree_column->alignment;
- arrow = tree_column->arrow;
+ hbox = gtk_bin_get_child (GTK_BIN (priv->button));
+ alignment = priv->alignment;
+ arrow = priv->arrow;
current_child = gtk_bin_get_child (GTK_BIN (alignment));
/* Set up the actual button */
- gtk_alignment_set (GTK_ALIGNMENT (alignment), tree_column->xalign,
+ gtk_alignment_set (GTK_ALIGNMENT (alignment), priv->xalign,
0.5, 0.0, 0.0);
- if (tree_column->child)
+ if (priv->child)
{
- if (current_child != tree_column->child)
+ if (current_child != priv->child)
{
gtk_container_remove (GTK_CONTAINER (alignment),
current_child);
gtk_container_add (GTK_CONTAINER (alignment),
- tree_column->child);
+ priv->child);
}
}
else
g_return_if_fail (GTK_IS_LABEL (current_child));
- if (tree_column->title)
+ if (priv->title)
gtk_label_set_text_with_mnemonic (GTK_LABEL (current_child),
- tree_column->title);
+ priv->title);
else
gtk_label_set_text_with_mnemonic (GTK_LABEL (current_child),
"");
&sort_column_id,
NULL);
- if (tree_column->show_sort_indicator)
+ if (priv->show_sort_indicator)
{
gboolean alternative;
- g_object_get (gtk_widget_get_settings (tree_column->tree_view),
+ g_object_get (gtk_widget_get_settings (priv->tree_view),
"gtk-alternative-sort-arrows", &alternative,
NULL);
- switch (tree_column->sort_order)
+ switch (priv->sort_order)
{
case GTK_SORT_ASCENDING:
arrow_type = alternative ? GTK_ARROW_UP : GTK_ARROW_DOWN;
g_object_ref (arrow);
gtk_container_remove (GTK_CONTAINER (hbox), arrow);
- if (tree_column->xalign <= 0.5)
+ if (priv->xalign <= 0.5)
{
gtk_box_pack_end (GTK_BOX (hbox), arrow, FALSE, FALSE, 0);
}
}
g_object_unref (arrow);
- if (tree_column->show_sort_indicator
- || (GTK_IS_TREE_SORTABLE (model) && tree_column->sort_column_id >= 0))
+ if (priv->show_sort_indicator
+ || (GTK_IS_TREE_SORTABLE (model) && priv->sort_column_id >= 0))
gtk_widget_show (arrow);
else
gtk_widget_hide (arrow);
/* It's always safe to hide the button. It isn't always safe to show it, as
* if you show it before it's realized, it'll get the wrong window. */
- if (tree_column->button &&
- tree_column->tree_view != NULL &&
- gtk_widget_get_realized (tree_column->tree_view))
+ if (priv->button &&
+ priv->tree_view != NULL &&
+ gtk_widget_get_realized (priv->tree_view))
{
- if (tree_column->visible)
+ if (priv->visible)
{
- gtk_widget_show_now (tree_column->button);
- if (tree_column->window)
+ gtk_widget_show_now (priv->button);
+ if (priv->window)
{
- if (tree_column->resizable)
+ if (priv->resizable)
{
- gdk_window_show (tree_column->window);
- gdk_window_raise (tree_column->window);
+ gdk_window_show (priv->window);
+ gdk_window_raise (priv->window);
}
else
{
- gdk_window_hide (tree_column->window);
+ gdk_window_hide (priv->window);
}
}
}
else
{
- gtk_widget_hide (tree_column->button);
- if (tree_column->window)
- gdk_window_hide (tree_column->window);
+ gtk_widget_hide (priv->button);
+ if (priv->window)
+ gdk_window_hide (priv->window);
}
}
- if (tree_column->reorderable || tree_column->clickable)
+ if (priv->reorderable || priv->clickable)
{
- gtk_widget_set_can_focus (tree_column->button, TRUE);
+ gtk_widget_set_can_focus (priv->button, TRUE);
}
else
{
- gtk_widget_set_can_focus (tree_column->button, FALSE);
- if (gtk_widget_has_focus (tree_column->button))
+ gtk_widget_set_can_focus (priv->button, FALSE);
+ if (gtk_widget_has_focus (priv->button))
{
- GtkWidget *toplevel = gtk_widget_get_toplevel (tree_column->tree_view);
+ GtkWidget *toplevel = gtk_widget_get_toplevel (priv->tree_view);
if (gtk_widget_is_toplevel (toplevel))
{
gtk_window_set_focus (GTK_WINDOW (toplevel), NULL);
/* Queue a resize on the assumption that we always want to catch all changes
* and columns don't change all that often.
*/
- if (gtk_widget_get_realized (tree_column->tree_view))
- gtk_widget_queue_resize (tree_column->tree_view);
+ if (gtk_widget_get_realized (priv->tree_view))
+ gtk_widget_queue_resize (priv->tree_view);
}
GdkEvent *event,
gpointer data)
{
- GtkTreeViewColumn *column = (GtkTreeViewColumn *) data;
+ GtkTreeViewColumn *column = (GtkTreeViewColumn *) data;
+ GtkTreeViewColumnPrivate *priv = column->priv;
g_return_val_if_fail (event != NULL, FALSE);
if (event->type == GDK_BUTTON_PRESS &&
- column->reorderable &&
+ priv->reorderable &&
((GdkEventButton *)event)->button == 1)
{
- column->maybe_reordered = TRUE;
- gdk_window_get_pointer (GTK_BUTTON (widget)->event_window,
- &column->drag_x,
- &column->drag_y,
+ priv->maybe_reordered = TRUE;
+ gdk_window_get_pointer (gtk_button_get_event_window (GTK_BUTTON (widget)),
+ &priv->drag_x,
+ &priv->drag_y,
NULL);
gtk_widget_grab_focus (widget);
}
if (event->type == GDK_BUTTON_RELEASE ||
event->type == GDK_LEAVE_NOTIFY)
- column->maybe_reordered = FALSE;
+ priv->maybe_reordered = FALSE;
if (event->type == GDK_MOTION_NOTIFY &&
- column->maybe_reordered &&
+ priv->maybe_reordered &&
(gtk_drag_check_threshold (widget,
- column->drag_x,
- column->drag_y,
+ priv->drag_x,
+ priv->drag_y,
(gint) ((GdkEventMotion *)event)->x,
(gint) ((GdkEventMotion *)event)->y)))
{
- column->maybe_reordered = FALSE;
- _gtk_tree_view_column_start_drag (GTK_TREE_VIEW (column->tree_view), column,
+ priv->maybe_reordered = FALSE;
+ _gtk_tree_view_column_start_drag (GTK_TREE_VIEW (priv->tree_view), column,
event->motion.device);
return TRUE;
}
- if (column->clickable == FALSE)
+
+ if (priv->clickable == FALSE)
{
switch (event->type)
{
gboolean group_cycling,
gpointer data)
{
- GtkTreeViewColumn *column = (GtkTreeViewColumn *)data;
+ GtkTreeViewColumn *column = (GtkTreeViewColumn *)data;
+ GtkTreeViewColumnPrivate *priv = column->priv;
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (column), FALSE);
- GTK_TREE_VIEW (column->tree_view)->priv->focus_column = column;
- if (column->clickable)
- gtk_button_clicked (GTK_BUTTON (column->button));
- else if (gtk_widget_get_can_focus (column->button))
- gtk_widget_grab_focus (column->button);
+ _gtk_tree_view_set_focus_column (GTK_TREE_VIEW (priv->tree_view), column);
+
+ if (priv->clickable)
+ gtk_button_clicked (GTK_BUTTON (priv->button));
+ else if (gtk_widget_get_can_focus (priv->button))
+ gtk_widget_grab_focus (priv->button);
else
- gtk_widget_grab_focus (column->tree_view);
+ gtk_widget_grab_focus (priv->tree_view);
return TRUE;
}
gtk_tree_view_model_sort_column_changed (GtkTreeSortable *sortable,
GtkTreeViewColumn *column)
{
+ GtkTreeViewColumnPrivate *priv = column->priv;
gint sort_column_id;
GtkSortType order;
&sort_column_id,
&order))
{
- if (sort_column_id == column->sort_column_id)
+ if (sort_column_id == priv->sort_column_id)
{
gtk_tree_view_column_set_sort_indicator (column, TRUE);
gtk_tree_view_column_set_sort_order (column, order);
gtk_tree_view_column_sort (GtkTreeViewColumn *tree_column,
gpointer data)
{
+ GtkTreeViewColumnPrivate *priv = tree_column->priv;
+ GtkTreeModel *model;
+ GtkTreeSortable *sortable;
gint sort_column_id;
GtkSortType order;
gboolean has_sort_column;
gboolean has_default_sort_func;
- g_return_if_fail (tree_column->tree_view != NULL);
+ g_return_if_fail (priv->tree_view != NULL);
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->tree_view));
+ sortable = GTK_TREE_SORTABLE (model);
has_sort_column =
- gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (GTK_TREE_VIEW (tree_column->tree_view)->priv->model),
+ gtk_tree_sortable_get_sort_column_id (sortable,
&sort_column_id,
&order);
has_default_sort_func =
- gtk_tree_sortable_has_default_sort_func (GTK_TREE_SORTABLE (GTK_TREE_VIEW (tree_column->tree_view)->priv->model));
+ gtk_tree_sortable_has_default_sort_func (sortable);
if (has_sort_column &&
- sort_column_id == tree_column->sort_column_id)
+ sort_column_id == priv->sort_column_id)
{
if (order == GTK_SORT_ASCENDING)
- gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (GTK_TREE_VIEW (tree_column->tree_view)->priv->model),
- tree_column->sort_column_id,
+ gtk_tree_sortable_set_sort_column_id (sortable,
+ priv->sort_column_id,
GTK_SORT_DESCENDING);
else if (order == GTK_SORT_DESCENDING && has_default_sort_func)
- gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (GTK_TREE_VIEW (tree_column->tree_view)->priv->model),
+ gtk_tree_sortable_set_sort_column_id (sortable,
GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
GTK_SORT_ASCENDING);
else
- gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (GTK_TREE_VIEW (tree_column->tree_view)->priv->model),
- tree_column->sort_column_id,
+ gtk_tree_sortable_set_sort_column_id (sortable,
+ priv->sort_column_id,
GTK_SORT_ASCENDING);
}
else
{
- gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (GTK_TREE_VIEW (tree_column->tree_view)->priv->model),
- tree_column->sort_column_id,
+ gtk_tree_sortable_set_sort_column_id (sortable,
+ priv->sort_column_id,
GTK_SORT_ASCENDING);
}
}
-
static void
gtk_tree_view_column_setup_sort_column_id_callback (GtkTreeViewColumn *tree_column)
{
+ GtkTreeViewColumnPrivate *priv = tree_column->priv;
GtkTreeModel *model;
- if (tree_column->tree_view == NULL)
+ if (priv->tree_view == NULL)
return;
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree_column->tree_view));
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->tree_view));
if (model == NULL)
return;
if (GTK_IS_TREE_SORTABLE (model) &&
- tree_column->sort_column_id != -1)
+ priv->sort_column_id != -1)
{
gint real_sort_column_id;
GtkSortType real_order;
- if (tree_column->sort_column_changed_signal == 0)
- tree_column->sort_column_changed_signal =
+ if (priv->sort_column_changed_signal == 0)
+ priv->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,
&real_order) &&
- (real_sort_column_id == tree_column->sort_column_id))
+ (real_sort_column_id == priv->sort_column_id))
{
gtk_tree_view_column_set_sort_indicator (tree_column, TRUE);
gtk_tree_view_column_set_sort_order (tree_column, real_order);
}
}
+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
+gtk_tree_view_column_add_editable_callback (GtkCellArea *area,
+ GtkCellRenderer *renderer,
+ GtkCellEditable *edit_widget,
+ GdkRectangle *cell_area,
+ const gchar *path_string,
+ gpointer user_data)
+{
+ GtkTreeViewColumn *column = user_data;
+ GtkTreeViewColumnPrivate *priv = column->priv;
+ GtkTreePath *path;
+
+ if (priv->tree_view)
+ {
+ path = gtk_tree_path_new_from_string (path_string);
+
+ _gtk_tree_view_add_editable (GTK_TREE_VIEW (priv->tree_view),
+ column,
+ path,
+ edit_widget,
+ cell_area);
+
+ gtk_tree_path_free (path);
+ }
+}
+
+static void
+gtk_tree_view_column_remove_editable_callback (GtkCellArea *area,
+ GtkCellRenderer *renderer,
+ GtkCellEditable *edit_widget,
+ gpointer user_data)
+{
+ GtkTreeViewColumn *column = user_data;
+ GtkTreeViewColumnPrivate *priv = column->priv;
+
+ if (priv->tree_view)
+ _gtk_tree_view_remove_editable (GTK_TREE_VIEW (priv->tree_view),
+ column,
+ edit_widget);
+}
/* Exported Private Functions.
* These should only be called by gtktreeview.c or gtktreeviewcolumn.c
*/
-
void
_gtk_tree_view_column_realize_button (GtkTreeViewColumn *column)
{
+ GtkTreeViewColumnPrivate *priv = column->priv;
GtkAllocation allocation;
GtkTreeView *tree_view;
GdkWindowAttr attr;
guint attributes_mask;
gboolean rtl;
- tree_view = (GtkTreeView *)column->tree_view;
- rtl = (gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_RTL);
+ tree_view = (GtkTreeView *)priv->tree_view;
+ rtl = (gtk_widget_get_direction (priv->tree_view) == GTK_TEXT_DIR_RTL);
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
- g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (tree_view)));
- g_return_if_fail (tree_view->priv->header_window != NULL);
- g_return_if_fail (column->button != NULL);
+ g_return_if_fail (gtk_widget_get_realized (priv->tree_view));
+ g_return_if_fail (priv->button != NULL);
- gtk_widget_set_parent_window (column->button, tree_view->priv->header_window);
+ g_return_if_fail (_gtk_tree_view_get_header_window (tree_view) != NULL);
+ gtk_widget_set_parent_window (priv->button, _gtk_tree_view_get_header_window (tree_view));
- if (column->visible)
- gtk_widget_show (column->button);
+ if (priv->visible)
+ gtk_widget_show (priv->button);
attr.window_type = GDK_WINDOW_CHILD;
attr.wclass = GDK_INPUT_ONLY;
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_for_display (gdk_window_get_display (tree_view->priv->header_window),
- GDK_SB_H_DOUBLE_ARROW);
+ attr.cursor = gdk_cursor_new_for_display
+ (gdk_window_get_display (_gtk_tree_view_get_header_window (tree_view)), GDK_SB_H_DOUBLE_ARROW);
attr.y = 0;
attr.width = TREE_VIEW_DRAG_WIDTH;
- attr.height = tree_view->priv->header_height;
+ attr.height = _gtk_tree_view_get_header_height (tree_view);
- gtk_widget_get_allocation (column->button, &allocation);
- attr.x = (allocation.x + (rtl ? 0 : allocation.width)) - TREE_VIEW_DRAG_WIDTH / 2;
- column->window = gdk_window_new (tree_view->priv->header_window,
- &attr, attributes_mask);
- gdk_window_set_user_data (column->window, tree_view);
+ gtk_widget_get_allocation (priv->button, &allocation);
+ attr.x = (allocation.x + (rtl ? 0 : allocation.width)) - TREE_VIEW_DRAG_WIDTH / 2;
+ priv->window = gdk_window_new (_gtk_tree_view_get_header_window (tree_view),
+ &attr, attributes_mask);
+ gdk_window_set_user_data (priv->window, tree_view);
gtk_tree_view_column_update_button (column);
void
_gtk_tree_view_column_unrealize_button (GtkTreeViewColumn *column)
{
+ GtkTreeViewColumnPrivate *priv;
+
g_return_if_fail (column != NULL);
- g_return_if_fail (column->window != NULL);
- gdk_window_set_user_data (column->window, NULL);
- gdk_window_destroy (column->window);
- column->window = NULL;
+ priv = column->priv;
+ g_return_if_fail (priv->window != NULL);
+
+ gdk_window_set_user_data (priv->window, NULL);
+ gdk_window_destroy (priv->window);
+ priv->window = NULL;
}
void
_gtk_tree_view_column_unset_model (GtkTreeViewColumn *column,
GtkTreeModel *old_model)
{
- if (column->sort_column_changed_signal)
+ GtkTreeViewColumnPrivate *priv = column->priv;
+
+ if (priv->sort_column_changed_signal)
{
g_signal_handler_disconnect (old_model,
- column->sort_column_changed_signal);
- column->sort_column_changed_signal = 0;
+ priv->sort_column_changed_signal);
+ priv->sort_column_changed_signal = 0;
}
gtk_tree_view_column_set_sort_indicator (column, FALSE);
}
_gtk_tree_view_column_set_tree_view (GtkTreeViewColumn *column,
GtkTreeView *tree_view)
{
- g_assert (column->tree_view == NULL);
+ GtkTreeViewColumnPrivate *priv = column->priv;
+
+ g_assert (priv->tree_view == NULL);
- column->tree_view = GTK_WIDGET (tree_view);
+ priv->tree_view = GTK_WIDGET (tree_view);
gtk_tree_view_column_create_button (column);
- column->property_changed_signal =
- g_signal_connect_swapped (tree_view,
- "notify::model",
- G_CALLBACK (gtk_tree_view_column_setup_sort_column_id_callback),
- column);
+ priv->property_changed_signal =
+ g_signal_connect_swapped (tree_view,
+ "notify::model",
+ G_CALLBACK (gtk_tree_view_column_setup_sort_column_id_callback),
+ column);
gtk_tree_view_column_setup_sort_column_id_callback (column);
}
void
_gtk_tree_view_column_unset_tree_view (GtkTreeViewColumn *column)
{
- if (column->tree_view && column->button)
+ GtkTreeViewColumnPrivate *priv = column->priv;
+
+ if (priv->tree_view && priv->button)
{
- gtk_container_remove (GTK_CONTAINER (column->tree_view), column->button);
+ gtk_container_remove (GTK_CONTAINER (priv->tree_view), priv->button);
}
- if (column->property_changed_signal)
+ if (priv->property_changed_signal)
{
- g_signal_handler_disconnect (column->tree_view, column->property_changed_signal);
- column->property_changed_signal = 0;
+ g_signal_handler_disconnect (priv->tree_view, priv->property_changed_signal);
+ priv->property_changed_signal = 0;
}
- if (column->sort_column_changed_signal)
+ if (priv->sort_column_changed_signal)
{
- 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;
+ g_signal_handler_disconnect (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->tree_view)),
+ priv->sort_column_changed_signal);
+ priv->sort_column_changed_signal = 0;
}
- column->tree_view = NULL;
- column->button = NULL;
+ priv->tree_view = NULL;
+ priv->button = NULL;
}
gboolean
_gtk_tree_view_column_has_editable_cell (GtkTreeViewColumn *column)
{
- GtkCellRenderer *cell;
- GtkCellRendererMode mode;
- GList *list;
+ GtkTreeViewColumnPrivate *priv = column->priv;
+ gboolean ret = FALSE;
+ GList *list, *cells;
- for (list = column->cell_list; list; list = list->next)
+ cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (priv->cell_area));
+
+ for (list = cells; list; list = list->next)
{
- cell = ((GtkTreeViewColumnCellInfo *)list->data)->cell;
+ GtkCellRenderer *cell = list->data;
+ GtkCellRendererMode mode;
+
g_object_get (cell, "mode", &mode, NULL);
+
if (mode == GTK_CELL_RENDERER_MODE_EDITABLE)
- return TRUE;
+ {
+ ret = TRUE;
+ break;
+ }
}
- return FALSE;
+ g_list_free (cells);
+
+ return ret;
}
/* 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)
- {
- GtkCellRendererMode mode;
- GtkTreeViewColumnCellInfo *cellinfo = list->data;
-
- g_object_get (cellinfo->cell, "mode", &mode, NULL);
- if ((mode == GTK_CELL_RENDERER_MODE_EDITABLE ||
- mode == GTK_CELL_RENDERER_MODE_ACTIVATABLE) &&
- gtk_cell_renderer_get_visible (cellinfo->cell))
- 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;
- }
+ GtkTreeViewColumnPrivate *priv = column->priv;
- return NULL;
+ return gtk_cell_area_get_edited_cell (priv->cell_area);
}
/* Public Functions */
return retval;
}
-static GtkTreeViewColumnCellInfo *
-gtk_tree_view_column_get_cell_info (GtkTreeViewColumn *tree_column,
- GtkCellRenderer *cell_renderer)
-{
- GList *list;
- for (list = tree_column->cell_list; list; list = list->next)
- if (((GtkTreeViewColumnCellInfo *)list->data)->cell == cell_renderer)
- return (GtkTreeViewColumnCellInfo *) list->data;
- return NULL;
-}
-
-
/**
* gtk_tree_view_column_pack_start:
* @tree_column: A #GtkTreeViewColumn.
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);
- GList *retval = NULL, *list;
-
- g_return_val_if_fail (tree_column != NULL, NULL);
-
- for (list = tree_column->cell_list; list; list = list->next)
- {
- GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *)list->data;
-
- retval = g_list_append (retval, info->cell);
- }
-
- return retval;
-}
-
/**
* gtk_tree_view_column_add_attribute:
* @tree_column: A #GtkTreeViewColumn.
GtkCellRenderer *cell_renderer,
va_list args)
{
+ GtkTreeViewColumnPrivate *priv = tree_column->priv;
gchar *attribute;
gint column;
attribute = va_arg (args, gchar *);
- gtk_tree_view_column_clear_attributes (tree_column, cell_renderer);
+ gtk_cell_layout_clear_attributes (GTK_CELL_LAYOUT (priv->cell_area),
+ cell_renderer);
while (attribute != NULL)
{
column = va_arg (args, gint);
- gtk_tree_view_column_add_attribute (tree_column, cell_renderer, attribute, column);
+ gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (priv->cell_area),
+ cell_renderer, attribute, column);
attribute = va_arg (args, gchar *);
}
}
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
g_return_if_fail (GTK_IS_CELL_RENDERER (cell_renderer));
- g_return_if_fail (gtk_tree_view_column_get_cell_info (tree_column, cell_renderer));
va_start (args, cell_renderer);
gtk_tree_view_column_set_attributesv (tree_column, cell_renderer, args);
gtk_tree_view_column_set_spacing (GtkTreeViewColumn *tree_column,
gint spacing)
{
+ GtkTreeViewColumnPrivate *priv;
+
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
g_return_if_fail (spacing >= 0);
- if (tree_column->spacing == spacing)
- return;
+ priv = tree_column->priv;
- tree_column->spacing = spacing;
- if (tree_column->tree_view)
+ gtk_cell_area_box_set_spacing (GTK_CELL_AREA_BOX (priv->cell_area),
+ spacing);
+ if (priv->tree_view)
_gtk_tree_view_column_cell_set_dirty (tree_column, TRUE);
}
gint
gtk_tree_view_column_get_spacing (GtkTreeViewColumn *tree_column)
{
+ GtkTreeViewColumnPrivate *priv;
+
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), 0);
- return tree_column->spacing;
+ priv = tree_column->priv;
+
+ return gtk_cell_area_box_get_spacing (GTK_CELL_AREA_BOX (priv->cell_area));
}
/* Options for manipulating the columns */
gtk_tree_view_column_set_visible (GtkTreeViewColumn *tree_column,
gboolean visible)
{
+ GtkTreeViewColumnPrivate *priv;
+
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
+ priv = tree_column->priv;
visible = !! visible;
- if (tree_column->visible == visible)
+ if (priv->visible == visible)
return;
- tree_column->visible = visible;
+ priv->visible = visible;
- if (tree_column->visible)
+ if (priv->visible)
_gtk_tree_view_column_cell_set_dirty (tree_column, TRUE);
gtk_tree_view_column_update_button (tree_column);
{
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), FALSE);
- return tree_column->visible;
+ return tree_column->priv->visible;
}
/**
gtk_tree_view_column_set_resizable (GtkTreeViewColumn *tree_column,
gboolean resizable)
{
+ GtkTreeViewColumnPrivate *priv;
+
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
+ priv = tree_column->priv;
resizable = !! resizable;
- if (tree_column->resizable == resizable)
+ if (priv->resizable == resizable)
return;
- tree_column->resizable = resizable;
+ priv->resizable = resizable;
- if (resizable && tree_column->column_type == GTK_TREE_VIEW_COLUMN_AUTOSIZE)
+ if (resizable && priv->column_type == GTK_TREE_VIEW_COLUMN_AUTOSIZE)
gtk_tree_view_column_set_sizing (tree_column, GTK_TREE_VIEW_COLUMN_GROW_ONLY);
gtk_tree_view_column_update_button (tree_column);
{
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), FALSE);
- return tree_column->resizable;
+ return tree_column->priv->resizable;
}
gtk_tree_view_column_set_sizing (GtkTreeViewColumn *tree_column,
GtkTreeViewColumnSizing type)
{
+ GtkTreeViewColumnPrivate *priv;
+
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
- if (type == tree_column->column_type)
+ priv = tree_column->priv;
+
+ if (type == priv->column_type)
return;
if (type == GTK_TREE_VIEW_COLUMN_AUTOSIZE)
/* I was clearly on crack when I wrote this. I'm not sure what's supposed to
* be below so I'll leave it until I figure it out.
*/
- if (tree_column->column_type == GTK_TREE_VIEW_COLUMN_AUTOSIZE &&
- tree_column->requested_width != -1)
+ if (priv->column_type == GTK_TREE_VIEW_COLUMN_AUTOSIZE &&
+ priv->requested_width != -1)
{
- gtk_tree_view_column_set_sizing (tree_column, tree_column->requested_width);
+ gtk_tree_view_column_set_sizing (tree_column, priv->requested_width);
}
#endif
- tree_column->column_type = type;
+ priv->column_type = type;
gtk_tree_view_column_update_button (tree_column);
{
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), 0);
- return tree_column->column_type;
+ return tree_column->priv->column_type;
}
/**
{
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), 0);
- return tree_column->width;
+ return tree_column->priv->width;
+}
+
+gint
+_gtk_tree_view_column_request_width (GtkTreeViewColumn *tree_column)
+{
+ GtkTreeViewColumnPrivate *priv;
+ gint real_requested_width;
+
+ priv = tree_column->priv;
+
+ if (priv->use_resized_width)
+ {
+ real_requested_width = priv->resized_width;
+ }
+ else if (priv->column_type == GTK_TREE_VIEW_COLUMN_FIXED)
+ {
+ real_requested_width = priv->fixed_width;
+ }
+ else if (gtk_tree_view_get_headers_visible (GTK_TREE_VIEW (priv->tree_view)))
+ {
+ gint button_request;
+
+ gtk_widget_get_preferred_width (priv->button, &button_request, NULL);
+ real_requested_width = MAX (priv->requested_width, button_request);
+ }
+ else
+ {
+ real_requested_width = priv->requested_width;
+ if (real_requested_width < 0)
+ real_requested_width = 0;
+ }
+
+ if (priv->min_width != -1)
+ real_requested_width = MAX (real_requested_width, priv->min_width);
+
+ if (priv->max_width != -1)
+ real_requested_width = MIN (real_requested_width, priv->max_width);
+
+ return real_requested_width;
+}
+
+void
+_gtk_tree_view_column_allocate (GtkTreeViewColumn *tree_column,
+ int x_offset,
+ int width,
+ int cell_width)
+{
+ GtkTreeViewColumnPrivate *priv;
+ GtkAllocation allocation;
+ gboolean rtl;
+
+ g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
+
+ priv = tree_column->priv;
+
+ priv->width = width;
+
+ gtk_cell_area_context_allocate (priv->cell_area_context, cell_width, -1);
+
+ allocation.x = x_offset;
+ allocation.y = 0;
+ allocation.width = width;
+ allocation.height = _gtk_tree_view_get_header_height (GTK_TREE_VIEW (priv->tree_view));
+
+ gtk_widget_size_allocate (priv->button, &allocation);
+
+ if (priv->window)
+ {
+ rtl = (gtk_widget_get_direction (priv->tree_view) == GTK_TEXT_DIR_RTL);
+ gdk_window_move_resize (priv->window,
+ allocation.x + (rtl ? 0 : allocation.width) - TREE_VIEW_DRAG_WIDTH/2,
+ allocation.y,
+ TREE_VIEW_DRAG_WIDTH, allocation.height);
+ }
+
+ g_object_notify (G_OBJECT (tree_column), "width");
}
/**
gtk_tree_view_column_set_fixed_width (GtkTreeViewColumn *tree_column,
gint fixed_width)
{
+ GtkTreeViewColumnPrivate *priv;
+
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
g_return_if_fail (fixed_width > 0);
- tree_column->fixed_width = fixed_width;
- tree_column->use_resized_width = FALSE;
+ priv = tree_column->priv;
+
+ priv->fixed_width = fixed_width;
+ priv->use_resized_width = FALSE;
- if (tree_column->tree_view &&
- gtk_widget_get_realized (tree_column->tree_view) &&
- tree_column->column_type == GTK_TREE_VIEW_COLUMN_FIXED)
+ if (priv->tree_view &&
+ gtk_widget_get_realized (priv->tree_view) &&
+ priv->column_type == GTK_TREE_VIEW_COLUMN_FIXED)
{
- gtk_widget_queue_resize (tree_column->tree_view);
+ gtk_widget_queue_resize (priv->tree_view);
}
g_object_notify (G_OBJECT (tree_column), "fixed-width");
{
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), 0);
- return tree_column->fixed_width;
+ return tree_column->priv->fixed_width;
}
/**
gtk_tree_view_column_set_min_width (GtkTreeViewColumn *tree_column,
gint min_width)
{
+ GtkTreeViewColumnPrivate *priv;
+
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
g_return_if_fail (min_width >= -1);
- if (min_width == tree_column->min_width)
+ priv = tree_column->priv;
+
+ if (min_width == priv->min_width)
return;
- if (tree_column->visible &&
- tree_column->tree_view != NULL &&
- gtk_widget_get_realized (tree_column->tree_view))
+ if (priv->visible &&
+ priv->tree_view != NULL &&
+ gtk_widget_get_realized (priv->tree_view))
{
- if (min_width > tree_column->width)
- gtk_widget_queue_resize (tree_column->tree_view);
+ if (min_width > priv->width)
+ gtk_widget_queue_resize (priv->tree_view);
}
- tree_column->min_width = min_width;
+ priv->min_width = min_width;
g_object_freeze_notify (G_OBJECT (tree_column));
- if (tree_column->max_width != -1 && tree_column->max_width < min_width)
+ if (priv->max_width != -1 && priv->max_width < min_width)
{
- tree_column->max_width = min_width;
+ priv->max_width = min_width;
g_object_notify (G_OBJECT (tree_column), "max-width");
}
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),
+ if (priv->column_type == GTK_TREE_VIEW_COLUMN_AUTOSIZE)
+ _gtk_tree_view_column_autosize (GTK_TREE_VIEW (priv->tree_view),
tree_column);
}
{
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), -1);
- return tree_column->min_width;
+ return tree_column->priv->min_width;
}
/**
gtk_tree_view_column_set_max_width (GtkTreeViewColumn *tree_column,
gint max_width)
{
+ GtkTreeViewColumnPrivate *priv;
+
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
g_return_if_fail (max_width >= -1);
- if (max_width == tree_column->max_width)
+ priv = tree_column->priv;
+
+ if (max_width == priv->max_width)
return;
- if (tree_column->visible &&
- tree_column->tree_view != NULL &&
- gtk_widget_get_realized (tree_column->tree_view))
+ if (priv->visible &&
+ priv->tree_view != NULL &&
+ gtk_widget_get_realized (priv->tree_view))
{
- if (max_width != -1 && max_width < tree_column->width)
- gtk_widget_queue_resize (tree_column->tree_view);
+ if (max_width != -1 && max_width < priv->width)
+ gtk_widget_queue_resize (priv->tree_view);
}
- tree_column->max_width = max_width;
+ priv->max_width = max_width;
g_object_freeze_notify (G_OBJECT (tree_column));
- if (max_width != -1 && max_width < tree_column->min_width)
+ if (max_width != -1 && max_width < priv->min_width)
{
- tree_column->min_width = max_width;
+ priv->min_width = max_width;
g_object_notify (G_OBJECT (tree_column), "min-width");
}
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),
+ if (priv->column_type == GTK_TREE_VIEW_COLUMN_AUTOSIZE)
+ _gtk_tree_view_column_autosize (GTK_TREE_VIEW (priv->tree_view),
tree_column);
}
{
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), -1);
- return tree_column->max_width;
+ return tree_column->priv->max_width;
}
/**
void
gtk_tree_view_column_clicked (GtkTreeViewColumn *tree_column)
{
+ GtkTreeViewColumnPrivate *priv;
+
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
- if (tree_column->visible &&
- tree_column->button &&
- tree_column->clickable)
- gtk_button_clicked (GTK_BUTTON (tree_column->button));
+ priv = tree_column->priv;
+
+ if (priv->visible &&
+ priv->button &&
+ priv->clickable)
+ gtk_button_clicked (GTK_BUTTON (priv->button));
}
/**
gtk_tree_view_column_set_title (GtkTreeViewColumn *tree_column,
const gchar *title)
{
- gchar *new_title;
-
+ GtkTreeViewColumnPrivate *priv;
+ gchar *new_title;
+
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
+ priv = tree_column->priv;
+
new_title = g_strdup (title);
- g_free (tree_column->title);
- tree_column->title = new_title;
+ g_free (priv->title);
+ priv->title = new_title;
gtk_tree_view_column_update_button (tree_column);
g_object_notify (G_OBJECT (tree_column), "title");
{
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), NULL);
- return tree_column->title;
+ return tree_column->priv->title;
}
/**
gtk_tree_view_column_set_expand (GtkTreeViewColumn *tree_column,
gboolean expand)
{
+ GtkTreeViewColumnPrivate *priv;
+
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
+ priv = tree_column->priv;
+
expand = expand?TRUE:FALSE;
- if (tree_column->expand == expand)
+ if (priv->expand == expand)
return;
- tree_column->expand = expand;
+ priv->expand = expand;
- if (tree_column->visible &&
- tree_column->tree_view != NULL &&
- gtk_widget_get_realized (tree_column->tree_view))
+ if (priv->visible &&
+ priv->tree_view != NULL &&
+ gtk_widget_get_realized (priv->tree_view))
{
/* We want to continue using the original width of the
* column that includes additional space added by the user
* resizing the columns and possibly extra (expanded) space, which
* are not included in the resized width.
*/
- tree_column->use_resized_width = FALSE;
+ priv->use_resized_width = FALSE;
- gtk_widget_queue_resize (tree_column->tree_view);
+ gtk_widget_queue_resize (priv->tree_view);
}
g_object_notify (G_OBJECT (tree_column), "expand");
{
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), FALSE);
- return tree_column->expand;
+ return tree_column->priv->expand;
}
/**
gtk_tree_view_column_set_clickable (GtkTreeViewColumn *tree_column,
gboolean clickable)
{
+ GtkTreeViewColumnPrivate *priv;
+
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
+ priv = tree_column->priv;
+
clickable = !! clickable;
- if (tree_column->clickable == clickable)
+ if (priv->clickable == clickable)
return;
- tree_column->clickable = clickable;
+ priv->clickable = clickable;
gtk_tree_view_column_update_button (tree_column);
g_object_notify (G_OBJECT (tree_column), "clickable");
}
{
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), FALSE);
- return tree_column->clickable;
+ return tree_column->priv->clickable;
}
/**
gtk_tree_view_column_set_widget (GtkTreeViewColumn *tree_column,
GtkWidget *widget)
{
+ GtkTreeViewColumnPrivate *priv;
+
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
g_return_if_fail (widget == NULL || GTK_IS_WIDGET (widget));
+ priv = tree_column->priv;
+
if (widget)
g_object_ref_sink (widget);
- if (tree_column->child)
- g_object_unref (tree_column->child);
+ if (priv->child)
+ g_object_unref (priv->child);
- tree_column->child = widget;
+ priv->child = widget;
gtk_tree_view_column_update_button (tree_column);
g_object_notify (G_OBJECT (tree_column), "widget");
}
{
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), NULL);
- return tree_column->child;
+ return tree_column->priv->child;
}
/**
gtk_tree_view_column_set_alignment (GtkTreeViewColumn *tree_column,
gfloat xalign)
{
+ GtkTreeViewColumnPrivate *priv;
+
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
+ priv = tree_column->priv;
+
xalign = CLAMP (xalign, 0.0, 1.0);
- if (tree_column->xalign == xalign)
+ if (priv->xalign == xalign)
return;
- tree_column->xalign = xalign;
+ priv->xalign = xalign;
gtk_tree_view_column_update_button (tree_column);
g_object_notify (G_OBJECT (tree_column), "alignment");
}
{
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), 0.5);
- return tree_column->xalign;
+ return tree_column->priv->xalign;
}
/**
gtk_tree_view_column_set_reorderable (GtkTreeViewColumn *tree_column,
gboolean reorderable)
{
+ GtkTreeViewColumnPrivate *priv;
+
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
+ priv = tree_column->priv;
+
/* if (reorderable)
gtk_tree_view_column_set_clickable (tree_column, TRUE);*/
- if (tree_column->reorderable == (reorderable?TRUE:FALSE))
+ if (priv->reorderable == (reorderable?TRUE:FALSE))
return;
- tree_column->reorderable = (reorderable?TRUE:FALSE);
+ priv->reorderable = (reorderable?TRUE:FALSE);
gtk_tree_view_column_update_button (tree_column);
g_object_notify (G_OBJECT (tree_column), "reorderable");
}
{
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), FALSE);
- return tree_column->reorderable;
+ return tree_column->priv->reorderable;
}
gtk_tree_view_column_set_sort_column_id (GtkTreeViewColumn *tree_column,
gint sort_column_id)
{
+ GtkTreeViewColumnPrivate *priv;
+
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
g_return_if_fail (sort_column_id >= -1);
- if (tree_column->sort_column_id == sort_column_id)
+ priv = tree_column->priv;
+
+ if (priv->sort_column_id == sort_column_id)
return;
- tree_column->sort_column_id = sort_column_id;
+ priv->sort_column_id = sort_column_id;
/* Handle unsetting the id */
if (sort_column_id == -1)
{
- GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree_column->tree_view));
+ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->tree_view));
- if (tree_column->sort_clicked_signal)
+ if (priv->sort_clicked_signal)
{
- g_signal_handler_disconnect (tree_column, tree_column->sort_clicked_signal);
- tree_column->sort_clicked_signal = 0;
+ g_signal_handler_disconnect (tree_column, priv->sort_clicked_signal);
+ priv->sort_clicked_signal = 0;
}
- if (tree_column->sort_column_changed_signal)
+ if (priv->sort_column_changed_signal)
{
- g_signal_handler_disconnect (model, tree_column->sort_column_changed_signal);
- tree_column->sort_column_changed_signal = 0;
+ g_signal_handler_disconnect (model, priv->sort_column_changed_signal);
+ priv->sort_column_changed_signal = 0;
}
gtk_tree_view_column_set_sort_order (tree_column, GTK_SORT_ASCENDING);
gtk_tree_view_column_set_clickable (tree_column, TRUE);
- if (! tree_column->sort_clicked_signal)
- tree_column->sort_clicked_signal = g_signal_connect (tree_column,
- "clicked",
- G_CALLBACK (gtk_tree_view_column_sort),
- NULL);
+ if (! priv->sort_clicked_signal)
+ priv->sort_clicked_signal = g_signal_connect (tree_column,
+ "clicked",
+ G_CALLBACK (gtk_tree_view_column_sort),
+ NULL);
gtk_tree_view_column_setup_sort_column_id_callback (tree_column);
g_object_notify (G_OBJECT (tree_column), "sort-column-id");
{
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), 0);
- return tree_column->sort_column_id;
+ return tree_column->priv->sort_column_id;
}
/**
setting = setting != FALSE;
- if (setting == tree_column->show_sort_indicator)
+ if (setting == tree_column->priv->show_sort_indicator)
return;
- tree_column->show_sort_indicator = setting;
+ tree_column->priv->show_sort_indicator = setting;
gtk_tree_view_column_update_button (tree_column);
g_object_notify (G_OBJECT (tree_column), "sort-indicator");
}
{
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), FALSE);
- return tree_column->show_sort_indicator;
+ return tree_column->priv->show_sort_indicator;
}
/**
{
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
- if (order == tree_column->sort_order)
+ if (order == tree_column->priv->sort_order)
return;
- tree_column->sort_order = order;
+ tree_column->priv->sort_order = order;
gtk_tree_view_column_update_button (tree_column);
g_object_notify (G_OBJECT (tree_column), "sort-order");
}
{
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), 0);
- return tree_column->sort_order;
+ return tree_column->priv->sort_order;
}
/**
gboolean is_expander,
gboolean is_expanded)
{
- GSList *list;
- GValue value = { 0, };
- GList *cell_list;
- gboolean cell_is_expander, cell_is_expanded;
-
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
if (tree_model == NULL)
return;
- for (cell_list = tree_column->cell_list; cell_list; cell_list = cell_list->next)
- {
- GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *) cell_list->data;
- GObject *cell = (GObject *) info->cell;
-
- list = info->attributes;
-
- g_object_freeze_notify (cell);
-
- g_object_get (cell, "is-expander", &cell_is_expander, NULL);
- if (cell_is_expander != is_expander)
- g_object_set (cell, "is-expander", is_expander, NULL);
-
- g_object_get (cell, "is-expanded", &cell_is_expanded, NULL);
- if (cell_is_expanded != is_expanded)
- g_object_set (cell, "is-expanded", is_expanded, NULL);
-
- while (list && list->next)
- {
- gtk_tree_model_get_value (tree_model, iter,
- GPOINTER_TO_INT (list->next->data),
- &value);
- g_object_set_property (cell, (gchar *) list->data, &value);
- g_value_unset (&value);
- list = list->next->next;
- }
-
- if (info->func)
- (* info->func) (tree_column, info->cell, tree_model, iter, info->func_data);
- g_object_thaw_notify (G_OBJECT (info->cell));
- }
-
+ gtk_cell_area_apply_attributes (tree_column->priv->cell_area, tree_model, iter,
+ is_expander, is_expanded);
}
/**
gint *width,
gint *height)
{
- GtkRequisition min_size;
- GList *list;
- gboolean first_cell = TRUE;
- gint focus_line_width;
+ GtkTreeViewColumnPrivate *priv;
+ gint min_width = 0, min_height = 0;
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
- if (height)
- * height = 0;
- if (width)
- * width = 0;
+ priv = tree_column->priv;
- gtk_widget_style_get (tree_column->tree_view, "focus-line-width", &focus_line_width, NULL);
-
- for (list = tree_column->cell_list; list; list = list->next)
- {
- GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *) list->data;
- gboolean visible;
- g_object_get (info->cell, "visible", &visible, NULL);
-
- if (visible == FALSE)
- continue;
-
- if (first_cell == FALSE && width)
- *width += tree_column->spacing;
-
- gtk_cell_renderer_get_preferred_size (info->cell,
- GTK_WIDGET (tree_column->tree_view),
- &min_size, NULL);
-
- if (height)
- * height = MAX (*height, min_size.height + focus_line_width * 2);
- info->requested_width = MAX (info->requested_width, min_size.width + focus_line_width * 2);
- if (width)
- * width += info->requested_width;
- first_cell = FALSE;
- }
-}
+ g_signal_handler_block (priv->cell_area_context,
+ priv->context_changed_signal);
-/* rendering, event handling and rendering focus are somewhat complicated, and
- * quite a bit of code. Rather than duplicate them, we put them together to
- * keep the code in one place.
- *
- * To better understand what's going on, check out
- * docs/tree-column-sizing.png
- */
-enum {
- CELL_ACTION_RENDER,
- CELL_ACTION_FOCUS,
- CELL_ACTION_EVENT
-};
+ gtk_cell_area_get_preferred_width (priv->cell_area,
+ priv->cell_area_context,
+ priv->tree_view,
+ NULL, NULL);
-static gboolean
-gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
- cairo_t *cr,
- const GdkRectangle *background_area,
- const GdkRectangle *cell_area,
- guint flags,
- gint action,
- GdkRectangle *focus_rectangle, /* FOCUS */
- GtkCellEditable **editable_widget, /* EVENT */
- GdkEvent *event, /* EVENT */
- gchar *path_string) /* EVENT */
-{
- GList *list;
- GdkRectangle real_cell_area;
- GdkRectangle real_background_area;
- gint depth = 0;
- 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 special_cells;
- gint horizontal_separator;
- gboolean cursor_row = FALSE;
- gboolean first_cell = TRUE;
- gboolean rtl;
- /* If we have rtl text, we need to transform our areas */
- GdkRectangle rtl_cell_area;
- GdkRectangle rtl_background_area;
-
- min_x = G_MAXINT;
- min_y = G_MAXINT;
- max_x = 0;
- max_y = 0;
-
- rtl = (gtk_widget_get_direction (GTK_WIDGET (tree_column->tree_view)) == GTK_TEXT_DIR_RTL);
- 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_cell_area_context_get_preferred_width (priv->cell_area_context, &min_width, NULL);
- cursor_row = flags & GTK_CELL_RENDERER_FOCUSED;
+ gtk_cell_area_get_preferred_height_for_width (priv->cell_area,
+ priv->cell_area_context,
+ priv->tree_view,
+ min_width,
+ &min_height,
+ NULL);
- gtk_widget_style_get (GTK_WIDGET (tree_column->tree_view),
- "focus-line-width", &focus_line_width,
- "horizontal-separator", &horizontal_separator,
- NULL);
+ g_signal_handler_unblock (priv->cell_area_context,
+ priv->context_changed_signal);
- real_cell_area = *cell_area;
- real_background_area = *background_area;
+ if (height)
+ * height = min_height;
+ if (width)
+ * width = min_width;
- real_cell_area.x += focus_line_width;
- real_cell_area.y += focus_line_width;
- real_cell_area.height -= 2 * focus_line_width;
-
- if (rtl)
- depth = real_background_area.width - real_cell_area.width;
- else
- depth = real_cell_area.x - real_background_area.x;
-
- /* Find out how much extra space we have to allocate */
- for (list = tree_column->cell_list; list; list = list->next)
- {
- GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *)list->data;
-
- if (!gtk_cell_renderer_get_visible (info->cell))
- continue;
-
- if (info->expand == TRUE)
- expand_cell_count ++;
- full_requested_width += info->requested_width;
-
- if (!first_cell)
- full_requested_width += tree_column->spacing;
-
- first_cell = FALSE;
- }
-
- extra_space = cell_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->pack == GTK_PACK_END)
- continue;
-
- if (!gtk_cell_renderer_get_visible (info->cell))
- continue;
-
- if ((info->has_focus || special_cells == 1) && cursor_row)
- flags |= GTK_CELL_RENDERER_FOCUSED;
- else
- flags &= ~GTK_CELL_RENDERER_FOCUSED;
-
- info->real_width = info->requested_width + (info->expand?extra_space:0);
-
- /* We constrain ourselves to only the width available */
- if (real_cell_area.x - focus_line_width + info->real_width > cell_area->x + cell_area->width)
- {
- info->real_width = cell_area->x + cell_area->width - real_cell_area.x;
- }
-
- if (real_cell_area.x > cell_area->x + cell_area->width)
- break;
-
- real_cell_area.width = info->real_width;
- real_cell_area.width -= 2 * focus_line_width;
-
- if (list->next)
- {
- real_background_area.width = info->real_width + depth;
- }
- else
- {
- /* fill the rest of background for the last cell */
- real_background_area.width = background_area->x + background_area->width - real_background_area.x;
- }
-
- rtl_cell_area = real_cell_area;
- rtl_background_area = real_background_area;
-
- if (rtl)
- {
- rtl_cell_area.x = cell_area->x + cell_area->width - (real_cell_area.x - cell_area->x) - real_cell_area.width;
- rtl_background_area.x = background_area->x + background_area->width - (real_background_area.x - background_area->x) - real_background_area.width;
- }
-
- /* RENDER */
- if (action == CELL_ACTION_RENDER)
- {
- gtk_cell_renderer_render (info->cell,
- cr,
- tree_column->tree_view,
- &rtl_background_area,
- &rtl_cell_area,
- flags);
- }
- /* FOCUS */
- else if (action == CELL_ACTION_FOCUS)
- {
- gint x_offset, y_offset;
- GtkRequisition min_size;
-
- gtk_cell_renderer_get_preferred_size (info->cell,
- tree_column->tree_view,
- &min_size, NULL);
-
- _gtk_cell_renderer_calc_offset (info->cell, &rtl_cell_area,
- gtk_widget_get_direction (tree_column->tree_view),
- min_size.width, min_size.height,
- &x_offset, &y_offset);
-
- if (special_cells > 1)
- {
- if (info->has_focus)
- {
- min_x = rtl_cell_area.x + x_offset;
- max_x = min_x + min_size.width;
- min_y = rtl_cell_area.y + y_offset;
- max_y = min_y + min_size.height;
- }
- }
- else
- {
- if (min_x > (rtl_cell_area.x + x_offset))
- min_x = rtl_cell_area.x + x_offset;
- if (max_x < rtl_cell_area.x + x_offset + min_size.width)
- max_x = rtl_cell_area.x + x_offset + min_size.width;
- if (min_y > (rtl_cell_area.y + y_offset))
- min_y = rtl_cell_area.y + y_offset;
- if (max_y < rtl_cell_area.y + y_offset + min_size.height)
- max_y = rtl_cell_area.y + y_offset + min_size.height;
- }
- }
- /* EVENT */
- 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 (rtl_cell_area.x <= ((GdkEventButton *)event)->x &&
- rtl_cell_area.x + rtl_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 (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,
- &rtl_background_area,
- &rtl_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,
- &rtl_background_area,
- &rtl_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;
- }
- }
- }
- }
-
- flags &= ~GTK_CELL_RENDERER_FOCUSED;
-
- real_cell_area.x += (real_cell_area.width + 2 * focus_line_width + tree_column->spacing);
- real_background_area.x += real_background_area.width + tree_column->spacing;
-
- /* Only needed for first cell */
- depth = 0;
- }
-
- /* 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->pack == GTK_PACK_START)
- continue;
-
- if (!gtk_cell_renderer_get_visible(info->cell))
- continue;
-
- if ((info->has_focus || special_cells == 1) && cursor_row)
- flags |= GTK_CELL_RENDERER_FOCUSED;
- else
- flags &= ~GTK_CELL_RENDERER_FOCUSED;
-
- info->real_width = info->requested_width + (info->expand?extra_space:0);
-
- /* We constrain ourselves to only the width available */
- if (real_cell_area.x - focus_line_width + info->real_width > cell_area->x + cell_area->width)
- {
- info->real_width = cell_area->x + cell_area->width - real_cell_area.x;
- }
-
- if (real_cell_area.x > cell_area->x + cell_area->width)
- break;
-
- real_cell_area.width = info->real_width;
- real_cell_area.width -= 2 * focus_line_width;
- real_background_area.width = info->real_width + depth;
-
- rtl_cell_area = real_cell_area;
- rtl_background_area = real_background_area;
- if (rtl)
- {
- rtl_cell_area.x = cell_area->x + cell_area->width - (real_cell_area.x - cell_area->x) - real_cell_area.width;
- rtl_background_area.x = background_area->x + background_area->width - (real_background_area.x - background_area->x) - real_background_area.width;
- }
-
- /* RENDER */
- if (action == CELL_ACTION_RENDER)
- {
- gtk_cell_renderer_render (info->cell,
- cr,
- tree_column->tree_view,
- &rtl_background_area,
- &rtl_cell_area,
- flags);
- }
- /* FOCUS */
- else if (action == CELL_ACTION_FOCUS)
- {
- gint x_offset, y_offset;
- GtkRequisition min_size;
-
- gtk_cell_renderer_get_preferred_size (info->cell,
- tree_column->tree_view,
- &min_size, NULL);
-
- _gtk_cell_renderer_calc_offset (info->cell, &rtl_cell_area,
- gtk_widget_get_direction (tree_column->tree_view),
- min_size.width, min_size.height,
- &x_offset, &y_offset);
-
- if (special_cells > 1)
- {
- if (info->has_focus)
- {
- min_x = rtl_cell_area.x + x_offset;
- max_x = min_x + min_size.width;
- min_y = rtl_cell_area.y + y_offset;
- max_y = min_y + min_size.height;
- }
- }
- else
- {
- if (min_x > (rtl_cell_area.x + x_offset))
- min_x = rtl_cell_area.x + x_offset;
- if (max_x < rtl_cell_area.x + x_offset + min_size.width)
- max_x = rtl_cell_area.x + x_offset + min_size.width;
- if (min_y > (rtl_cell_area.y + y_offset))
- min_y = rtl_cell_area.y + y_offset;
- if (max_y < rtl_cell_area.y + y_offset + min_size.height)
- max_y = rtl_cell_area.y + y_offset + min_size.height;
- }
- }
- /* EVENT */
- 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 (rtl_cell_area.x <= ((GdkEventButton *)event)->x &&
- rtl_cell_area.x + rtl_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 (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,
- &rtl_background_area,
- &rtl_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,
- &rtl_background_area,
- &rtl_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;
- }
- }
- }
- }
-
- flags &= ~GTK_CELL_RENDERER_FOCUSED;
-
- real_cell_area.x += (real_cell_area.width + 2 * focus_line_width + tree_column->spacing);
- real_background_area.x += (real_background_area.width + tree_column->spacing);
-
- /* Only needed for first cell */
- depth = 0;
- }
-
- /* fill focus_rectangle when required */
- if (action == CELL_ACTION_FOCUS)
- {
- if (min_x >= max_x || min_y >= max_y)
- {
- *focus_rectangle = *cell_area;
- /* don't change the focus_rectangle, just draw it nicely inside
- * the cell area */
- }
- else
- {
- focus_rectangle->x = min_x - focus_line_width;
- focus_rectangle->y = min_y - focus_line_width;
- focus_rectangle->width = (max_x - min_x) + 2 * focus_line_width;
- focus_rectangle->height = (max_y - min_y) + 2 * focus_line_width;
- }
- }
-
- return FALSE;
}
/**
cairo_t *cr,
const GdkRectangle *background_area,
const GdkRectangle *cell_area,
- guint flags)
+ guint flags,
+ gboolean draw_focus)
{
+ GtkTreeViewColumnPrivate *priv;
+
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
g_return_if_fail (cr != NULL);
g_return_if_fail (background_area != NULL);
g_return_if_fail (cell_area != NULL);
+ priv = tree_column->priv;
+
cairo_save (cr);
- gtk_tree_view_column_cell_process_action (tree_column,
- cr,
- background_area,
- cell_area,
- flags,
- CELL_ACTION_RENDER,
- NULL, NULL, NULL, NULL);
+ gtk_cell_area_render (priv->cell_area, priv->cell_area_context,
+ priv->tree_view, cr,
+ background_area, cell_area, flags,
+ draw_focus);
cairo_restore (cr);
}
const GdkRectangle *cell_area,
guint flags)
{
+ GtkTreeViewColumnPrivate *priv;
+
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), FALSE);
- return gtk_tree_view_column_cell_process_action (tree_column,
- NULL,
- background_area,
- cell_area,
- flags,
- CELL_ACTION_EVENT,
- NULL,
- editable_widget,
- event,
- path_string);
+ priv = tree_column->priv;
+
+ /* FIXME: Should we pass background area here as well?
+ * What will happen to the path_string and editable widget
+ * variables?
+ *
+ * Answer, No dont pass background area... editable widgets
+ * grab the pointer and keyboard so the treeview doesnt
+ * recieve these events while editable widgets are editing.
+ *
+ * Also it's important that gtk_cell_area_apply_attributes be
+ * called before passing the event to the cell (maybe we need to
+ * instead use the path_string here to apply the attributes ?,
+ * if the attributes are applied, the underlying CellArea knows
+ * the path string, which is expected when handling events).
+ */
+ return gtk_cell_area_event (priv->cell_area,
+ priv->cell_area_context,
+ priv->tree_view,
+ event,
+ cell_area,
+ flags);
}
void
const GdkRectangle *cell_area,
GdkRectangle *focus_area)
{
+ /* FIXME */
+#if 0
gtk_tree_view_column_cell_process_action (tree_column,
NULL,
background_area,
CELL_ACTION_FOCUS,
focus_area,
NULL, NULL, NULL);
+#endif
}
-/* 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 count,
gboolean left,
gboolean right)
{
- gint count;
gboolean rtl;
+ GtkDirectionType direction = 0;
+ GtkTreeViewColumnPrivate *priv = tree_column->priv;
- count = _gtk_tree_view_column_count_special_cells (tree_column);
- rtl = gtk_widget_get_direction (GTK_WIDGET (tree_column->tree_view)) == GTK_TEXT_DIR_RTL;
+ rtl = gtk_widget_get_direction (priv->tree_view) == GTK_TEXT_DIR_RTL;
- /* 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)
+ switch (count)
{
- 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;
-
- if (rtl)
- {
- prev = gtk_tree_view_column_cell_next (tree_column, list);
- next = gtk_tree_view_column_cell_prev (tree_column, list);
- }
- else
- {
- 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 last cell */
- if (rtl)
- info = gtk_tree_view_column_cell_first (tree_column)->data;
- else
- 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 */
- if (rtl)
- info = gtk_tree_view_column_cell_last (tree_column)->data;
- else
- info = gtk_tree_view_column_cell_first (tree_column)->data;
+ case -1:
+ direction = GTK_DIR_LEFT;
+ break;
- info->has_focus = TRUE;
- return TRUE;
- }
- }
- return FALSE;
+ case 1:
+ direction = GTK_DIR_RIGHT;
+ break;
}
- /* we get focus, if we have multiple editable cells, give the correct one
- * focus
+ /* 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 (count > 1)
+ if (_gtk_tree_view_get_focus_column (GTK_TREE_VIEW (priv->tree_view)) == tree_column)
{
- 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 (gtk_cell_area_focus (priv->cell_area, direction))
+ /* Focus stays in this column, so we are done */
+ return TRUE;
- list = NULL;
- if (rtl)
+ /* FIXME: RTL support for the following: */
+ if (count == -1 && !left)
{
- if (direction > 0)
- list = gtk_tree_view_column_cell_last (tree_column);
- else if (direction < 0)
- list = gtk_tree_view_column_cell_first (tree_column);
- }
- else
+ direction = GTK_DIR_RIGHT;
+ gtk_cell_area_focus (priv->cell_area, direction);
+ }
+ else if (count == 1 && !right)
{
- if (direction > 0)
- list = gtk_tree_view_column_cell_first (tree_column);
- else if (direction < 0)
- list = gtk_tree_view_column_cell_last (tree_column);
- }
+ direction = GTK_DIR_LEFT;
+ gtk_cell_area_focus (priv->cell_area, direction);
+ }
- if (list)
- ((GtkTreeViewColumnCellInfo *) list->data)->has_focus = TRUE;
+ return FALSE;
}
- return TRUE;
-}
-
-void
-_gtk_tree_view_column_cell_draw_focus (GtkTreeViewColumn *tree_column,
- cairo_t *cr,
- const GdkRectangle *background_area,
- const GdkRectangle *cell_area,
- guint flags)
-{
- gint focus_line_width;
- GtkStateType cell_state;
-
- g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
- g_return_if_fail (cr != NULL);
-
- gtk_widget_style_get (GTK_WIDGET (tree_column->tree_view),
- "focus-line-width", &focus_line_width, NULL);
- if (tree_column->editable_widget)
- {
- /* This function is only called on the editable row when editing.
- */
-#if 0
- gtk_paint_focus (tree_column->tree_view->style,
- window,
- gtk_widget_get_state (tree_column->tree_view),
- NULL,
- tree_column->tree_view,
- "treeview",
- cell_area->x - focus_line_width,
- cell_area->y - focus_line_width,
- cell_area->width + 2 * focus_line_width,
- cell_area->height + 2 * focus_line_width);
-#endif
- }
- else
- {
- GdkRectangle focus_rectangle;
- gtk_tree_view_column_cell_process_action (tree_column,
- cr,
- background_area,
- cell_area,
- flags,
- CELL_ACTION_FOCUS,
- &focus_rectangle,
- NULL, NULL, NULL);
-
- cell_state = flags & GTK_CELL_RENDERER_SELECTED ? GTK_STATE_SELECTED :
- (flags & GTK_CELL_RENDERER_PRELIT ? GTK_STATE_PRELIGHT :
- (flags & GTK_CELL_RENDERER_INSENSITIVE ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL));
- gtk_paint_focus (gtk_widget_get_style (tree_column->tree_view),
- cr,
- cell_state,
- tree_column->tree_view,
- "treeview",
- focus_rectangle.x,
- focus_rectangle.y,
- focus_rectangle.width,
- focus_rectangle.height);
- }
+ return gtk_cell_area_focus (priv->cell_area, direction);
}
/**
gtk_tree_view_column_cell_is_visible (GtkTreeViewColumn *tree_column)
{
GList *list;
+ GList *cells;
+ GtkTreeViewColumnPrivate *priv;
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;
+ priv = tree_column->priv;
- if (gtk_cell_renderer_get_visible (info->cell))
- return TRUE;
+ cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (priv->cell_area));
+ for (list = cells; list; list = list->next)
+ {
+ if (gtk_cell_renderer_get_visible (list->data))
+ {
+ g_list_free (cells);
+ return TRUE;
+ }
}
+ g_list_free (cells);
+
return FALSE;
}
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? */
- }
+ gtk_cell_area_set_focus_cell (tree_column->priv->cell_area, cell);
}
void
_gtk_tree_view_column_cell_set_dirty (GtkTreeViewColumn *tree_column,
gboolean install_handler)
{
- GList *list;
-
- for (list = tree_column->cell_list; list; list = list->next)
- {
- GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *) list->data;
+ GtkTreeViewColumnPrivate *priv = tree_column->priv;
- info->requested_width = 0;
- }
- tree_column->dirty = TRUE;
- tree_column->requested_width = -1;
- tree_column->width = 0;
+ priv->dirty = TRUE;
+ priv->requested_width = -1;
+ priv->width = 0;
- if (tree_column->tree_view &&
- gtk_widget_get_realized (tree_column->tree_view))
+ if (priv->tree_view &&
+ gtk_widget_get_realized (priv->tree_view))
{
- if (install_handler)
- _gtk_tree_view_install_mark_rows_col_dirty (GTK_TREE_VIEW (tree_column->tree_view));
- else
- GTK_TREE_VIEW (tree_column->tree_view)->priv->mark_rows_col_dirty = TRUE;
- gtk_widget_queue_resize (tree_column->tree_view);
+ _gtk_tree_view_install_mark_rows_col_dirty (GTK_TREE_VIEW (priv->tree_view), install_handler);
+ gtk_widget_queue_resize (priv->tree_view);
}
}
-void
-_gtk_tree_view_column_start_editing (GtkTreeViewColumn *tree_column,
- GtkCellEditable *cell_editable)
-{
- g_return_if_fail (tree_column->editable_widget == NULL);
-
- tree_column->editable_widget = cell_editable;
-}
-
-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)
+gboolean
+_gtk_tree_view_column_cell_get_dirty (GtkTreeViewColumn *tree_column)
{
- GList *list;
- GtkTreeViewColumnCellInfo *info;
- gint l, r;
- gboolean rtl;
-
- l = r = 0;
-
- list = gtk_tree_view_column_cell_first (column);
-
- while (list)
- {
- info = (GtkTreeViewColumnCellInfo *)list->data;
-
- list = gtk_tree_view_column_cell_next (column, list);
-
- if (info->cell == cell)
- break;
-
- if (gtk_cell_renderer_get_visible (info->cell))
- l += info->real_width + column->spacing;
- }
-
- while (list)
- {
- info = (GtkTreeViewColumnCellInfo *)list->data;
-
- list = gtk_tree_view_column_cell_next (column, list);
-
- if (gtk_cell_renderer_get_visible (info->cell))
- r += info->real_width + column->spacing;
- }
-
- rtl = (gtk_widget_get_direction (GTK_WIDGET (column->tree_view)) == GTK_TEXT_DIR_RTL);
- if (left)
- *left = rtl ? r : l;
-
- if (right)
- *right = rtl ? l : r;
+ return tree_column->priv->dirty;
}
/**
gint *start_pos,
gint *width)
{
- GList *list;
- gint current_x = 0;
- gboolean found_cell = FALSE;
- GtkTreeViewColumnCellInfo *cellinfo = NULL;
+ GtkTreeViewColumnPrivate *priv;
+ GdkRectangle zero_cell_area = { 0, };
+ GdkRectangle allocation;
- 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;
- }
+ g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), FALSE);
+ g_return_val_if_fail (GTK_IS_CELL_RENDERER (cell_renderer), FALSE);
- if (gtk_cell_renderer_get_visible (cellinfo->cell))
- current_x += cellinfo->real_width;
- }
+ priv = tree_column->priv;
- if (found_cell)
- {
- if (start_pos)
- *start_pos = current_x;
- if (width)
- *width = cellinfo->real_width;
- }
+ /* FIXME: Could use a boolean return value for invalid cells */
+ gtk_cell_area_get_cell_allocation (priv->cell_area,
+ priv->cell_area_context,
+ priv->tree_view,
+ cell_renderer,
+ &zero_cell_area,
+ &allocation);
+
+ if (start_pos)
+ *start_pos = allocation.x;
+ if (width)
+ *width = allocation.width;
- return found_cell;
+ return TRUE;
}
/**
{
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
- if (tree_column->tree_view)
+ if (tree_column->priv->tree_view)
_gtk_tree_view_column_cell_set_dirty (tree_column, TRUE);
}
{
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), NULL);
- return tree_column->tree_view;
+ return tree_column->priv->tree_view;
+}
+
+/**
+ * gtk_tree_view_column_get_button:
+ * @tree_column: A #GtkTreeViewColumn
+ *
+ * Returns the button used in the treeview column header
+ *
+ * Return value: (transfer none): The button for the column header.
+ *
+ * Since: 3.0
+ */
+GtkWidget *
+gtk_tree_view_column_get_button (GtkTreeViewColumn *tree_column)
+{
+ g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), NULL);
+
+ return tree_column->priv->button;
+}
+
+GdkWindow *
+_gtk_tree_view_column_get_window (GtkTreeViewColumn *column)
+{
+ return column->priv->window;
+}
+
+void
+_gtk_tree_view_column_set_requested_width (GtkTreeViewColumn *column,
+ gint width)
+{
+ column->priv->requested_width = width;
+}
+
+gint
+_gtk_tree_view_column_get_requested_width (GtkTreeViewColumn *column)
+{
+ return column->priv->requested_width;
+}
+
+void
+_gtk_tree_view_column_set_resized_width (GtkTreeViewColumn *column,
+ gint width)
+{
+ column->priv->resized_width = width;
+}
+
+gint
+_gtk_tree_view_column_get_resized_width (GtkTreeViewColumn *column)
+{
+ return column->priv->resized_width;
+}
+
+void
+_gtk_tree_view_column_set_use_resized_width (GtkTreeViewColumn *column,
+ gboolean use_resized_width)
+{
+ column->priv->use_resized_width = use_resized_width;
+}
+
+gboolean
+_gtk_tree_view_column_get_use_resized_width (GtkTreeViewColumn *column)
+{
+ return column->priv->use_resized_width;
+}
+
+gint
+_gtk_tree_view_column_get_drag_x (GtkTreeViewColumn *column)
+{
+ return column->priv->drag_x;
+}
+
+GtkCellAreaContext *
+_gtk_tree_view_column_get_context (GtkTreeViewColumn *column)
+{
+ return column->priv->cell_area_context;
}
projects / ~andy / gtk / blobdiff