#include "gtkbutton.h"
#include "gtkalignment.h"
#include "gtklabel.h"
+#include "gtkhbox.h"
+#include "gtkarrow.h"
+#include "gtkintl.h"
#include <gdk/gdkkeysyms.h>
-/* the width of the column resize windows */
-#define TREE_VIEW_DRAG_WIDTH 6
-#define TREE_VIEW_EXPANDER_WIDTH 14
-#define TREE_VIEW_EXPANDER_HEIGHT 14
-
-/* The TREE_VIEW_VERTICAL_SEPARATOR is the space between rows. The
- * GTK_RBNODE_GET_HEIGHT() value includes the separators; the offset
- * of each row points to the center of the inter-row space. For an odd
- * separator, the extra pixel by convention goes _below_ the row. So
- * a node in the rbtree owns TREE_VIEW_VERTICAL_SEPARATOR/2 pixels
- * above the row, and TREE_VIEW_VERTICAL_SEPARATOR/2 +
- * TREE_VIEW_VERTICAL_SEPARATOR%2 pixels below the row.
- */
-
-/* Set to large number for debugging. Should normally be 2. */
-#define TREE_VIEW_VERTICAL_SEPARATOR 11
-
-#define TREE_VIEW_HORIZONTAL_SEPARATOR 0
-
/* The "background" areas of all rows/cells add up to cover the entire tree.
* The background includes all inter-row and inter-cell spacing.
* The "cell" areas are the cell_area passed in to gtk_cell_renderer_render(),
gint y;
};
+enum
+{
+ ROW_ACTIVATED,
+ EXPAND_ROW,
+ COLLAPSE_ROW,
+ LAST_SIGNAL
+};
+
+enum {
+ PROP_0,
+
+ PROP_MODEL,
+ PROP_HADJUSTMENT,
+ PROP_VADJUSTMENT,
+ PROP_HEADERS_VISIBLE,
+ PROP_HEADERS_CLICKABLE,
+ PROP_EXPANDER_COLUMN,
+ PROP_RULES_HINT
+};
static void gtk_tree_view_init (GtkTreeView *tree_view);
static void gtk_tree_view_class_init (GtkTreeViewClass *klass);
+static void gtk_tree_view_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gtk_tree_view_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+/* o signals */
+static void gtk_tree_view_finalize (GObject *object);
/* object signals */
-static void gtk_tree_view_finalize (GObject *object);
+static void gtk_tree_view_destroy (GtkObject *object);
/* widget signals */
static void gtk_tree_view_setup_model (GtkTreeView *tree_view);
GdkEventButton *event);
static gboolean gtk_tree_view_button_release (GtkWidget *widget,
GdkEventButton *event);
+static void gtk_tree_view_set_focus_child (GtkContainer *container,
+ GtkWidget *child);
static void gtk_tree_view_draw_focus (GtkWidget *widget);
static gint gtk_tree_view_focus_in (GtkWidget *widget,
GdkEventFocus *event);
static void gtk_tree_view_set_adjustments (GtkTreeView *tree_view,
GtkAdjustment *hadj,
GtkAdjustment *vadj);
-static void gtk_tree_view_changed (GtkTreeModel *model,
+static void gtk_tree_view_range_changed (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
+ GtkTreePath *end_path,
+ GtkTreeIter *end_iter,
gpointer data);
static void gtk_tree_view_inserted (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
gpointer data);
-static void gtk_tree_view_child_toggled (GtkTreeModel *model,
+static void gtk_tree_view_has_child_toggled (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
gpointer data);
static void gtk_tree_view_deleted (GtkTreeModel *model,
GtkTreePath *path,
gpointer data);
-
+static void gtk_tree_view_reordered (GtkTreeModel *model,
+ GtkTreePath *parent,
+ GtkTreeIter *iter,
+ gint *new_order,
+ gpointer data);
/* Internal functions */
+static void gtk_tree_view_unref_tree (GtkTreeView *tree_view,
+ GtkRBTree *tree);
static void gtk_tree_view_queue_draw_node (GtkTreeView *tree_view,
GtkRBTree *tree,
GtkRBNode *node,
GtkTreeIter *iter,
gint depth);
static void gtk_tree_view_check_dirty (GtkTreeView *tree_view);
+#if 0
static void gtk_tree_view_create_button (GtkTreeView *tree_view,
gint i);
static void gtk_tree_view_create_buttons (GtkTreeView *tree_view);
-static void gtk_tree_view_button_clicked (GtkWidget *widget,
- gpointer data);
+#endif
static void gtk_tree_view_clamp_node_visible (GtkTreeView *tree_view,
GtkRBTree *tree,
GtkRBNode *node);
static gboolean gtk_tree_view_maybe_begin_dragging_row (GtkTreeView *tree_view,
GdkEventMotion *event);
+static void _gtk_tree_view_update_col_width (GtkTreeView *tree_view);
-static GtkContainerClass *parent_class = NULL;
+static GtkContainerClass *parent_class = NULL;
+static guint tree_view_signals[LAST_SIGNAL] = { 0 };
/* Class Functions */
GtkType
parent_class = g_type_class_peek_parent (class);
o_class->finalize = gtk_tree_view_finalize;
+ o_class->set_property = gtk_tree_view_set_property;
+ o_class->get_property = gtk_tree_view_get_property;
+
+ object_class->destroy = gtk_tree_view_destroy;
widget_class->realize = gtk_tree_view_realize;
widget_class->unrealize = gtk_tree_view_unrealize;
widget_class->leave_notify_event = gtk_tree_view_leave_notify;
widget_class->button_press_event = gtk_tree_view_button_press;
widget_class->button_release_event = gtk_tree_view_button_release;
- widget_class->draw_focus = gtk_tree_view_draw_focus;
widget_class->focus_in_event = gtk_tree_view_focus_in;
widget_class->focus_out_event = gtk_tree_view_focus_out;
widget_class->drag_motion = gtk_tree_view_drag_motion;
widget_class->drag_drop = gtk_tree_view_drag_drop;
widget_class->drag_data_received = gtk_tree_view_drag_data_received;
-
+
container_class->forall = gtk_tree_view_forall;
container_class->remove = gtk_tree_view_remove;
+ container_class->set_focus_child = gtk_tree_view_set_focus_child;
container_class->focus = gtk_tree_view_focus;
class->set_scroll_adjustments = gtk_tree_view_set_adjustments;
+ g_object_class_install_property (o_class,
+ PROP_MODEL,
+ g_param_spec_object ("model",
+ _("TreeView Model"),
+ _("The model for the tree view"),
+ GTK_TYPE_TREE_MODEL,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (o_class,
+ PROP_HADJUSTMENT,
+ g_param_spec_object ("hadjustment",
+ _("Horizontal Adjustment"),
+ _("Horizontal Adjustment for the widget"),
+ GTK_TYPE_ADJUSTMENT,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (o_class,
+ PROP_VADJUSTMENT,
+ g_param_spec_object ("vadjustment",
+ _("Vertical Adjustment"),
+ _("Vertical Adjustment for the widget"),
+ GTK_TYPE_ADJUSTMENT,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (o_class,
+ PROP_HEADERS_VISIBLE,
+ g_param_spec_boolean ("headers_visible",
+ _("Visible"),
+ _("Show the column header buttons"),
+ FALSE,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (o_class,
+ PROP_HEADERS_CLICKABLE,
+ g_param_spec_boolean ("headers_clickable",
+ _("Headers Clickable"),
+ _("Column headers respond to click events"),
+ FALSE,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (o_class,
+ PROP_EXPANDER_COLUMN,
+ g_param_spec_uint ("expander_column",
+ _("Expand Column"),
+ _("Set the column number for the expander column"),
+ 0,
+ G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (o_class,
+ PROP_RULES_HINT,
+ g_param_spec_boolean ("rules_hint",
+ _("Rules Hint"),
+ _("Set a hint to the theme engine to draw rows in alternating colors"),
+ FALSE,
+ G_PARAM_READWRITE));
+
widget_class->set_scroll_adjustments_signal =
gtk_signal_new ("set_scroll_adjustments",
GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkTreeViewClass, set_scroll_adjustments),
- gtk_marshal_VOID__POINTER_POINTER,
+ gtk_marshal_VOID__OBJECT_OBJECT,
GTK_TYPE_NONE, 2,
GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
+
+ tree_view_signals[ROW_ACTIVATED] =
+ gtk_signal_new ("row_activated",
+ GTK_RUN_LAST | GTK_RUN_ACTION,
+ GTK_CLASS_TYPE (object_class),
+ GTK_SIGNAL_OFFSET (GtkTreeViewClass, row_activated),
+ gtk_marshal_VOID__BOXED_OBJECT,
+ GTK_TYPE_NONE, 2,
+ GTK_TYPE_TREE_PATH,
+ GTK_TYPE_TREE_VIEW_COLUMN);
+ tree_view_signals[EXPAND_ROW] =
+ g_signal_newc ("expand_row",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkTreeViewClass, expand_row),
+ _gtk_boolean_handled_accumulator, NULL,
+ gtk_marshal_BOOLEAN__BOXED_BOXED,
+ G_TYPE_BOOLEAN, 2,
+ GTK_TYPE_TREE_ITER,
+ GTK_TYPE_TREE_PATH);
+ tree_view_signals[COLLAPSE_ROW] =
+ g_signal_newc ("collapse_row",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkTreeViewClass, collapse_row),
+ _gtk_boolean_handled_accumulator, NULL,
+ gtk_marshal_BOOLEAN__BOXED_BOXED,
+ G_TYPE_BOOLEAN, 2,
+ GTK_TYPE_TREE_ITER,
+ GTK_TYPE_TREE_PATH);
}
static void
GTK_WIDGET_SET_FLAGS (tree_view, GTK_CAN_FOCUS);
+ tree_view->priv->model = NULL;
tree_view->priv->flags = GTK_TREE_VIEW_IS_LIST | GTK_TREE_VIEW_SHOW_EXPANDERS | GTK_TREE_VIEW_DRAW_KEYFOCUS | GTK_TREE_VIEW_HEADERS_VISIBLE;
tree_view->priv->tab_offset = TREE_VIEW_EXPANDER_WIDTH;
tree_view->priv->n_columns = 0;
tree_view->priv->selection = NULL;
tree_view->priv->anchor = NULL;
tree_view->priv->cursor = NULL;
-
+ tree_view->priv->header_has_focus = FALSE;
tree_view->priv->pressed_button = -1;
tree_view->priv->press_start_x = -1;
tree_view->priv->press_start_y = -1;
-
+
gtk_tree_view_set_adjustments (tree_view, NULL, NULL);
- _gtk_tree_view_set_size (tree_view, 0, 0);
+ _gtk_tree_view_update_size (tree_view);
}
{
GtkTreeView *tree_view = (GtkTreeView *) object;
- if (tree_view->priv->tree)
- _gtk_rbtree_free (tree_view->priv->tree);
-
- if (tree_view->priv->scroll_to_path != NULL)
- gtk_tree_path_free (tree_view->priv->scroll_to_path);
-
- if (tree_view->priv->drag_dest_row)
- gtk_tree_path_free (tree_view->priv->drag_dest_row);
-
g_free (tree_view->priv);
+
if (G_OBJECT_CLASS (parent_class)->finalize)
(* G_OBJECT_CLASS (parent_class)->finalize) (object);
}
-/* Widget methods
+static void
+gtk_tree_view_destroy (GtkObject *object)
+{
+ GtkTreeView *tree_view = (GtkTreeView *) object;
+ GList *list;
+
+
+ if (tree_view->priv->tree != NULL)
+ {
+ gtk_tree_view_unref_tree (tree_view, tree_view->priv->tree);
+ _gtk_rbtree_free (tree_view->priv->tree);
+ tree_view->priv->tree = NULL;
+ }
+
+ if (tree_view->priv->model != NULL)
+ {
+ g_object_unref (G_OBJECT (tree_view->priv->model));
+ tree_view->priv->model = NULL;
+ }
+
+ if (tree_view->priv->columns != NULL)
+ {
+ for (list = tree_view->priv->columns; list; list = list->next)
+ g_object_unref (G_OBJECT (list->data));
+ g_list_free (tree_view->priv->columns);
+ tree_view->priv->columns = NULL;
+ }
+
+ if (tree_view->priv->selection != NULL)
+ {
+ _gtk_tree_selection_set_tree_view (tree_view->priv->selection, NULL);
+ g_object_unref (tree_view->priv->selection);
+ tree_view->priv->selection = NULL;
+ }
+
+ if (tree_view->priv->anchor != NULL)
+ {
+ gtk_tree_row_reference_free (tree_view->priv->anchor);
+ tree_view->priv->anchor = NULL;
+ }
+
+ if (tree_view->priv->scroll_to_path != NULL)
+ {
+ gtk_tree_path_free (tree_view->priv->scroll_to_path);
+ tree_view->priv->scroll_to_path = NULL;
+ }
+
+ if (tree_view->priv->drag_dest_row != NULL)
+ {
+ gtk_tree_row_reference_free (tree_view->priv->drag_dest_row);
+ tree_view->priv->drag_dest_row = NULL;
+ }
+
+ if (tree_view->priv->cursor)
+ {
+ gtk_tree_row_reference_free (tree_view->priv->cursor);
+ tree_view->priv->cursor = NULL;
+ }
+
+ if (GTK_OBJECT_CLASS (parent_class)->destroy)
+ (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+}
+
+/* Property handlers
*/
static void
-gtk_tree_view_realize_buttons (GtkTreeView *tree_view)
+gtk_tree_view_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
- GList *list;
- GtkTreeViewColumn *column;
- GdkWindowAttr attr;
- guint attributes_mask;
+ GtkTreeView *tree_view;
- g_return_if_fail (GTK_WIDGET_REALIZED (tree_view));
- g_return_if_fail (tree_view->priv->header_window != NULL);
-
- attr.window_type = GDK_WINDOW_CHILD;
- attr.wclass = GDK_INPUT_ONLY;
- attr.visual = gtk_widget_get_visual (GTK_WIDGET (tree_view));
- attr.colormap = gtk_widget_get_colormap (GTK_WIDGET (tree_view));
- attr.event_mask = gtk_widget_get_events (GTK_WIDGET (tree_view));
- attr.event_mask = (GDK_BUTTON_PRESS_MASK |
- GDK_BUTTON_RELEASE_MASK |
- GDK_POINTER_MOTION_MASK |
- GDK_POINTER_MOTION_HINT_MASK |
- GDK_KEY_PRESS_MASK);
- attributes_mask = GDK_WA_CURSOR | GDK_WA_X | GDK_WA_Y;
- attr.cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);
- tree_view->priv->cursor_drag = attr.cursor;
-
- attr.y = 0;
- attr.width = TREE_VIEW_DRAG_WIDTH;
- attr.height = tree_view->priv->header_height;
+ tree_view = GTK_TREE_VIEW (object);
- for (list = tree_view->priv->columns; list; list = list->next)
+ switch (prop_id)
{
- column = list->data;
- if (column->button)
- {
- if (column->visible == FALSE)
- continue;
- if (column->window != NULL)
- continue;
+ case PROP_MODEL:
+ gtk_tree_view_set_model (tree_view, GTK_TREE_MODEL (g_value_get_object (value)));
+ break;
+ case PROP_HADJUSTMENT:
+ gtk_tree_view_set_hadjustment (tree_view, GTK_ADJUSTMENT (g_value_get_object (value)));
+ break;
+ case PROP_VADJUSTMENT:
+ gtk_tree_view_set_vadjustment (tree_view, GTK_ADJUSTMENT (g_value_get_object (value)));
+ break;
+ case PROP_HEADERS_VISIBLE:
+ gtk_tree_view_set_headers_visible (tree_view, g_value_get_boolean (value));
+ break;
+ case PROP_HEADERS_CLICKABLE:
+ gtk_tree_view_set_headers_clickable (tree_view, g_value_get_boolean (value));
+ break;
+ case PROP_EXPANDER_COLUMN:
+ gtk_tree_view_set_expander_column (tree_view, g_value_get_uint (value));
+ break;
+ case PROP_RULES_HINT:
+ gtk_tree_view_set_rules_hint (tree_view, g_value_get_boolean (value));
+ break;
+ default:
+ break;
+ }
+}
+
+static void
+gtk_tree_view_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GtkTreeView *tree_view;
- gtk_widget_set_parent_window (column->button,
- tree_view->priv->header_window);
+ tree_view = GTK_TREE_VIEW (object);
- attr.x = (column->button->allocation.x + column->button->allocation.width) - 3;
-
- column->window = gdk_window_new (tree_view->priv->header_window,
- &attr, attributes_mask);
- gdk_window_set_user_data (column->window, tree_view);
- }
+ switch (prop_id)
+ {
+ case PROP_MODEL:
+ g_value_set_object (value, G_OBJECT (tree_view->priv->model));
+ break;
+ case PROP_HADJUSTMENT:
+ g_value_set_object (value, G_OBJECT (tree_view->priv->hadjustment));
+ break;
+ case PROP_VADJUSTMENT:
+ g_value_set_object (value, G_OBJECT (tree_view->priv->vadjustment));
+ break;
+ case PROP_HEADERS_VISIBLE:
+ g_value_set_boolean (value, gtk_tree_view_get_headers_visible (tree_view));
+ break;
+ case PROP_HEADERS_CLICKABLE:
+ /* g_value_set_boolean (value, gtk_tree_view_get_headers_clickable (tree_view)); */
+ break;
+ case PROP_EXPANDER_COLUMN:
+ g_value_set_uint (value, tree_view->priv->expander_column);
+ break;
+ case PROP_RULES_HINT:
+ g_value_set_boolean (value, tree_view->priv->has_rules);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
}
}
+/* Widget methods
+ */
+
static void
gtk_tree_view_realize (GtkWidget *widget)
{
tree_view = GTK_TREE_VIEW (widget);
- if (!GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_MODEL_SETUP) &&
- tree_view->priv->model)
- gtk_tree_view_setup_model (tree_view);
-
gtk_tree_view_check_dirty (GTK_TREE_VIEW (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_parent_window (child->widget, tree_view->priv->bin_window);
}
- gtk_tree_view_realize_buttons (GTK_TREE_VIEW (widget));
- _gtk_tree_view_set_size (GTK_TREE_VIEW (widget), -1, -1);
+
+ for (tmp_list = tree_view->priv->columns; tmp_list; tmp_list = tmp_list->next)
+ _gtk_tree_view_column_realize_button (GTK_TREE_VIEW_COLUMN (tmp_list->data));
+
+ _gtk_tree_view_update_size (GTK_TREE_VIEW (widget));
if (tree_view->priv->scroll_to_path != NULL ||
tree_view->priv->scroll_to_column != NULL)
gtk_tree_view_unrealize (GtkWidget *widget)
{
GtkTreeView *tree_view;
+ GList *list;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW (widget));
tree_view = GTK_TREE_VIEW (widget);
gtk_timeout_remove (tree_view->priv->open_dest_timeout);
tree_view->priv->open_dest_timeout = 0;
}
-
- /* FIXME where do we clear column->window for each column? */
-
+
+ for (list = tree_view->priv->columns; list; list = list->next)
+ _gtk_tree_view_column_unrealize_button (GTK_TREE_VIEW_COLUMN (list->data));
+
gdk_window_set_user_data (tree_view->priv->bin_window, NULL);
gdk_window_destroy (tree_view->priv->bin_window);
tree_view->priv->bin_window = NULL;
tree_view->priv->header_window = NULL;
gdk_cursor_destroy (tree_view->priv->cursor_drag);
- gdk_gc_destroy (tree_view->priv->xor_gc);
-
+ gdk_gc_destroy (tree_view->priv->xor_gc);
+
/* GtkWidget::unrealize destroys children and widget->window */
-
+
if (GTK_WIDGET_CLASS (parent_class)->unrealize)
(* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
}
GList *list;
g_return_if_fail (GTK_WIDGET_MAPPED (tree_view));
-
+
if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE))
{
GtkTreeViewColumn *column;
-
+
for (list = tree_view->priv->columns; list; list = list->next)
{
column = list->data;
GList *tmp_list;
GtkTreeView *tree_view;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW (widget));
tree_view = GTK_TREE_VIEW (widget);
gdk_window_show (tree_view->priv->bin_window);
gtk_tree_view_map_buttons (tree_view);
-
+
gdk_window_show (widget->window);
}
gtk_tree_view_size_request_buttons (GtkTreeView *tree_view)
{
GList *list;
-
+
tree_view->priv->header_height = 1;
if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_MODEL_SETUP))
{
GtkRequisition requisition;
GtkTreeViewColumn *column;
-
+
column = list->data;
-
+
gtk_widget_size_request (column->button, &requisition);
-
- gtk_tree_view_column_set_width (column,
- MAX (column->width, requisition.width));
+
+ gtk_tree_view_column_set_width (column, MAX (column->width, requisition.width));
tree_view->priv->header_height = MAX (tree_view->priv->header_height, requisition.height);
}
}
GtkTreeView *tree_view;
GList *tmp_list;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW (widget));
tree_view = GTK_TREE_VIEW (widget);
{
GtkTreeView *tree_view;
GList *list;
- GList *last_column;
GtkTreeViewColumn *column;
GtkAllocation allocation;
gint width = 0;
allocation.y = 0;
allocation.height = tree_view->priv->header_height;
- for (last_column = g_list_last (tree_view->priv->columns);
- last_column && !(GTK_TREE_VIEW_COLUMN (last_column->data)->visible);
- last_column = last_column->prev)
- ;
-
- if (last_column == NULL)
- return;
-
- for (list = tree_view->priv->columns; list != last_column; list = list->next)
+ for (list = tree_view->priv->columns; list != NULL; list = list->next)
{
column = list->data;
continue;
allocation.x = width;
- allocation.width = column->width;
+ allocation.width = column->displayed_width;
width += column->width;
gtk_widget_size_allocate (column->button, &allocation);
if (column->window)
gdk_window_move_resize (column->window,
- width - TREE_VIEW_DRAG_WIDTH/2, allocation.y,
+ allocation.x + allocation.width - TREE_VIEW_DRAG_WIDTH/2,
+ allocation.y,
TREE_VIEW_DRAG_WIDTH, allocation.height);
}
- column = list->data;
- allocation.x = width;
- allocation.width = MAX (widget->allocation.width, tree_view->priv->width) - width;
- gtk_widget_size_allocate (column->button, &allocation);
- if (column->window)
- gdk_window_move_resize (column->window,
- allocation.x + allocation.width - TREE_VIEW_DRAG_WIDTH/2,
- 0,
- TREE_VIEW_DRAG_WIDTH, allocation.height);
}
static void
GList *tmp_list;
GtkTreeView *tree_view;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW (widget));
widget->allocation = *allocation;
tree_view = GTK_TREE_VIEW (widget);
+ gtk_tree_view_check_dirty (tree_view);
+
tmp_list = tree_view->priv->children;
while (tmp_list)
gdk_window_move_resize (widget->window,
allocation->x, allocation->y,
allocation->width, allocation->height);
+
gdk_window_move_resize (tree_view->priv->header_window,
0, 0,
MAX (tree_view->priv->width, allocation->width),
tree_view->priv->header_height);
+
+ if (tree_view->priv->width < allocation->width)
+ gdk_window_resize (tree_view->priv->bin_window,
+ allocation->width,
+ tree_view->priv->height + TREE_VIEW_HEADER_HEIGHT (tree_view));
+
+ _gtk_tree_view_update_col_width (tree_view);
}
- /* FIXME I don't think the invariant that the model must be setup
- * before touching the buttons is maintained in most of the
- * rest of the code, e.g. in realize, so something is wrong
- */
- if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_MODEL_SETUP))
- gtk_tree_view_size_allocate_buttons (widget);
-
+ gtk_tree_view_size_allocate_buttons (widget);
+
tree_view->priv->hadjustment->page_size = allocation->width;
tree_view->priv->hadjustment->page_increment = allocation->width / 2;
tree_view->priv->hadjustment->lower = 0;
tree_view->priv->hadjustment->upper = tree_view->priv->width;
+
if (tree_view->priv->hadjustment->value + allocation->width > tree_view->priv->width)
tree_view->priv->hadjustment->value = MAX (tree_view->priv->width - allocation->width, 0);
gtk_signal_emit_by_name (GTK_OBJECT (tree_view->priv->hadjustment), "changed");
tree_view->priv->vadjustment->page_increment = (allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view)) / 2;
tree_view->priv->vadjustment->lower = 0;
tree_view->priv->vadjustment->upper = tree_view->priv->height;
+
if (tree_view->priv->vadjustment->value + allocation->height > tree_view->priv->height)
gtk_adjustment_set_value (tree_view->priv->vadjustment,
- (gfloat) MAX (tree_view->priv->height - allocation->height, 0));
- gtk_signal_emit_by_name (GTK_OBJECT (tree_view->priv->vadjustment), "changed");
-}
-
-static void
-gtk_tree_view_draw_node_focus_rect (GtkWidget *widget,
- GtkTreePath *path)
-{
- GtkTreeView *tree_view;
- GtkRBTree *tree = NULL;
- GtkRBNode *node = NULL;
- gint bin_window_width = 0;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_TREE_VIEW (widget));
-
- tree_view = GTK_TREE_VIEW (widget);
-
- _gtk_tree_view_find_node (tree_view, path, &tree, &node);
+ MAX (tree_view->priv->height - allocation->height, 0));
- if (tree == NULL)
- return;
+ gtk_signal_emit_by_name (GTK_OBJECT (tree_view->priv->vadjustment), "changed");
- gdk_drawable_get_size (tree_view->priv->bin_window,
- &bin_window_width, NULL);
-
- /* FIXME need a style function appropriate for this */
- gdk_draw_rectangle (tree_view->priv->bin_window,
- widget->style->fg_gc[GTK_STATE_NORMAL],
- FALSE,
- 0,
- BACKGROUND_FIRST_PIXEL (tree_view, tree, node),
- bin_window_width - 2,
- BACKGROUND_HEIGHT (node) - 1);
}
GdkPixmap*
gint x = 1, y = 1;
GdkDrawable *drawable;
gint bin_window_width;
-
+
widget = GTK_WIDGET (tree_view);
depth = gtk_tree_path_get_depth (path);
- if (_gtk_tree_view_find_node (tree_view,
- path,
- &tree,
- &node))
+ _gtk_tree_view_find_node (tree_view,
+ path,
+ &tree,
+ &node);
+
+ if (tree == NULL)
return NULL;
if (!gtk_tree_model_get_iter (tree_view->priv->model,
&iter,
path))
return NULL;
-
+
cell_offset = x;
background_area.y = y;
gdk_drawable_get_size (tree_view->priv->bin_window,
&bin_window_width, NULL);
-
+
drawable = gdk_pixmap_new (tree_view->priv->bin_window,
bin_window_width + 2,
background_area.height + 2,
0, 0,
bin_window_width + 1,
background_area.height + 1);
-
+
for (i = 0, list = tree_view->priv->columns; i < tree_view->priv->n_columns; i++, list = list->next)
{
GtkTreeViewColumn *column = list->data;
GdkRectangle cell_area;
-
+ gboolean visible;
+
if (!column->visible)
continue;
&iter);
background_area.x = cell_offset;
- background_area.width = TREE_VIEW_COLUMN_WIDTH (column);
+ background_area.width = column->displayed_width;
cell_area = background_area;
cell_area.y += TREE_VIEW_VERTICAL_SEPARATOR / 2;
cell_area.height -= TREE_VIEW_VERTICAL_SEPARATOR;
-
+
if (i == tree_view->priv->expander_column &&
TREE_VIEW_DRAW_EXPANDERS(tree_view))
{
cell_area.x += depth * tree_view->priv->tab_offset;
cell_area.width -= depth * tree_view->priv->tab_offset;
}
-
- gtk_cell_renderer_render (cell,
- drawable,
- widget,
- &background_area,
- &cell_area,
- NULL,
- 0);
-
- cell_offset += TREE_VIEW_COLUMN_WIDTH (column);
+
+ g_object_get (G_OBJECT (cell), "visible", &visible, NULL);
+ if (visible)
+ gtk_cell_renderer_render (cell,
+ drawable,
+ widget,
+ &background_area,
+ &cell_area,
+ NULL,
+ 0);
+
+ cell_offset += column->displayed_width;
}
return drawable;
GtkTreePath *path;
GtkRBTree *tree;
GList *list;
- GtkRBNode *node, *last_node = NULL;
+ GtkRBNode *node;
GtkRBNode *cursor = NULL;
- GtkRBTree *cursor_tree = NULL, *last_tree = NULL;
+ GtkRBTree *cursor_tree = NULL;
GtkRBNode *drag_highlight = NULL;
GtkRBTree *drag_highlight_tree = NULL;
GtkTreeIter iter;
GdkRectangle background_area;
GdkRectangle cell_area;
guint flags;
- gboolean last_selected;
gint highlight_x;
gint bin_window_width;
-
- g_return_val_if_fail (widget != NULL, FALSE);
+ GtkTreePath *cursor_path;
+ GtkTreePath *drag_dest_path;
+ GList *last_column;
+
g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
tree_view = GTK_TREE_VIEW (widget);
if (tree_view->priv->tree == NULL)
return TRUE;
-
+
gtk_tree_view_check_dirty (GTK_TREE_VIEW (widget));
/* we want to account for a potential HEADER offset.
* That is, if the header exists, we want to offset our event by its
new_y = (event->area.y<TREE_VIEW_HEADER_HEIGHT (tree_view))?TREE_VIEW_HEADER_HEIGHT (tree_view):event->area.y;
/* y_offset is the */
-
+
y_offset = -_gtk_rbtree_find_offset (tree_view->priv->tree,
TREE_WINDOW_Y_TO_RBTREE_Y (tree_view, new_y),
&tree,
if (node == NULL)
return TRUE;
- /* See if the last node was selected */
- _gtk_rbtree_prev_full (tree, node, &last_tree, &last_node);
- last_selected = (last_node && GTK_RBNODE_FLAG_SET (last_node, GTK_RBNODE_IS_SELECTED));
-
/* find the path for the node */
path = _gtk_tree_view_find_path ((GtkTreeView *)widget,
tree,
depth = gtk_tree_path_get_depth (path);
gtk_tree_path_free (path);
+ cursor_path = NULL;
+ drag_dest_path = NULL;
+
if (tree_view->priv->cursor)
- _gtk_tree_view_find_node (tree_view, tree_view->priv->cursor, &cursor_tree, &cursor);
+ cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
+
+ if (cursor_path)
+ _gtk_tree_view_find_node (tree_view, cursor_path,
+ &cursor_tree, &cursor);
if (tree_view->priv->drag_dest_row)
- _gtk_tree_view_find_node (tree_view, tree_view->priv->drag_dest_row,
+ drag_dest_path = gtk_tree_row_reference_get_path (tree_view->priv->drag_dest_row);
+
+ if (drag_dest_path)
+ _gtk_tree_view_find_node (tree_view, drag_dest_path,
&drag_highlight_tree, &drag_highlight);
gdk_drawable_get_size (tree_view->priv->bin_window,
&bin_window_width, NULL);
-
+
+ for (last_column = g_list_last (tree_view->priv->columns);
+ last_column &&
+ !(GTK_TREE_VIEW_COLUMN (last_column->data)->visible) &&
+ GTK_WIDGET_CAN_FOCUS (GTK_TREE_VIEW_COLUMN (last_column->data)->button);
+ last_column = last_column->prev)
+ ;
+
/* Actually process the expose event. To do this, we want to
* start at the first node of the event, and walk the tree in
* order, drawing each successive node.
max_height = MAX (TREE_VIEW_EXPANDER_MIN_HEIGHT, GTK_RBNODE_GET_HEIGHT (node));
else
*/
+ gboolean parity;
+
max_height = BACKGROUND_HEIGHT (node);
x_offset = -event->area.x;
cell_offset = 0;
highlight_x = 0; /* should match x coord of first cell */
-
- background_area.y = y_offset + event->area.y + TREE_VIEW_VERTICAL_SEPARATOR / 2;
- background_area.height = max_height - TREE_VIEW_VERTICAL_SEPARATOR;
+
+ background_area.y = y_offset + event->area.y;
+ background_area.height = max_height;
flags = 0;
if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PRELIT))
flags |= GTK_CELL_RENDERER_PRELIT;
+ parity = _gtk_rbtree_node_find_parity (tree, node);
+
if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
- {
- flags |= GTK_CELL_RENDERER_SELECTED;
-
- /* Draw the selection */
- gdk_draw_rectangle (event->window,
- GTK_WIDGET (tree_view)->style->bg_gc [GTK_STATE_SELECTED],
- TRUE,
- event->area.x,
- background_area.y - (last_selected?TREE_VIEW_VERTICAL_SEPARATOR:0),
- event->area.width,
- background_area.height + (last_selected?TREE_VIEW_VERTICAL_SEPARATOR:0));
- last_selected = TRUE;
- }
- else
- {
- last_selected = FALSE;
- }
+ flags |= GTK_CELL_RENDERER_SELECTED;
for (i = 0, list = tree_view->priv->columns; i < tree_view->priv->n_columns; i++, list = list->next)
{
GtkTreeViewColumn *column = list->data;
+ const gchar *detail = NULL;
if (!column->visible)
- continue;
+ continue;
+
+ if (cell_offset > event->area.x + event->area.width ||
+ cell_offset + column->displayed_width < event->area.x)
+ {
+ cell_offset += column->displayed_width;
+ continue;
+ }
+
+ if (column->show_sort_indicator)
+ flags |= GTK_CELL_RENDERER_SORTED;
+ else
+ flags &= ~GTK_CELL_RENDERER_SORTED;
cell = column->cell;
gtk_tree_view_column_set_cell_data (column,
&iter);
background_area.x = cell_offset;
- background_area.width = TREE_VIEW_COLUMN_WIDTH (column);
+ background_area.width = column->displayed_width;
+
+ cell_area = background_area;
+ cell_area.y += TREE_VIEW_VERTICAL_SEPARATOR / 2;
+ cell_area.height -= TREE_VIEW_VERTICAL_SEPARATOR;
+
+ /* Select the detail for drawing the cell. relevant
+ * factors are parity, sortedness, and whether to
+ * display rules.
+ */
+
+ /* FIXME when we have style properties, clean this up.
+ */
+
+ if (tree_view->priv->has_rules)
+ {
+ if (flags & GTK_CELL_RENDERER_SORTED)
+ {
+ if (parity)
+ detail = "cell_odd_ruled_sorted";
+ else
+ detail = "cell_even_ruled_sorted";
+ }
+ else
+ {
+ if (parity)
+ detail = "cell_odd_ruled";
+ else
+ detail = "cell_even_ruled";
+ }
+ }
+ else
+ {
+ if (flags & GTK_CELL_RENDERER_SORTED)
+ {
+ if (parity)
+ detail = "cell_odd_sorted";
+ else
+ detail = "cell_even_sorted";
+ }
+ else
+ {
+ if (parity)
+ detail = "cell_odd";
+ else
+ detail = "cell_even";
+ }
+ }
+
+ g_assert (detail);
+
+ /* Draw background */
+ gtk_paint_flat_box (widget->style,
+ event->window,
+ (flags & GTK_CELL_RENDERER_SELECTED) ?
+ GTK_STATE_SELECTED : GTK_STATE_NORMAL,
+ GTK_SHADOW_NONE,
+ &event->area,
+ widget,
+ detail,
+ background_area.x,
+ background_area.y,
+ background_area.width,
+ background_area.height);
+
if (i == tree_view->priv->expander_column &&
TREE_VIEW_DRAW_EXPANDERS(tree_view))
{
- cell_area = background_area;
+ gboolean visible;
+
cell_area.x += depth*tree_view->priv->tab_offset;
cell_area.width -= depth*tree_view->priv->tab_offset;
* level of the tree we're dropping at.
*/
highlight_x = cell_area.x;
-
- gtk_cell_renderer_render (cell,
- event->window,
- widget,
- &background_area,
- &cell_area,
- &event->area,
- flags);
+
+ g_object_get (G_OBJECT (cell), "visible", &visible, NULL);
+ if (visible)
+ gtk_cell_renderer_render (cell,
+ event->window,
+ widget,
+ &background_area,
+ &cell_area,
+ &event->area,
+ flags);
+
if ((node->flags & GTK_RBNODE_IS_PARENT) == GTK_RBNODE_IS_PARENT)
{
gint x, y;
}
else
{
- cell_area = background_area;
- gtk_cell_renderer_render (cell,
- event->window,
- widget,
- &background_area,
- &cell_area,
- &event->area,
- flags);
+ gboolean visible;
+ g_object_get (G_OBJECT (cell), "visible", &visible, NULL);
+
+ if (visible)
+ gtk_cell_renderer_render (cell,
+ event->window,
+ widget,
+ &background_area,
+ &cell_area,
+ &event->area,
+ flags);
}
- cell_offset += TREE_VIEW_COLUMN_WIDTH (column);
+ cell_offset += column->displayed_width;
}
- if (node == cursor &&
- GTK_WIDGET_HAS_FOCUS (widget))
+ if (node == cursor && GTK_WIDGET_HAS_FOCUS (widget))
gtk_tree_view_draw_focus (widget);
if (node == drag_highlight)
/* Draw indicator for the drop
*/
gint highlight_y = -1;
+ GtkRBTree *tree = NULL;
+ GtkRBNode *node = NULL;
+ gint width;
switch (tree_view->priv->drag_dest_pos)
{
case GTK_TREE_VIEW_DROP_BEFORE:
highlight_y = background_area.y - TREE_VIEW_VERTICAL_SEPARATOR/2;
break;
-
+
case GTK_TREE_VIEW_DROP_AFTER:
highlight_y = background_area.y + background_area.height + TREE_VIEW_VERTICAL_SEPARATOR/2;
break;
-
+
case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE:
case GTK_TREE_VIEW_DROP_INTO_OR_AFTER:
- gtk_tree_view_draw_node_focus_rect (widget,
- tree_view->priv->drag_dest_row);
+ _gtk_tree_view_find_node (tree_view, drag_dest_path, &tree, &node);
+
+ if (tree == NULL)
+ break;
+ gdk_drawable_get_size (tree_view->priv->bin_window,
+ &width, NULL);
+ gtk_paint_focus (widget->style,
+ tree_view->priv->bin_window,
+ NULL,
+ widget,
+ "add-mode",
+ 0, BACKGROUND_FIRST_PIXEL (tree_view, tree, node),
+ width - 1, BACKGROUND_HEIGHT (node) - 1);
+
break;
}
highlight_y);
}
}
-
+
y_offset += max_height;
if (node->children)
{
tree = node->children;
node = tree->root;
+
+ g_assert (node != tree->nil);
+
while (node->left != tree->nil)
node = node->left;
has_child = gtk_tree_model_iter_children (tree_view->priv->model,
}
while (y_offset < event->area.height);
+ if (cursor_path)
+ gtk_tree_path_free (cursor_path);
+
+ if (drag_dest_path)
+ gtk_tree_path_free (drag_dest_path);
+
return TRUE;
}
{
GtkTreeView *tree_view;
- g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
tree_view = GTK_TREE_VIEW (widget);
GdkRectangle arrow;
gint x2;
+ if (!GTK_WIDGET_REALIZED (tree_view))
+ return FALSE;
+
if ((node->flags & GTK_RBNODE_IS_PARENT) == 0)
return FALSE;
-
+
arrow.y = BACKGROUND_FIRST_PIXEL (tree_view, tree, node);
-
+
arrow.height = BACKGROUND_HEIGHT (node);
gtk_tree_view_get_arrow_xrange (tree_view, &arrow.x, &x2);
return (x >= arrow.x &&
x < (arrow.x + arrow.height) &&
y >= arrow.y &&
- y < (arrow.y + arrow.height));
+ y < (arrow.y + arrow.height));
}
static void
{
if (tree_view->priv->prelight_node == NULL)
return;
-
+
GTK_RBNODE_UNSET_FLAG (tree_view->priv->prelight_node, GTK_RBNODE_IS_PRELIT);
-
+
if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_ARROW_PRELIT) &&
!coords_are_over_arrow (tree_view,
tree_view->priv->prelight_tree,
/* We need to unprelight the old arrow. */
{
GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_ARROW_PRELIT);
-
+
gtk_tree_view_draw_arrow (tree_view,
tree_view->priv->prelight_tree,
tree_view->priv->prelight_node,
x,
- y);
+ y);
}
-
+
tree_view->priv->prelight_node = NULL;
tree_view->priv->prelight_tree = NULL;
}
GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_IS_PRELIT);
}
+static void
+ensure_unprelighted (GtkTreeView *tree_view)
+{
+ do_unprelight (tree_view, -1000, -1000); /* coords not possibly over an arrow */
+}
+
static gboolean
gtk_tree_view_motion (GtkWidget *widget,
GdkEventMotion *event)
gint new_y;
GtkRBTree *old_prelight_tree;
GtkRBNode *old_prelight_node;
-
+
tree_view = (GtkTreeView *) widget;
-
+
if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE))
{
gint x;
}
/* FIXME: Do we need to scroll */
- _gtk_tree_view_set_size (GTK_TREE_VIEW (widget), -1, tree_view->priv->height);
+ _gtk_tree_view_update_size (GTK_TREE_VIEW (widget));
return FALSE;
}
old_prelight_tree = tree_view->priv->prelight_tree;
old_prelight_node = tree_view->priv->prelight_node;
-
- do_unprelight (tree_view, event->x, event->y);
-
+
+ do_unprelight (tree_view, event->x, event->y);
+
new_y = ((gint)event->y<TREE_VIEW_HEADER_HEIGHT (tree_view))?TREE_VIEW_HEADER_HEIGHT (tree_view):(gint)event->y;
_gtk_rbtree_find_offset (tree_view->priv->tree,
&tree,
&node);
- if (node == NULL)
+ if (tree == NULL)
return TRUE;
/* If we are currently pressing down a button, we don't want to prelight anything else. */
tree_view->priv->prelight_node,
NULL);
}
-
+
return TRUE;
}
GtkRBNode *node;
gint new_y;
- g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
tree_view = GTK_TREE_VIEW (widget);
TREE_WINDOW_Y_TO_RBTREE_Y (tree_view, new_y),
&tree,
&node);
-
+
if (node == NULL)
return FALSE;
tree_view->priv->prelight_tree,
tree_view->priv->prelight_node,
NULL);
-
+
return TRUE;
}
{
GtkTreeView *tree_view;
- g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
tree_view = GTK_TREE_VIEW (widget);
tree_view->priv->prelight_tree,
tree_view->priv->prelight_node,
NULL);
-
- do_unprelight (tree_view, -1000, -1000); /* coords not possibly over an arrow */
+
+ ensure_unprelighted (tree_view);
return TRUE;
}
{
GtkTreeView *tree_view;
GList *list;
- GtkTreeViewColumn *column;
+ GtkTreeViewColumn *column = NULL;
gint i;
GdkRectangle background_area;
GdkRectangle cell_area;
- g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
gint depth;
gint new_y;
gint y_offset;
+ GtkTreeViewColumn *column = NULL;
if (!GTK_WIDGET_HAS_FOCUS (widget))
gtk_widget_grab_focus (widget);
for (i = 0, list = tree_view->priv->columns; i < tree_view->priv->n_columns; i++, list = list->next)
{
- GtkTreeViewColumn *column = list->data;
GtkCellRenderer *cell;
GtkTreeIter iter;
+ gboolean visible;
+ gboolean can_activate;
+
+ column = list->data;
if (!column->visible)
continue;
- background_area.width = TREE_VIEW_COLUMN_WIDTH (column);
+ background_area.width = column->displayed_width;
if (i == tree_view->priv->expander_column &&
TREE_VIEW_DRAW_EXPANDERS(tree_view))
{
&iter);
path_string = gtk_tree_path_to_string (path);
- if (gtk_cell_renderer_event (cell,
- (GdkEvent *)event,
- widget,
- path_string,
- &background_area,
- &cell_area,
- 0))
+ g_object_get (G_OBJECT (cell),
+ "visible", &visible,
+ "can_activate", &can_activate,
+ NULL);
+ if (visible &&
+ can_activate &&
+ gtk_cell_renderer_event (cell, (GdkEvent *)event,
+ widget, path_string,
+ &background_area,
+ &cell_area, 0))
{
g_free (path_string);
gtk_tree_path_free (path);
}
}
+ if (column == NULL)
+ return FALSE;
+
/* Save press to possibly begin a drag
*/
if (tree_view->priv->pressed_button < 0)
tree_view->priv->pressed_button = event->button;
tree_view->priv->press_start_x = event->x;
tree_view->priv->press_start_y = event->y;
- }
-
+ }
+
/* Handle the selection */
if (tree_view->priv->selection == NULL)
tree_view->priv->selection =
tree,
path,
event->state);
+
+ if (event->button == 1 && event->type == GDK_2BUTTON_PRESS)
+ gtk_tree_view_row_activated (tree_view, path, column);
+
gtk_tree_path_free (path);
return TRUE;
}
{
GtkTreeView *tree_view;
- g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
if (tree_view->priv->pressed_button == event->button)
tree_view->priv->pressed_button = -1;
-
+
if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE))
{
gpointer drag_data;
if (tree_view->priv->button_pressed_node == tree_view->priv->prelight_node &&
GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_ARROW_PRELIT))
{
- GtkTreePath *path;
+ GtkTreePath *path = NULL;
GtkTreeIter iter;
/* Actually activate the node */
if (tree_view->priv->button_pressed_node->children == NULL)
{
GtkTreeIter child;
- path = _gtk_tree_view_find_path (GTK_TREE_VIEW (widget),
+ path = _gtk_tree_view_find_path (tree_view,
tree_view->priv->button_pressed_tree,
tree_view->priv->button_pressed_node);
- tree_view->priv->button_pressed_node->children = _gtk_rbtree_new ();
- tree_view->priv->button_pressed_node->children->parent_tree = tree_view->priv->button_pressed_tree;
- tree_view->priv->button_pressed_node->children->parent_node = tree_view->priv->button_pressed_node;
gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
- gtk_tree_model_iter_children (tree_view->priv->model, &child, &iter);
-
- gtk_tree_view_build_tree (tree_view,
- tree_view->priv->button_pressed_node->children,
- &child,
- gtk_tree_path_get_depth (path) + 1,
- FALSE,
- GTK_WIDGET_REALIZED (widget));
+
+ if (gtk_tree_model_iter_children (tree_view->priv->model, &child, &iter))
+ {
+ gboolean expand;
+ g_signal_emit (G_OBJECT (tree_view), tree_view_signals[EXPAND_ROW], 0, &iter, path, &expand);
+ if (! expand)
+ {
+ tree_view->priv->button_pressed_node->children = _gtk_rbtree_new ();
+ tree_view->priv->button_pressed_node->children->parent_tree = tree_view->priv->button_pressed_tree;
+ tree_view->priv->button_pressed_node->children->parent_node = tree_view->priv->button_pressed_node;
+ gtk_tree_view_build_tree (tree_view,
+ tree_view->priv->button_pressed_node->children,
+ &child,
+ gtk_tree_path_get_depth (path) + 1,
+ FALSE,
+ GTK_WIDGET_REALIZED (widget));
+
+ }
+ }
}
else
{
+ gboolean collapse;
+
path = _gtk_tree_view_find_path (GTK_TREE_VIEW (widget),
- tree_view->priv->button_pressed_node->children,
- tree_view->priv->button_pressed_node->children->root);
+ tree_view->priv->button_pressed_tree,
+ tree_view->priv->button_pressed_node);
gtk_tree_model_get_iter (tree_view->priv->model,
&iter,
path);
+ g_signal_emit (G_OBJECT (tree_view), tree_view_signals[COLLAPSE_ROW], 0, &iter, path, &collapse);
- gtk_tree_view_discover_dirty (GTK_TREE_VIEW (widget),
- tree_view->priv->button_pressed_node->children,
- &iter,
- gtk_tree_path_get_depth (path));
- _gtk_rbtree_remove (tree_view->priv->button_pressed_node->children);
+ if (! collapse)
+ {
+ GtkTreeIter child_iter;
+ gtk_tree_path_append_index (path, 0);
+ gtk_tree_model_iter_children (tree_view->priv->model,
+ &child_iter,
+ &iter);
+ gtk_tree_view_discover_dirty (GTK_TREE_VIEW (widget),
+ tree_view->priv->button_pressed_node->children,
+ &child_iter,
+ gtk_tree_path_get_depth (path));
+ gtk_tree_view_unref_tree (GTK_TREE_VIEW (widget),
+ tree_view->priv->button_pressed_node->children);
+ _gtk_rbtree_remove (tree_view->priv->button_pressed_node->children);
+ }
}
- gtk_tree_path_free (path);
+ if (path)
+ gtk_tree_path_free (path);
- _gtk_tree_view_set_size (GTK_TREE_VIEW (widget), -1, -1);
+ _gtk_tree_view_update_size (GTK_TREE_VIEW (widget));
}
tree_view->priv->button_pressed_node = NULL;
return TRUE;
}
+static void
+gtk_tree_view_set_focus_child (GtkContainer *container,
+ GtkWidget *child)
+{
+ GtkTreeView *tree_view = GTK_TREE_VIEW (container);
+ GList *list;
+
+ for (list = tree_view->priv->columns; list; list = list->next)
+ {
+ if (GTK_TREE_VIEW_COLUMN (list->data)->button == child)
+ {
+ tree_view->priv->focus_column = GTK_TREE_VIEW_COLUMN (list->data);
+ break;
+ }
+ }
+ (* parent_class->set_focus_child) (container, child);
+}
static void
gtk_tree_view_draw_focus (GtkWidget *widget)
{
GtkTreeView *tree_view;
+ GtkTreePath *cursor_path;
+ GtkRBTree *tree = NULL;
+ GtkRBNode *node = NULL;
+ gint x, y;
+ gint width, height;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW (widget));
tree_view = GTK_TREE_VIEW (widget);
if (! GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_DRAW_KEYFOCUS))
return;
+
if (tree_view->priv->cursor == NULL)
return;
- gtk_tree_view_draw_node_focus_rect (widget, tree_view->priv->cursor);
+ cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
+ if (cursor_path == NULL)
+ return;
+
+ _gtk_tree_view_find_node (tree_view, cursor_path, &tree, &node);
+
+ if (tree == NULL)
+ {
+ gtk_tree_path_free (cursor_path);
+ return;
+ }
+
+ gdk_drawable_get_size (tree_view->priv->bin_window,
+ &width, NULL);
+
+
+ x = 0;
+ y = BACKGROUND_FIRST_PIXEL (tree_view, tree, node);
+ gdk_drawable_get_size (tree_view->priv->bin_window,
+ &width, NULL);
+ width = width - 1;
+ height = BACKGROUND_HEIGHT (node) - 1;
+ if (tree_view->priv->focus_column != NULL)
+ {
+ gboolean visible;
+ gboolean can_focus;
+
+ g_object_get (G_OBJECT (tree_view->priv->focus_column->cell),
+ "can_activate", &can_focus,
+ "visible", &visible,
+ NULL);
+ if (can_focus && visible)
+ {
+ GtkTreeIter iter;
+ GdkRectangle cell_area;
+ gint x_offset;
+ gint y_offset;
+
+ cell_area.x = tree_view->priv->focus_column->button->allocation.x;
+ cell_area.y = y;
+ cell_area.width = tree_view->priv->focus_column->displayed_width;
+ cell_area.height = CELL_HEIGHT (node);
+
+ gtk_tree_model_get_iter (tree_view->priv->model, &iter, cursor_path);
+ gtk_tree_view_column_set_cell_data (tree_view->priv->focus_column, tree_view->priv->model, &iter);
+
+ gtk_cell_renderer_get_size (tree_view->priv->focus_column->cell, GTK_WIDGET (tree_view), &cell_area, &x_offset, &y_offset, &width, &height);
+ width += 2;
+ height += 2;
+ x = cell_area.x + x_offset - 1;
+ y = cell_area.y + y_offset - 1 + TREE_VIEW_VERTICAL_SEPARATOR/2;
+ }
+ }
+
+ gtk_paint_focus (widget->style,
+ tree_view->priv->bin_window,
+ NULL,
+ widget,
+ "add-mode",
+ x, y, width, height);
+
+ gtk_tree_path_free (cursor_path);
}
{
GtkTreeView *tree_view;
- g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
gtk_tree_view_focus_out (GtkWidget *widget,
GdkEventFocus *event)
{
- g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
return FALSE;
}
-/* FIXME: It would be neat to someday make the headers a seperate widget that
- * can be shared between various apps. Wishful thinking, though...
- */
/* Returns TRUE if the focus is within the headers, after the focus operation is
* done
*/
static gboolean
-gtk_tree_view_header_focus (GtkTreeView *tree_view,
+gtk_tree_view_header_focus (GtkTreeView *tree_view,
GtkDirectionType dir)
{
GtkWidget *focus_child;
last_column &&
!(GTK_TREE_VIEW_COLUMN (last_column->data)->visible) &&
GTK_WIDGET_CAN_FOCUS (GTK_TREE_VIEW_COLUMN (last_column->data)->button);
- last_column = last_column->prev)
- ;
+ last_column = last_column->prev);
for (first_column = tree_view->priv->columns;
first_column &&
!(GTK_TREE_VIEW_COLUMN (first_column->data)->visible) &&
GTK_WIDGET_CAN_FOCUS (GTK_TREE_VIEW_COLUMN (first_column->data)->button);
- first_column = first_column->next)
- ;
+ first_column = first_column->next);
- /* no headers are visible, or are focussable. We can't focus in or out.
- * I wonder if focussable is a real word...
+ /* No headers are visible, or are focusable. We can't focus in or out.
*/
if (last_column == NULL)
return FALSE;
- /* First thing we want to handle is entering and leaving the headers.
- */
switch (dir)
{
case GTK_DIR_TAB_BACKWARD:
- if (!focus_child)
- {
- focus_child = GTK_TREE_VIEW_COLUMN (last_column->data)->button;
- gtk_widget_grab_focus (focus_child);
- goto cleanup;
- }
- if (focus_child == GTK_TREE_VIEW_COLUMN (first_column->data)->button)
- {
- focus_child = NULL;
- goto cleanup;
- }
- break;
-
case GTK_DIR_TAB_FORWARD:
- if (!focus_child)
+ case GTK_DIR_UP:
+ case GTK_DIR_DOWN:
+ if (focus_child == NULL)
{
- focus_child = GTK_TREE_VIEW_COLUMN (first_column->data)->button;
+ if (tree_view->priv->focus_column != NULL)
+ focus_child = tree_view->priv->focus_column->button;
+ else
+ focus_child = GTK_TREE_VIEW_COLUMN (first_column->data)->button;
gtk_widget_grab_focus (focus_child);
- goto cleanup;
- }
- if (focus_child == GTK_TREE_VIEW_COLUMN (last_column->data)->button)
- {
- focus_child = NULL;
- goto cleanup;
+ break;
}
- break;
+ return FALSE;
case GTK_DIR_LEFT:
- if (!focus_child)
- {
- focus_child = GTK_TREE_VIEW_COLUMN (last_column->data)->button;
- gtk_widget_grab_focus (focus_child);
- goto cleanup;
- }
- if (focus_child == GTK_TREE_VIEW_COLUMN (first_column->data)->button)
- {
- focus_child = NULL;
- goto cleanup;
- }
- break;
-
case GTK_DIR_RIGHT:
- if (!focus_child)
+ if (focus_child == NULL)
{
- focus_child = GTK_TREE_VIEW_COLUMN (first_column->data)->button;
+ if (tree_view->priv->focus_column != NULL)
+ focus_child = tree_view->priv->focus_column->button;
+ else if (dir == GTK_DIR_LEFT)
+ focus_child = GTK_TREE_VIEW_COLUMN (last_column->data)->button;
+ else
+ focus_child = GTK_TREE_VIEW_COLUMN (first_column->data)->button;
gtk_widget_grab_focus (focus_child);
- goto cleanup;
+ break;
}
- if (focus_child == GTK_TREE_VIEW_COLUMN (last_column->data)->button)
+
+ if (gtk_container_focus (GTK_CONTAINER (focus_child), dir))
{
- focus_child = NULL;
- goto cleanup;
+ /* The focus moves inside the button. */
+ /* This is probably a great example of bad UI */
+ break;
}
- break;
- case GTK_DIR_UP:
- if (!focus_child)
+ /* We need to move the focus among the row of buttons. */
+ for (tmp_list = tree_view->priv->columns; tmp_list; tmp_list = tmp_list->next)
+ if (GTK_TREE_VIEW_COLUMN (tmp_list->data)->button == focus_child)
+ break;
+
+ if (tmp_list == first_column && dir == GTK_DIR_LEFT)
{
- focus_child = GTK_TREE_VIEW_COLUMN (first_column->data)->button;
+ focus_child = GTK_TREE_VIEW_COLUMN (last_column->data)->button;
gtk_widget_grab_focus (focus_child);
+ break;
}
- else
- {
- focus_child = NULL;
- }
- goto cleanup;
-
- case GTK_DIR_DOWN:
- if (!focus_child)
+ else if (tmp_list == last_column && dir == GTK_DIR_RIGHT)
{
focus_child = GTK_TREE_VIEW_COLUMN (first_column->data)->button;
gtk_widget_grab_focus (focus_child);
+ break;
}
- else
- {
- focus_child = NULL;
- }
- goto cleanup;
- }
-
- /* We need to move the focus to the next button. */
- if (focus_child)
- {
- for (tmp_list = tree_view->priv->columns; tmp_list; tmp_list = tmp_list->next)
- if (GTK_TREE_VIEW_COLUMN (tmp_list->data)->button == focus_child)
- {
- if (gtk_container_focus (GTK_CONTAINER (GTK_TREE_VIEW_COLUMN (tmp_list->data)->button), dir))
- {
- /* The focus moves inside the button. */
- /* This is probably a great example of bad UI */
- goto cleanup;
- }
- break;
- }
- /* We need to move the focus among the row of buttons. */
while (tmp_list)
{
GtkTreeViewColumn *column;
- if (dir == GTK_DIR_RIGHT || dir == GTK_DIR_TAB_FORWARD)
+ if (dir == GTK_DIR_RIGHT)
tmp_list = tmp_list->next;
else
tmp_list = tmp_list->prev;
if (tmp_list == NULL)
{
g_warning ("Internal button not found");
- goto cleanup;
+ break;
}
column = tmp_list->data;
if (column->button &&
break;
}
}
+ break;
+ default:
+ g_assert_not_reached ();
+ break;
}
- cleanup:
/* if focus child is non-null, we assume it's been set to the current focus child
*/
if (focus_child)
{
+ for (tmp_list = tree_view->priv->columns; tmp_list; tmp_list = tmp_list->next)
+ if (GTK_TREE_VIEW_COLUMN (tmp_list->data)->button == focus_child)
+ break;
+
+ tree_view->priv->focus_column = GTK_TREE_VIEW_COLUMN (tmp_list->data);
+
/* If the following isn't true, then the view is smaller then the scrollpane.
*/
if ((focus_child->allocation.x + focus_child->allocation.width) <=
return (focus_child != NULL);
}
-/* WARNING: Scary function */
+/* WARNING: Somewhat scary function */
+/* We make the assumption that if container->focus_child != NULL, the focus must
+ * be in the header. For now, this is accurate. It may not be in the future.
+ */
+
+/* The sordid relationship between focus_column and scroll_column:
+ *
+ * The focus_column represents the column that currently has keyboard focus, and
+ * is used when navigating columns by keyboard. scroll_column is used for
+ * handling scrolling by keyboard, such that in cases.
+ */
static gint
gtk_tree_view_focus (GtkContainer *container,
GtkDirectionType direction)
GdkEvent *event;
GtkRBTree *cursor_tree;
GtkRBNode *cursor_node;
+ GtkTreePath *cursor_path;
- g_return_val_if_fail (container != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TREE_VIEW (container), FALSE);
g_return_val_if_fail (GTK_WIDGET_VISIBLE (container), FALSE);
if (!GTK_WIDGET_IS_SENSITIVE (container))
return FALSE;
- if (tree_view->priv->tree == NULL)
- return FALSE;
focus_child = container->focus_child;
switch (direction)
{
case GTK_DIR_LEFT:
- case GTK_DIR_TAB_BACKWARD:
+ case GTK_DIR_RIGHT:
return (gtk_tree_view_header_focus (tree_view, direction));
+ case GTK_DIR_TAB_BACKWARD:
case GTK_DIR_UP:
return FALSE;
case GTK_DIR_TAB_FORWARD:
- case GTK_DIR_RIGHT:
case GTK_DIR_DOWN:
- if (direction != GTK_DIR_DOWN)
- {
- if (gtk_tree_view_header_focus (tree_view, direction))
- return TRUE;
- }
+
+ if (tree_view->priv->tree == NULL)
+ return FALSE;
+
GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_DRAW_KEYFOCUS);
gtk_widget_grab_focus (GTK_WIDGET (container));
/* if there is no keyboard focus yet, we select the first node
*/
- if (tree_view->priv->cursor == NULL)
- tree_view->priv->cursor = gtk_tree_path_new_root ();
+
+ cursor_path = NULL;
+
+ if (tree_view->priv->cursor)
+ cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
+
+ if (cursor_path == NULL)
+ {
+ GtkTreePath *tmp_path = gtk_tree_path_new_root ();
+
+ if (tree_view->priv->cursor)
+ gtk_tree_row_reference_free (tree_view->priv->cursor);
+
+ tree_view->priv->cursor =
+ gtk_tree_row_reference_new_proxy (G_OBJECT (tree_view), tree_view->priv->model, tmp_path);
+ cursor_path = tmp_path;
+ }
gtk_tree_selection_select_path (tree_view->priv->selection,
- tree_view->priv->cursor);
- /* FIXME make this more efficient */
- gtk_widget_queue_draw (GTK_WIDGET (tree_view));
+ cursor_path);
+
+ gtk_tree_view_queue_draw_path (tree_view, cursor_path, NULL);
+
+ gtk_tree_path_free (cursor_path);
+
return TRUE;
}
}
{
if ((direction == GTK_DIR_TAB_FORWARD) ||
(direction == GTK_DIR_RIGHT) ||
- (direction == GTK_DIR_DOWN))
- {
- if (gtk_tree_view_header_focus (tree_view, direction))
- return TRUE;
- }
+ (direction == GTK_DIR_DOWN) ||
+ (direction == GTK_DIR_LEFT) ||
+ (tree_view->priv->tree == NULL))
+ return gtk_tree_view_header_focus (tree_view, direction);
/* The headers didn't want the focus, so we take it. */
GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_DRAW_KEYFOCUS);
tree_view->priv->selection =
_gtk_tree_selection_new_with_tree_view (tree_view);
- if (tree_view->priv->cursor == NULL)
- tree_view->priv->cursor = gtk_tree_path_new_root ();
+ cursor_path = NULL;
+ if (tree_view->priv->cursor)
+ cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
+
+ if (cursor_path == NULL)
+ {
+ GtkTreePath *tmp_path = gtk_tree_path_new_root ();
+
+ if (tree_view->priv->cursor)
+ gtk_tree_row_reference_free (tree_view->priv->cursor);
+
+ tree_view->priv->cursor =
+ gtk_tree_row_reference_new_proxy (G_OBJECT (tree_view), tree_view->priv->model, tmp_path);
+ cursor_path = tmp_path;
+ }
gtk_tree_selection_select_path (tree_view->priv->selection,
- tree_view->priv->cursor);
- /* FIXME make this more efficient */
- gtk_widget_queue_draw (GTK_WIDGET (tree_view));
+ cursor_path);
+
+ gtk_tree_view_queue_draw_path (tree_view, cursor_path, NULL);
+
+ gtk_tree_path_free (cursor_path);
+
return TRUE;
}
- /* Case 3. We have focus already, but no cursor. We pick the first one
- * and run with it. */
- if (tree_view->priv->cursor == NULL)
+ /* Case 3. We have focus already. */
+ if (tree_view->priv->tree == NULL)
+ return FALSE;
+
+ if (direction == GTK_DIR_TAB_BACKWARD)
+ return (gtk_tree_view_header_focus (tree_view, direction));
+ else if (direction == GTK_DIR_TAB_FORWARD)
+ return FALSE;
+
+ cursor_path = NULL;
+ if (tree_view->priv->cursor)
+ cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
+
+ /* Do we have a focus path? We should, unless it was deleted. */
+ /* in that case, we pick the first one arbitrarily */
+ if (cursor_path == NULL)
{
- /* We lost our cursor somehow. Arbitrarily select the first node, and
- * return
- */
- tree_view->priv->cursor = gtk_tree_path_new_root ();
+ GtkTreePath *tmp_path = gtk_tree_path_new_root ();
+
+ if (tree_view->priv->cursor)
+ gtk_tree_row_reference_free (tree_view->priv->cursor);
+
+ tree_view->priv->cursor =
+ gtk_tree_row_reference_new_proxy (G_OBJECT (tree_view), tree_view->priv->model, tmp_path);
+ cursor_path = tmp_path;
gtk_tree_selection_select_path (tree_view->priv->selection,
- tree_view->priv->cursor);
- gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment),
- 0.0);
- /* FIXME make this more efficient */
- gtk_widget_queue_draw (GTK_WIDGET (tree_view));
+ cursor_path);
+
+ gtk_tree_view_queue_draw_path (tree_view, cursor_path, NULL);
+
+ gtk_tree_path_free (cursor_path);
+
return TRUE;
}
-
- /* Case 3. We have focus already. Move the cursor. */
+ /* Case 4. We have focus already. Move the cursor. */
if (direction == GTK_DIR_LEFT)
{
- gfloat val;
+ gdouble val;
val = tree_view->priv->hadjustment->value - tree_view->priv->hadjustment->page_size/2;
val = MAX (val, 0.0);
gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->hadjustment), val);
gtk_widget_grab_focus (GTK_WIDGET (tree_view));
+
+ gtk_tree_path_free (cursor_path);
+
return TRUE;
}
if (direction == GTK_DIR_RIGHT)
{
- gfloat val;
+ gdouble val;
val = tree_view->priv->hadjustment->value + tree_view->priv->hadjustment->page_size/2;
val = MIN (tree_view->priv->hadjustment->upper - tree_view->priv->hadjustment->page_size, val);
gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->hadjustment), val);
gtk_widget_grab_focus (GTK_WIDGET (tree_view));
+
+ gtk_tree_path_free (cursor_path);
+
return TRUE;
}
+
cursor_tree = NULL;
cursor_node = NULL;
- _gtk_tree_view_find_node (tree_view, tree_view->priv->cursor,
+ _gtk_tree_view_find_node (tree_view, cursor_path,
&cursor_tree,
&cursor_node);
+
+ /* undraw the old row */
+ gtk_tree_view_queue_draw_path (tree_view, cursor_path, NULL);
+
+ gtk_tree_path_free (cursor_path);
+ cursor_path = NULL;
+
+ if (tree_view->priv->cursor)
+ {
+ gtk_tree_row_reference_free (tree_view->priv->cursor);
+ tree_view->priv->cursor = NULL;
+ }
+
switch (direction)
{
case GTK_DIR_TAB_BACKWARD:
if (event)
gdk_event_free (event);
- gtk_tree_path_free (tree_view->priv->cursor);
- tree_view->priv->cursor = _gtk_tree_view_find_path (tree_view,
- cursor_tree,
- cursor_node);
- if (tree_view->priv->cursor)
- _gtk_tree_selection_internal_select_node (tree_view->priv->selection,
- cursor_node,
- cursor_tree,
- tree_view->priv->cursor,
- state);
+ cursor_path = _gtk_tree_view_find_path (tree_view,
+ cursor_tree,
+ cursor_node);
+
+ if (cursor_path)
+ {
+ _gtk_tree_selection_internal_select_node (tree_view->priv->selection,
+ cursor_node,
+ cursor_tree,
+ cursor_path,
+ state);
+
+ tree_view->priv->cursor = gtk_tree_row_reference_new_proxy (G_OBJECT (tree_view), tree_view->priv->model, cursor_path);
+
+
+ /* draw the newly-selected row */
+ gtk_tree_view_queue_draw_path (tree_view, cursor_path, NULL);
+
+ gtk_tree_path_free (cursor_path);
+ }
+
gtk_tree_view_clamp_node_visible (tree_view, cursor_tree, cursor_node);
gtk_widget_grab_focus (GTK_WIDGET (tree_view));
- /* FIXME make this more efficient */
- gtk_widget_queue_draw (GTK_WIDGET (tree_view));
+
return TRUE;
}
/* At this point, we've progressed beyond the edge of the rows. */
- if ((direction == GTK_DIR_LEFT) ||
- (direction == GTK_DIR_TAB_BACKWARD) ||
- (direction == GTK_DIR_UP))
+ if (direction == GTK_DIR_UP)
/* We can't go back anymore. Try the headers */
return (gtk_tree_view_header_focus (tree_view, direction));
GtkTreeViewChild *child = NULL;
GList *tmp_list;
- g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW (container));
tree_view = GTK_TREE_VIEW (container);
{
child = tmp_list->data;
if (child->widget == widget)
- break;
- tmp_list = tmp_list->next;
- }
+ {
+ gtk_widget_unparent (widget);
- if (tmp_list)
- {
- gtk_widget_unparent (widget);
+ tree_view->priv->children = g_list_remove_link (tree_view->priv->children, tmp_list);
+ g_list_free_1 (tmp_list);
+ g_free (child);
+ return;
+ }
+
+ tmp_list = tmp_list->next;
+ }
+
+ tmp_list = tree_view->priv->columns;
- tree_view->priv->children = g_list_remove_link (tree_view->priv->children, tmp_list);
- g_list_free_1 (tmp_list);
- g_free (child);
+ while (tmp_list)
+ {
+ GtkTreeViewColumn *column;
+ column = tmp_list->data;
+ if (column->button == widget)
+ {
+ gtk_widget_unparent (widget);
+ return;
+ }
+ tmp_list = tmp_list->next;
}
+
}
static void
GtkTreeViewColumn *column;
GList *tmp_list;
- g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW (container));
g_return_if_fail (callback != NULL);
for (tmp_list = tree_view->priv->columns; tmp_list; tmp_list = tmp_list->next)
{
- column = tmp_list->data;
-
+ column = tmp_list->data;
+
if (column->button)
(* callback) (column->button, callback_data);
}
}
+void
+gtk_tree_view_row_activated (GtkTreeView *tree_view,
+ GtkTreePath *path,
+ GtkTreeViewColumn *column)
+{
+ g_return_if_fail (tree_view != NULL);
+ g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+
+ g_signal_emit (G_OBJECT(tree_view), tree_view_signals[ROW_ACTIVATED], 0, path, column);
+}
+
/* TreeModel Callbacks
*/
static void
-gtk_tree_view_changed (GtkTreeModel *model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- gpointer data)
+gtk_tree_view_range_changed (GtkTreeModel *model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ GtkTreePath *end_path,
+ GtkTreeIter *end_iter,
+ gpointer data)
{
GtkTreeView *tree_view = (GtkTreeView *)data;
GtkRBTree *tree;
GtkRBNode *node;
gint height;
gboolean dirty_marked;
+ gboolean free_path = FALSE;
g_return_if_fail (path != NULL || iter != NULL);
if (path == NULL)
- path = gtk_tree_model_get_path (model, iter);
+ {
+ path = gtk_tree_model_get_path (model, iter);
+ free_path = TRUE;
+ }
else if (iter == NULL)
gtk_tree_model_get_iter (model, iter, path);
&tree,
&node))
/* We aren't actually showing the node */
- return;
+ goto done;
+
+ if (tree == NULL)
+ goto done;
dirty_marked = gtk_tree_view_discover_dirty_iter (tree_view,
iter,
{
_gtk_rbtree_node_set_height (tree, node, height + TREE_VIEW_VERTICAL_SEPARATOR);
gtk_widget_queue_resize (GTK_WIDGET (data));
- return;
+ goto done;
}
if (dirty_marked)
gtk_widget_queue_resize (GTK_WIDGET (data));
{
gtk_tree_view_queue_draw_node (tree_view, tree, node, NULL);
}
+
+ done:
+ if (free_path)
+ gtk_tree_path_free (path);
}
static void
gint max_height;
gint depth;
gint i = 0;
+ gboolean free_path = FALSE;
+
+ if (tree_view->priv->tree == NULL)
+ tree_view->priv->tree = _gtk_rbtree_new ();
tmptree = tree = tree_view->priv->tree;
g_return_if_fail (path != NULL || iter != NULL);
if (path == NULL)
- path = gtk_tree_model_get_path (model, iter);
+ {
+ path = gtk_tree_model_get_path (model, iter);
+ free_path = TRUE;
+ }
else if (iter == NULL)
gtk_tree_model_get_iter (model, iter, path);
+ /* Update all row-references */
+ gtk_tree_row_reference_inserted (G_OBJECT (data), path);
+
depth = gtk_tree_path_get_depth (path);
indices = gtk_tree_path_get_indices (path);
if (tmptree == NULL)
{
/* We aren't showing the node */
- return;
+ goto done;
}
tmpnode = _gtk_rbtree_find_count (tmptree, indices[i] + 1);
g_warning ("A node was inserted with a parent that's not in the tree.\n" \
"This possibly means that a GtkTreeModel inserted a child node\n" \
"before the parent was inserted.");
- return;
+ goto done;
}
else if (!GTK_RBNODE_FLAG_SET (tmpnode, GTK_RBNODE_IS_PARENT))
{
/* FIXME enforce correct behavior on model, probably */
- /* In theory, the model should have emitted child_toggled here. We
+ /* In theory, the model should have emitted has_child_toggled here. We
* try to catch it anyway, just to be safe, in case the model hasn't.
*/
GtkTreePath *tmppath = _gtk_tree_view_find_path (tree_view,
tree,
tmpnode);
- gtk_tree_view_child_toggled (model, tmppath, NULL, data);
+ gtk_tree_view_has_child_toggled (model, tmppath, NULL, data);
gtk_tree_path_free (tmppath);
- return;
+ goto done;
}
tmptree = tmpnode->children;
}
if (tree == NULL)
- return;
-
- /* next, update the selection */
- if (tree_view->priv->anchor)
- {
- gint *select_indices = gtk_tree_path_get_indices (tree_view->priv->anchor);
- gint select_depth = gtk_tree_path_get_depth (tree_view->priv->anchor);
-
- for (i = 0; i < depth && i < select_depth; i++)
- {
- if (indices[i] < select_indices[i])
- {
- select_indices[i]++;
- break;
- }
- else if (indices[i] > select_indices[i])
- break;
- else if (i == depth - 1)
- {
- select_indices[i]++;
- break;
- }
- }
- }
+ goto done;
/* ref the node */
- gtk_tree_model_ref_iter (tree_view->priv->model, iter);
+ gtk_tree_model_ref_node (tree_view->priv->model, iter);
max_height = gtk_tree_view_insert_iter_height (tree_view,
tree,
iter,
_gtk_rbtree_insert_after (tree, tmpnode, max_height);
}
- _gtk_tree_view_set_size (tree_view, -1, tree_view->priv->height + max_height);
+ _gtk_tree_view_update_size (tree_view);
+
+ done:
+ if (free_path)
+ gtk_tree_path_free (path);
}
static void
-gtk_tree_view_child_toggled (GtkTreeModel *model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- gpointer data)
+gtk_tree_view_has_child_toggled (GtkTreeModel *model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gpointer data)
{
GtkTreeView *tree_view = (GtkTreeView *)data;
GtkTreeIter real_iter;
gboolean has_child;
GtkRBTree *tree;
GtkRBNode *node;
+ gboolean free_path = FALSE;
g_return_if_fail (path != NULL || iter != NULL);
real_iter = *iter;
if (path == NULL)
- path = gtk_tree_model_get_path (model, iter);
+ {
+ path = gtk_tree_model_get_path (model, iter);
+ free_path = TRUE;
+ }
else if (iter == NULL)
gtk_tree_model_get_iter (model, &real_iter, path);
&tree,
&node))
/* We aren't actually showing the node */
- return;
+ goto done;
+
+ if (tree == NULL)
+ goto done;
has_child = gtk_tree_model_iter_has_child (model, &real_iter);
/* Sanity check.
*/
if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PARENT) == has_child)
- return;
+ goto done;
if (has_child)
GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_IS_PARENT);
if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_SHOW_EXPANDERS))
{
GList *list;
+
for (list = tree_view->priv->columns; list; list = list->next)
if (GTK_TREE_VIEW_COLUMN (list->data)->visible)
{
/* FIXME: Just redraw the node */
gtk_widget_queue_draw (GTK_WIDGET (tree_view));
}
+
+ done:
+ if (free_path)
+ gtk_tree_path_free (path);
}
static void
if (_gtk_tree_view_find_node (tree_view, path, &tree, &node))
return;
+ if (tree == NULL)
+ return;
+
+ gtk_tree_row_reference_deleted (G_OBJECT (data), path);
+
/* next, update the selection */
if (tree_view->priv->anchor)
{
- gint i;
- gint depth = gtk_tree_path_get_depth (path);
- gint *indices = gtk_tree_path_get_indices (path);
- gint select_depth = gtk_tree_path_get_depth (tree_view->priv->anchor);
- gint *select_indices = gtk_tree_path_get_indices (tree_view->priv->anchor);
+ GtkTreePath *anchor_path;
- if (gtk_tree_path_compare (path, tree_view->priv->anchor) == 0)
+ /* the row reference may not have been updated yet. If it has not,
+ * then anchor_path and path being equal indicates that the anchor
+ * row was deleted. If it has, then anchor_path == NULL indicates the
+ * the anchor row was deleted.
+ */
+
+ anchor_path = gtk_tree_row_reference_get_path (tree_view->priv->anchor);
+
+ if (anchor_path == NULL ||
+ gtk_tree_path_compare (path, anchor_path) == 0)
{
if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED) &&
- tree_view->priv->selection)
+ tree_view->priv->selection)
gtk_signal_emit_by_name (GTK_OBJECT (tree_view->priv->selection),
"selection_changed");
}
- else
- {
- for (i = 0; i < depth && i < select_depth; i++)
- {
- if (indices[i] < select_indices[i])
- {
- select_indices[i] = MAX (select_indices[i], 0);
- break;
- }
- else if (indices[i] > select_indices[i])
- break;
- else if (i == depth - 1)
- {
- select_indices[i] = MAX (select_indices[i], 0);
- break;
- }
- }
- }
+
+ if (anchor_path)
+ gtk_tree_path_free (anchor_path);
}
for (list = tree_view->priv->columns; list; list = list->next)
((GtkTreeViewColumn *)list->data)->column_type == GTK_TREE_VIEW_COLUMN_AUTOSIZE)
((GtkTreeViewColumn *)list->data)->dirty = TRUE;
+ /* Ensure we don't have a dangling pointer to a dead node */
+ ensure_unprelighted (tree_view);
+
+ g_assert (tree_view->priv->prelight_node == NULL);
+
if (tree->root->count == 1)
- _gtk_rbtree_remove (tree);
+ {
+ if (tree_view->priv->tree == tree)
+ tree_view->priv->tree = NULL;
+
+ _gtk_rbtree_remove (tree);
+ }
else
- _gtk_rbtree_remove_node (tree, node);
+ {
+ _gtk_rbtree_remove_node (tree, node);
+ }
- _gtk_tree_view_set_size (GTK_TREE_VIEW (data), -1, -1);
+ _gtk_tree_view_update_size (GTK_TREE_VIEW (data));
+}
+
+
+static void
+gtk_tree_view_reordered (GtkTreeModel *model,
+ GtkTreePath *parent,
+ GtkTreeIter *iter,
+ gint *new_order,
+ gpointer data)
+{
+ GtkTreeView *tree_view = GTK_TREE_VIEW (data);
+ GtkRBTree *tree;
+ GtkRBNode *node;
+ gint len;
+
+ len = gtk_tree_model_iter_n_children (model, iter);
+
+ if (len < 2)
+ return;
+
+ gtk_tree_row_reference_reordered (G_OBJECT (data),
+ parent,
+ iter,
+ new_order);
+
+ if (_gtk_tree_view_find_node (tree_view,
+ parent,
+ &tree,
+ &node))
+ return;
+
+ /* We need to special case the parent path */
+ if (tree == NULL)
+ tree = tree_view->priv->tree;
+ else
+ tree = node->children;
+
+ if (tree == NULL)
+ return;
+
+ /* FIXME: we need to unprelight our tree, if it's prelit. */
+ _gtk_rbtree_reorder (tree, new_order, len);
+
+ gtk_widget_queue_draw (GTK_WIDGET (tree_view));
}
/* Internal tree functions */
gint i;
i = 0;
-
+
/* do stuff with node */
for (list = tree_view->priv->columns; list; list = list->next)
{
cell = column->cell;
gtk_tree_view_column_set_cell_data (column, tree_view->priv->model, iter);
- gtk_cell_renderer_get_size (cell, GTK_WIDGET (tree_view), &width, &height);
+ gtk_cell_renderer_get_size (cell, GTK_WIDGET (tree_view), NULL, NULL, NULL, &width, &height);
max_height = MAX (max_height, TREE_VIEW_VERTICAL_SEPARATOR + height);
if (i == tree_view->priv->expander_column &&
iter,
depth);
- gtk_tree_model_ref_iter (tree_view->priv->model, iter);
+ gtk_tree_model_ref_node (tree_view->priv->model, iter);
temp = _gtk_rbtree_insert_after (tree, temp, max_height);
if (recurse)
{
gtk_tree_view_column_set_cell_data (column, tree_view->priv->model, iter);
cell = column->cell;
- gtk_cell_renderer_get_size (cell, GTK_WIDGET (tree_view), &width, &height);
+ gtk_cell_renderer_get_size (cell, GTK_WIDGET (tree_view), NULL, NULL, NULL, &width, &height);
max_height = MAX (max_height, TREE_VIEW_VERTICAL_SEPARATOR + height);
/* FIXME: I'm getting the width of all nodes here. )-: */
- if (column->dirty == FALSE || column->column_type == GTK_TREE_VIEW_COLUMN_FIXED)
+ if (column->dirty == FALSE)
continue;
+ if (column->column_type == GTK_TREE_VIEW_COLUMN_FIXED)
+ {
+ continue;
+ }
if (i == tree_view->priv->expander_column &&
TREE_VIEW_DRAW_EXPANDERS (tree_view))
gtk_tree_view_column_set_width (column,
else
gtk_tree_view_column_set_width (column, MAX (column->width, width));
}
+
_gtk_rbtree_node_set_height (tree, temp, max_height);
+
if (temp->children != NULL &&
gtk_tree_model_iter_children (tree_view->priv->model, &child, iter))
gtk_tree_view_calc_size (tree_view, temp->children, &child, depth + 1);
GtkTreeViewColumn *column;
GList *list;
gint i;
- gint retval = FALSE;
+ gboolean retval = FALSE;
gint tmpheight;
if (height)
if (height)
{
- gtk_cell_renderer_get_size (cell, GTK_WIDGET (tree_view), &width, &tmpheight);
+ gtk_cell_renderer_get_size (cell, GTK_WIDGET (tree_view), NULL, NULL, NULL, &width, &tmpheight);
*height = MAX (*height, tmpheight);
}
else
{
- gtk_cell_renderer_get_size (cell, GTK_WIDGET (tree_view), &width, NULL);
+ gtk_cell_renderer_get_size (cell, GTK_WIDGET (tree_view), NULL, NULL, NULL, &width, NULL);
}
if (i == tree_view->priv->expander_column &&
TREE_VIEW_DRAW_EXPANDERS (tree_view))
GList *list;
GtkTreeViewColumn *column;
GtkTreeIter iter;
-
+
+ if (!GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_MODEL_SETUP) &&
+ tree_view->priv->model)
+ gtk_tree_view_setup_model (tree_view);
+
for (list = tree_view->priv->columns; list; list = list->next)
{
column = list->data;
dirty = TRUE;
if (column->column_type == GTK_TREE_VIEW_COLUMN_AUTOSIZE)
{
- gtk_tree_view_column_set_width (column, MAX (column->button->requisition.width, 1));
+ gint w = 1;
+
+ if (column->button)
+ w = MAX (w, column->button->requisition.width);
+
+ gtk_tree_view_column_set_width (column, w);
}
}
}
+
if (dirty == FALSE)
return;
+ if (tree_view->priv->model == NULL)
+ return;
+
path = gtk_tree_path_new_root ();
if (gtk_tree_model_get_iter (tree_view->priv->model, &iter, path))
{
gtk_tree_view_calc_size (tree_view, tree_view->priv->tree, &iter, 1);
- _gtk_tree_view_set_size (tree_view, -1, -1);
+ _gtk_tree_view_update_size (tree_view);
}
-
+
gtk_tree_path_free (path);
-
+
for (list = tree_view->priv->columns; list; list = list->next)
{
column = list->data;
column->dirty = FALSE;
}
}
-
-static void
-gtk_tree_view_create_button (GtkTreeView *tree_view,
- gint i)
-{
- GtkWidget *button;
- GtkTreeViewColumn *column;
-
- column = g_list_nth (tree_view->priv->columns, i)->data;
- gtk_widget_push_composite_child ();
- button = column->button = gtk_button_new ();
- gtk_widget_pop_composite_child ();
-
- gtk_widget_set_parent (button, GTK_WIDGET (tree_view));
-
- gtk_signal_connect (GTK_OBJECT (button), "clicked",
- (GtkSignalFunc) gtk_tree_view_button_clicked,
- (gpointer) tree_view);
-
- gtk_widget_show (button);
-}
-
+#if 0
static void
gtk_tree_view_create_buttons (GtkTreeView *tree_view)
{
GList *list;
GtkTreeViewColumn *column;
gint i;
+ GtkWidget *hbox;
+ GtkWidget *arrow;
+
+ /* FIXME this has to be merged with update_button_contents() in
+ * gtktreeviewcolumn.c
+ */
for (list = tree_view->priv->columns, i = 0; list; list = list->next, i++)
{
column = list->data;
-
+
if (column->button != NULL)
continue;
gtk_tree_view_create_button (tree_view, i);
- switch (column->justification)
- {
- case GTK_JUSTIFY_LEFT:
- alignment = gtk_alignment_new (0.0, 0.5, 0.0, 0.0);
- break;
- case GTK_JUSTIFY_RIGHT:
- alignment = gtk_alignment_new (1.0, 0.5, 0.0, 0.0);
- break;
- case GTK_JUSTIFY_CENTER:
- alignment = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
- break;
- case GTK_JUSTIFY_FILL:
- default:
- alignment = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
- break;
- }
+ alignment = gtk_alignment_new (column->xalign, 0.5, 0.0, 0.0);
+
+ hbox = gtk_hbox_new (FALSE, 2);
+ arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_IN);
+
+ column->arrow = arrow;
+ column->alignment = alignment;
if (column->child)
label = column->child;
gtk_widget_show (label);
}
+ if (column->xalign <= 0.5)
+ gtk_box_pack_end (GTK_BOX (hbox), arrow, FALSE, FALSE, 0);
+ else
+ gtk_box_pack_start (GTK_BOX (hbox), arrow, FALSE, FALSE, 0);
+
+ gtk_box_pack_start (GTK_BOX (hbox), alignment, TRUE, TRUE, 0);
+
gtk_container_add (GTK_CONTAINER (alignment), label);
- gtk_container_add (GTK_CONTAINER (column->button), alignment);
-
+ gtk_container_add (GTK_CONTAINER (column->button), hbox);
+
+ gtk_widget_show (hbox);
gtk_widget_show (alignment);
+ /* don't show the arrow yet */
}
gtk_tree_view_size_request_buttons (tree_view);
-
+
if (GTK_WIDGET_REALIZED (tree_view))
gtk_tree_view_realize_buttons (tree_view);
if (GTK_WIDGET_MAPPED (tree_view))
- gtk_tree_view_map_buttons (tree_view);
-}
-
-static void
-gtk_tree_view_button_clicked (GtkWidget *widget,
- gpointer data)
-{
- GList *list;
- GtkTreeView *tree_view;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_TREE_VIEW (data));
-
- tree_view = GTK_TREE_VIEW (data);
-
- /* find the column whose button was pressed */
- for (list = tree_view->priv->columns; list; list = list->next)
- if (GTK_TREE_VIEW_COLUMN (list->data)->button == widget)
- break;
-
- if (list)
- gtk_tree_view_column_clicked (GTK_TREE_VIEW_COLUMN (list->data));
+ gtk_tree_view_map_buttons (tree_view);
}
+#endif
/* Make sure the node is visible vertically */
static void
return path;
}
-/* Returns whether or not it's a parent, or not */
+/* Returns TRUE if we ran out of tree before finding the path.
+ */
gboolean
_gtk_tree_view_find_node (GtkTreeView *tree_view,
GtkTreePath *path,
*node = NULL;
*tree = NULL;
+ if (depth == 0)
+ return FALSE;
do
{
if (tmptree == NULL)
return TRUE;
}
tmpnode = _gtk_rbtree_find_count (tmptree, indices[i] + 1);
- if (++i >= depth)
+ ++i;
+ if (i >= depth)
{
*node = tmpnode;
*tree = tmptree;
while (1);
}
+static void
+gtk_tree_view_unref_tree_helper (GtkTreeModel *model,
+ GtkTreeIter *iter,
+ GtkRBTree *tree,
+ GtkRBNode *node)
+{
+ do
+ {
+ g_return_if_fail (node != NULL);
+
+ if (node->children)
+ {
+ GtkTreeIter child;
+ GtkRBTree *new_tree;
+ GtkRBNode *new_node;
+
+ new_tree = node->children;
+ new_node = new_tree->root;
+
+ while (new_node && new_node->left != new_tree->nil)
+ new_node = new_node->left;
+
+ g_return_if_fail (gtk_tree_model_iter_children (model, &child, iter));
+ gtk_tree_view_unref_tree_helper (model, &child, new_tree, new_node);
+ }
+
+ gtk_tree_model_unref_node (model, iter);
+ node = _gtk_rbtree_next (tree, node);
+ }
+ while (gtk_tree_model_iter_next (model, iter));
+}
+
+static void
+gtk_tree_view_unref_tree (GtkTreeView *tree_view,
+ GtkRBTree *tree)
+{
+ GtkTreeIter iter;
+ GtkTreePath *path;
+ GtkRBNode *node;
+
+ node = tree->root;
+ while (node && node->left != tree->nil)
+ node = node->left;
+
+ g_return_if_fail (node != NULL);
+ path = _gtk_tree_view_find_path (tree_view, tree, node);
+ gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_view->priv->model),
+ &iter, path);
+ gtk_tree_view_unref_tree_helper (GTK_TREE_MODEL (tree_view->priv->model), &iter, tree, node);
+ gtk_tree_path_free (path);
+}
+
static void
gtk_tree_view_queue_draw_node (GtkTreeView *tree_view,
GtkRBTree *tree,
if (!GTK_WIDGET_REALIZED (tree_view))
return;
-
+
rect.x = 0;
rect.width = tree_view->priv->width;
{
GtkRBTree *tree = NULL;
GtkRBNode *node = NULL;
-
+
_gtk_tree_view_find_node (tree_view, path, &tree, &node);
if (tree)
GtkStateType state;
GtkWidget *widget;
gint x_offset = 0;
-
+
if (! GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PARENT))
return;
widget = GTK_WIDGET (tree_view);
gtk_tree_view_get_arrow_xrange (tree_view, &x_offset, NULL);
-
+
area.x = x_offset;
area.y = CELL_FIRST_PIXEL (tree_view, tree, node);
area.width = tree_view->priv->tab_offset - 2;
}
else
{
- state = (node==tree_view->priv->prelight_node&>K_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_ARROW_PRELIT)?GTK_STATE_PRELIGHT:GTK_STATE_NORMAL);
+ if (node == tree_view->priv->prelight_node &&
+ GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_ARROW_PRELIT))
+ state = GTK_STATE_PRELIGHT;
+ else
+ state = GTK_STATE_NORMAL;
}
/* FIXME expander size should come from a style property */
#undef EXPANDER_SIZE
}
+
+static void
+_gtk_tree_view_update_col_width (GtkTreeView *tree_view)
+{
+ GList *list, *last_column;
+ GtkTreeViewColumn *column;
+ gint width = 0;
+
+ for (last_column = g_list_last (tree_view->priv->columns);
+ last_column &&
+ !(GTK_TREE_VIEW_COLUMN (last_column->data)->visible) &&
+ GTK_WIDGET_CAN_FOCUS (GTK_TREE_VIEW_COLUMN (last_column->data)->button);
+ last_column = last_column->prev)
+ ;
+
+ if (last_column == NULL)
+ return;
+
+ for (list = tree_view->priv->columns; list != last_column; list = list->next)
+ {
+ column = GTK_TREE_VIEW_COLUMN (list->data);
+ if (! column->visible)
+ continue;
+
+ width += column->width;
+ column->displayed_width = (CLAMP (column->width, (column->min_width!=-1)?column->min_width:column->width, (column->max_width!=-1)?column->max_width:column->width));
+ }
+ column = GTK_TREE_VIEW_COLUMN (last_column->data);
+ column->displayed_width = MAX (GTK_WIDGET (tree_view)->allocation.width, tree_view->priv->width) - width;
+}
+
void
-_gtk_tree_view_set_size (GtkTreeView *tree_view,
- gint width,
- gint height)
+_gtk_tree_view_update_size (GtkTreeView *tree_view)
{
+ gint width, height;
GList *list;
GtkTreeViewColumn *column;
gint i;
- if (width == tree_view->priv->width &&
- height == tree_view->priv->height)
- return;
-
if (tree_view->priv->model == NULL)
{
- tree_view->priv->width = width;
- tree_view->priv->height = height;
+ tree_view->priv->width = 0;
+ tree_view->priv->height = 0;
gtk_widget_queue_draw (GTK_WIDGET (tree_view));
return;
}
- if (width == -1)
+
+ width = 0;
+ for (list = tree_view->priv->columns, i = 0; list; list = list->next, i++)
{
- width = 0;
- for (list = tree_view->priv->columns, i = 0; list; list = list->next, i++)
- {
- column = list->data;
- if (!column->visible)
- continue;
- width += TREE_VIEW_COLUMN_WIDTH (column);
- }
+ column = list->data;
+ if (!column->visible)
+ continue;
+ width += TREE_VIEW_COLUMN_WIDTH (column);
}
- if (height == -1)
- height = tree_view->priv->tree->root->offset + TREE_VIEW_VERTICAL_SEPARATOR;
- tree_view->priv->width = width;
- tree_view->priv->height = height;
+ if (tree_view->priv->tree == NULL)
+ height = 0;
+ else
+ height = tree_view->priv->tree->root->offset + TREE_VIEW_VERTICAL_SEPARATOR;
- if (tree_view->priv->hadjustment->upper != tree_view->priv->width)
+ if (tree_view->priv->width != width)
{
- tree_view->priv->hadjustment->upper = tree_view->priv->width;
+ tree_view->priv->width = width;
+ tree_view->priv->hadjustment->upper = width;
gtk_signal_emit_by_name (GTK_OBJECT (tree_view->priv->hadjustment), "changed");
}
- if (tree_view->priv->vadjustment->upper != tree_view->priv->height)
+ if (tree_view->priv->height != height)
{
+ tree_view->priv->height = height;
tree_view->priv->vadjustment->upper = tree_view->priv->height;
gtk_signal_emit_by_name (GTK_OBJECT (tree_view->priv->vadjustment), "changed");
}
{
gdk_window_resize (tree_view->priv->bin_window, MAX (width, GTK_WIDGET (tree_view)->allocation.width), height + TREE_VIEW_HEADER_HEIGHT (tree_view));
gdk_window_resize (tree_view->priv->header_window, MAX (width, GTK_WIDGET (tree_view)->allocation.width), tree_view->priv->header_height);
+
+ _gtk_tree_view_update_col_width (tree_view);
}
+
gtk_widget_queue_resize (GTK_WIDGET (tree_view));
}
/**
* gtk_tree_view_new:
- *
+ *
* Creates a new #GtkTreeView widget.
- *
+ *
* Return value: A newly created #GtkTreeView widget.
**/
GtkWidget *
/**
* gtk_tree_view_new_with_model:
* @model: the model.
- *
+ *
* Creates a new #GtkTreeView widget with the model initialized to @model.
- *
+ *
* Return value: A newly created #GtkTreeView widget.
**/
GtkWidget *
/**
* gtk_tree_view_get_model:
* @tree_view: a #GtkTreeView
- *
+ *
* Returns the model the the #GtkTreeView is based on. Returns NULL if the
* model is unset.
- *
+ *
* Return value: A #GtkTreeModel, or NULL if none is currently being used.
**/
GtkTreeModel *
gtk_tree_view_get_model (GtkTreeView *tree_view)
{
- g_return_val_if_fail (tree_view != NULL, NULL);
g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), NULL);
return tree_view->priv->model;
GtkTreePath *path;
GtkTreeIter iter;
- tree_view->priv->tree = _gtk_rbtree_new ();
-
- gtk_signal_connect (GTK_OBJECT (tree_view->priv->model),
- "changed",
- gtk_tree_view_changed,
- tree_view);
- gtk_signal_connect (GTK_OBJECT (tree_view->priv->model),
- "inserted",
- gtk_tree_view_inserted,
- tree_view);
- gtk_signal_connect (GTK_OBJECT (tree_view->priv->model),
- "child_toggled",
- gtk_tree_view_child_toggled,
- tree_view);
- gtk_signal_connect (GTK_OBJECT (tree_view->priv->model),
- "deleted",
- gtk_tree_view_deleted,
- tree_view);
+ tree_view->priv->tree = NULL;
+
+ g_signal_connectc (tree_view->priv->model,
+ "range_changed",
+ gtk_tree_view_range_changed,
+ tree_view,
+ FALSE);
+ g_signal_connectc (tree_view->priv->model,
+ "inserted",
+ gtk_tree_view_inserted,
+ tree_view,
+ FALSE);
+ g_signal_connectc (tree_view->priv->model,
+ "has_child_toggled",
+ gtk_tree_view_has_child_toggled,
+ tree_view,
+ FALSE);
+ g_signal_connectc (tree_view->priv->model,
+ "deleted",
+ gtk_tree_view_deleted,
+ tree_view,
+ FALSE);
+ g_signal_connectc (tree_view->priv->model,
+ "reordered",
+ gtk_tree_view_reordered,
+ tree_view,
+ FALSE);
if (tree_view->priv->columns == NULL)
return;
if (gtk_tree_model_get_iter (tree_view->priv->model, &iter, path))
{
+ tree_view->priv->tree = _gtk_rbtree_new ();
gtk_tree_view_build_tree (tree_view, tree_view->priv->tree, &iter, 1, FALSE, GTK_WIDGET_REALIZED (tree_view));
}
-
+
gtk_tree_path_free (path);
- gtk_tree_view_create_buttons (tree_view);
+ // gtk_tree_view_create_buttons (tree_view);
GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_MODEL_SETUP);
}
* gtk_tree_view_set_model:
* @tree_view: A #GtkTreeNode.
* @model: The model.
- *
+ *
* Sets the model for a #GtkTreeView. If the @tree_view already has a model
* set, it will remove it before setting the new model. If @model is NULL, then
* it will unset the old model.
gtk_tree_view_set_model (GtkTreeView *tree_view,
GtkTreeModel *model)
{
- g_return_if_fail (tree_view != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+ if (model == tree_view->priv->model)
+ return;
+
+ if (model != NULL)
+ g_object_ref (model);
+
if (tree_view->priv->model != NULL)
{
-
- /* No longer do this. */
-#if 0
- for (list = tree_view->priv->columns; list; list = list->next)
- {
- column = list->data;
- if (column->button)
- {
- gtk_widget_unparent (column->button);
- gdk_window_set_user_data (column->window, NULL);
- gdk_window_destroy (column->window);
- }
- }
-#endif
if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_MODEL_SETUP))
{
- gtk_signal_disconnect_by_func (GTK_OBJECT (tree_view->priv->model),
- gtk_tree_view_changed,
- tree_view);
- gtk_signal_disconnect_by_func (GTK_OBJECT (tree_view->priv->model),
- gtk_tree_view_inserted,
- tree_view);
- gtk_signal_disconnect_by_func (GTK_OBJECT (tree_view->priv->model),
- gtk_tree_view_child_toggled,
- tree_view);
- gtk_signal_disconnect_by_func (GTK_OBJECT (tree_view->priv->model),
- gtk_tree_view_deleted,
- tree_view);
+ g_signal_handlers_disconnect_matched (G_OBJECT (tree_view->priv->model),
+ G_SIGNAL_MATCH_DATA,
+ 0, 0, NULL,
+ NULL, tree_view);
+ g_signal_handlers_disconnect_matched (G_OBJECT (tree_view->priv->model),
+ G_SIGNAL_MATCH_DATA,
+ 0, 0, NULL,
+ NULL, tree_view);
+ g_signal_handlers_disconnect_matched (G_OBJECT (tree_view->priv->model),
+ G_SIGNAL_MATCH_DATA,
+ 0, 0, NULL,
+ NULL, tree_view);
+ g_signal_handlers_disconnect_matched (G_OBJECT (tree_view->priv->model),
+ G_SIGNAL_MATCH_DATA,
+ 0, 0, NULL,
+ NULL, tree_view);
+ g_signal_handlers_disconnect_matched (G_OBJECT (tree_view->priv->model),
+ G_SIGNAL_MATCH_DATA,
+ 0, 0, NULL,
+ NULL, tree_view);
_gtk_rbtree_free (tree_view->priv->tree);
}
-#if 0
- g_list_free (tree_view->priv->columns);
- tree_view->priv->columns = NULL;
-#endif
if (tree_view->priv->drag_dest_row)
- gtk_tree_path_free (tree_view->priv->drag_dest_row);
-
+ gtk_tree_row_reference_free (tree_view->priv->drag_dest_row);
+
GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_MODEL_SETUP);
+ g_object_unref (tree_view->priv->model);
}
tree_view->priv->model = model;
+
if (model == NULL)
{
tree_view->priv->tree = NULL;
if (GTK_WIDGET_REALIZED (tree_view))
- _gtk_tree_view_set_size (tree_view, 0, 0);
- return;
+ _gtk_tree_view_update_size (tree_view);
}
else if (GTK_WIDGET_REALIZED (tree_view))
{
gtk_tree_view_setup_model (tree_view);
- _gtk_tree_view_set_size (tree_view, -1, -1);
+ _gtk_tree_view_update_size (tree_view);
}
+
+ g_object_notify (G_OBJECT (tree_view), "model");
}
/**
* gtk_tree_view_get_selection:
* @tree_view: A #GtkTreeView.
- *
+ *
* Gets the #GtkTreeSelection associated with @tree_view.
- *
+ *
* Return value: A #GtkTreeSelection object.
**/
GtkTreeSelection *
gtk_tree_view_get_selection (GtkTreeView *tree_view)
{
- g_return_val_if_fail (tree_view != NULL, NULL);
g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), NULL);
if (tree_view->priv->selection == NULL)
/**
* gtk_tree_view_get_hadjustment:
* @tree_view: A #GtkTreeView
- *
+ *
* Gets the #GtkAdjustment currently being used for the horizontal aspect.
- *
+ *
* Return value: A #GtkAdjustment object, or NULL if none is currently being
* used.
**/
GtkAdjustment *
gtk_tree_view_get_hadjustment (GtkTreeView *tree_view)
{
- g_return_val_if_fail (tree_view != NULL, NULL);
g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), NULL);
if (tree_view->priv->hadjustment == NULL)
gtk_tree_view_set_hadjustment (tree_view, NULL);
-
+
return tree_view->priv->hadjustment;
}
* gtk_tree_view_set_hadjustment:
* @tree_view: A #GtkTreeView
* @adjustment: The #GtkAdjustment to set, or NULL
- *
+ *
* Sets the #GtkAdjustment for the current horizontal aspect.
**/
void
gtk_tree_view_set_hadjustment (GtkTreeView *tree_view,
GtkAdjustment *adjustment)
{
- g_return_if_fail (tree_view != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
gtk_tree_view_set_adjustments (tree_view,
adjustment,
tree_view->priv->vadjustment);
+
+ g_object_notify (G_OBJECT (tree_view), "hadjustment");
}
/**
* gtk_tree_view_get_vadjustment:
* @tree_view: A #GtkTreeView
- *
+ *
* Gets the #GtkAdjustment currently being used for the vertical aspect.
- *
+ *
* Return value: A #GtkAdjustment object, or NULL if none is currently being
* used.
**/
GtkAdjustment *
gtk_tree_view_get_vadjustment (GtkTreeView *tree_view)
{
- g_return_val_if_fail (tree_view != NULL, NULL);
g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), NULL);
if (tree_view->priv->vadjustment == NULL)
gtk_tree_view_set_vadjustment (tree_view, NULL);
-
+
return tree_view->priv->vadjustment;
}
* gtk_tree_view_set_vadjustment:
* @tree_view: A #GtkTreeView
* @adjustment: The #GtkAdjustment to set, or NULL
- *
+ *
* Sets the #GtkAdjustment for the current vertical aspect.
**/
void
gtk_tree_view_set_vadjustment (GtkTreeView *tree_view,
GtkAdjustment *adjustment)
{
- g_return_if_fail (tree_view != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
gtk_tree_view_set_adjustments (tree_view,
tree_view->priv->hadjustment,
adjustment);
+
+ g_object_notify (G_OBJECT (tree_view), "vadjustment");
}
/**
* @tree_view: A #GtkTreeView
* @hadj: The horizontal #GtkAdjustment to set, or NULL
* @vadj: The vertical #GtkAdjustment to set, or NULL
- *
+ *
* Sets the horizonal and or vertical #GtkAdjustment.
**/
static void
{
gboolean need_adjust = FALSE;
- g_return_if_fail (tree_view != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
if (hadj)
/**
* gtk_tree_view_get_headers_visible:
* @tree_view: A #GtkTreeView.
- *
+ *
* Returns TRUE if the headers on the @tree_view are visible.
- *
+ *
* Return value: Whether the headers are visible or not.
**/
gboolean
gtk_tree_view_get_headers_visible (GtkTreeView *tree_view)
{
- g_return_val_if_fail (tree_view != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
return GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE);
* gtk_tree_view_set_headers_visible:
* @tree_view: A #GtkTreeView.
* @headers_visible: TRUE if the headers are visible
- *
+ *
* Sets the the visibility state of the headers.
**/
void
GList *list;
GtkTreeViewColumn *column;
- g_return_if_fail (tree_view != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
headers_visible = !! headers_visible;
-
+
if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE) == headers_visible)
return;
if (headers_visible)
{
gdk_window_move_resize (tree_view->priv->bin_window, x, y, tree_view->priv->width, tree_view->priv->height + TREE_VIEW_HEADER_HEIGHT (tree_view));
-
+
if (GTK_WIDGET_MAPPED (tree_view))
gtk_tree_view_map_buttons (tree_view);
}
gtk_signal_emit_by_name (GTK_OBJECT (tree_view->priv->vadjustment), "changed");
gtk_widget_queue_resize (GTK_WIDGET (tree_view));
+
+ g_object_notify (G_OBJECT (tree_view), "headers_visible");
}
/**
* gtk_tree_view_columns_autosize:
* @tree_view: A #GtkTreeView.
- *
+ *
* Resizes all columns to their optimal width.
**/
void
GList *list;
GtkTreeViewColumn *column;
- g_return_if_fail (tree_view != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
for (list = tree_view->priv->columns; list; list = list->next)
* gtk_tree_view_set_headers_clickable:
* @tree_view: A #GtkTreeView.
* @setting: TRUE if the columns are clickable.
- *
+ *
* Allow the column title buttons to be clicked.
**/
void
{
GList *list;
- g_return_if_fail (tree_view != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
g_return_if_fail (tree_view->priv->model != NULL);
for (list = tree_view->priv->columns; list; list = list->next)
gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (list->data), setting);
+
+ g_object_notify (G_OBJECT (tree_view), "headers_clickable");
}
/**
* gtk_tree_view_append_column:
* @tree_view: A #GtkTreeView.
* @column: The #GtkTreeViewColumn to add.
- *
+ *
* Appends @column to the list of columns.
- *
+ *
* Return value: The number of columns in @tree_view after appending.
**/
gint
gtk_tree_view_append_column (GtkTreeView *tree_view,
GtkTreeViewColumn *column)
{
- g_return_val_if_fail (tree_view != NULL, -1);
g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), -1);
- g_return_val_if_fail (column != NULL, -1);
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (column), -1);
g_return_val_if_fail (column->tree_view == NULL, -1);
- g_object_ref (G_OBJECT (column));
- tree_view->priv->columns = g_list_append (tree_view->priv->columns, column);
- column->tree_view = GTK_WIDGET (tree_view);
-
- tree_view->priv->n_columns++;
-
- /* FIXME create header for the new column! */
-
- return tree_view->priv->n_columns;
+ return gtk_tree_view_insert_column (tree_view, column, -1);
}
* gtk_tree_view_remove_column:
* @tree_view: A #GtkTreeView.
* @column: The #GtkTreeViewColumn to remove.
- *
+ *
* Removes @column from @tree_view.
- *
+ *
* Return value: The number of columns in @tree_view after removing.
**/
gint
gtk_tree_view_remove_column (GtkTreeView *tree_view,
GtkTreeViewColumn *column)
{
- g_return_val_if_fail (tree_view != NULL, -1);
g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), -1);
- g_return_val_if_fail (column != NULL, -1);
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (column), -1);
g_return_val_if_fail (column->tree_view == GTK_WIDGET (tree_view), -1);
- tree_view->priv->columns = g_list_remove (tree_view->priv->columns,
- column);
- column->tree_view = NULL;
+ _gtk_tree_view_column_unset_tree_view (column);
+
+ if (tree_view->priv->focus_column == column)
+ tree_view->priv->focus_column = NULL;
+
+ tree_view->priv->columns = g_list_remove (tree_view->priv->columns, column);
+
g_object_unref (G_OBJECT (column));
tree_view->priv->n_columns--;
- /* FIXME destroy header for the column! */
-
+ if (GTK_WIDGET_REALIZED (tree_view))
+ {
+ GList *list;
+
+ for (list = tree_view->priv->columns; list; list = list->next)
+ {
+ column = GTK_TREE_VIEW_COLUMN (list->data);
+ if (column->visible)
+ column->dirty = TRUE;
+ }
+
+ if (tree_view->priv->n_columns == 0 &&
+ gtk_tree_view_get_headers_visible (tree_view))
+ gdk_window_hide (tree_view->priv->header_window);
+
+ gtk_widget_queue_resize (GTK_WIDGET (tree_view));
+ }
+
+
return tree_view->priv->n_columns;
}
* @tree_view: A #GtkTreeView.
* @column: The #GtkTreeViewColumn to be inserted.
* @position: The position to insert @column in.
- *
- * This inserts the @column into the @tree_view at @position.
- *
+ *
+ * This inserts the @column into the @tree_view at @position. If @position is
+ * -1, then the column is inserted at the end.
+ *
* Return value: The number of columns in @tree_view after insertion.
**/
gint
GtkTreeViewColumn *column,
gint position)
{
- g_return_val_if_fail (tree_view != NULL, -1);
g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), -1);
- g_return_val_if_fail (column != NULL, -1);
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (column), -1);
g_return_val_if_fail (column->tree_view == NULL, -1);
g_object_ref (G_OBJECT (column));
+ if (tree_view->priv->n_columns == 0 &&
+ GTK_WIDGET_REALIZED (tree_view) &&
+ gtk_tree_view_get_headers_visible (tree_view))
+ {
+ gdk_window_show (tree_view->priv->header_window);
+ }
+
tree_view->priv->columns = g_list_insert (tree_view->priv->columns,
- column, position);
- column->tree_view = GTK_WIDGET (tree_view);
+ column, position);
+ _gtk_tree_view_column_set_tree_view (column, tree_view);
+ _gtk_tree_view_column_create_button (column);
tree_view->priv->n_columns++;
- /* FIXME create header for the column! */
-
+
+ if (GTK_WIDGET_REALIZED (tree_view))
+ {
+ GList *list;
+
+ for (list = tree_view->priv->columns; list; list = list->next)
+ {
+ column = GTK_TREE_VIEW_COLUMN (list->data);
+ if (column->visible)
+ column->dirty = TRUE;
+ }
+ gtk_widget_queue_resize (GTK_WIDGET (tree_view));
+ }
+
+ return tree_view->priv->n_columns;
+}
+
+/**
+ * gtk_tree_view_insert_column_with_attributes:
+ * @tree_view: A #GtkTreeView
+ * @position: The position to insert the new column in.
+ * @title: The title to set the header to.
+ * @cell: The #GtkCellRenderer.
+ * @Varargs: A NULL terminated list of attributes.
+ *
+ * Creates a new #GtkTreeViewColumn and inserts it into the @tree_view at
+ * @position. If @position is -1, then the newly created column is inserted at
+ * the end. The column is initialized with the attributes given.
+ *
+ * Return value: The number of columns in @tree_view after insertion.
+ **/
+gint
+gtk_tree_view_insert_column_with_attributes (GtkTreeView *tree_view,
+ gint position,
+ gchar *title,
+ GtkCellRenderer *cell,
+ ...)
+{
+ GtkTreeViewColumn *column;
+ gchar *attribute;
+ va_list args;
+ gint column_id;
+
+ g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), -1);
+
+ column = gtk_tree_view_column_new ();
+
+ gtk_tree_view_column_set_title (column, title);
+ gtk_tree_view_column_set_cell_renderer (column, cell);
+
+ va_start (args, cell);
+
+ attribute = va_arg (args, gchar *);
+
+ while (attribute != NULL)
+ {
+ column_id = va_arg (args, gint);
+ gtk_tree_view_column_add_attribute (column, attribute, column_id);
+ attribute = va_arg (args, gchar *);
+ }
+
+ va_end (args);
+
+ gtk_tree_view_insert_column (tree_view, column, position);
+ g_object_unref (column);
+
return tree_view->priv->n_columns;
}
* gtk_tree_view_get_column:
* @tree_view: A #GtkTreeView.
* @n: The position of the column, counting from 0.
- *
+ *
* Gets the #GtkTreeViewColumn at the given position in the #tree_view.
- *
+ *
* Return value: The #GtkTreeViewColumn, or NULL if the position is outside the
* range of columns.
**/
gtk_tree_view_get_column (GtkTreeView *tree_view,
gint n)
{
- g_return_val_if_fail (tree_view != NULL, NULL);
g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), NULL);
g_return_val_if_fail (tree_view->priv->model != NULL, NULL);
if (n < 0 || n >= tree_view->priv->n_columns)
return NULL;
-
+
if (tree_view->priv->columns == NULL)
return NULL;
{
tree_view->priv->expander_column = col;
- /* g_object_notify (G_OBJECT (tree_view), "expander_column"); */
+ g_object_notify (G_OBJECT (tree_view), "expander_column");
}
}
* @tree_view: a #GtkTreeView
* @tree_x: X coordinate of new top-left pixel of visible area
* @tree_y: Y coordinate of new top-left pixel of visible area
- *
+ *
* Scrolls the tree view such that the top-left corner of the visible
* area is @tree_x, @tree_y, where @tree_x and @tree_y are specified
* in tree window coordinates. The @tree_view must be realized before
vadj = tree_view->priv->vadjustment;
gtk_adjustment_set_value (hadj, CLAMP (tree_x, hadj->lower, hadj->upper));
- gtk_adjustment_set_value (vadj, CLAMP (tree_y, vadj->lower, vadj->upper));
+ gtk_adjustment_set_value (vadj, CLAMP (tree_y, vadj->lower, vadj->upper));
}
/**
* @column: The #GtkTreeViewColumn to move horizontally to.
* @row_align: The vertical alignment of the row specified by @path.
* @col_align: The horizontal alignment of the column specified by @column.
- *
+ *
* Moves the alignments of @tree_view to the position specified by
* @column and @path. If @column is NULL, then no horizontal
* scrolling occurs. Likewise, if @path is NULL no vertical scrolling
GdkRectangle cell_rect;
GdkRectangle vis_rect;
gint dest_x, dest_y;
-
+
/* FIXME work on unmapped/unrealized trees? maybe implement when
* we do incremental reflow for trees
*/
-
- g_return_if_fail (tree_view != NULL);
+
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
g_return_if_fail (row_align >= 0.0);
g_return_if_fail (row_align <= 1.0);
dest_x = vis_rect.x;
dest_y = vis_rect.y;
-
+
if (path)
{
dest_x = cell_rect.x +
* @column: A pointer to a #GtkTreeViewColumn pointer to be filled in, or %NULL
* @cell_x: A pointer where the X coordinate relative to the cell can be placed, or %NULL
* @cell_y: A pointer where the Y coordinate relative to the cell can be placed, or %NULL
- *
+ *
* Finds the path at the point (@x, @y) relative to @window. If
* @window is NULL, then the point is found relative to the widget
* coordinates. This function is expected to be called after an
* then it will be filled with the column at that point. @cell_x and
* @cell_y return the coordinates relative to the cell background
* (i.e. the background_area passed to gtk_cell_renderer_render()).
- *
+ *
* Return value: TRUE if a row exists at that coordinate.
**/
gboolean
GtkRBTree *tree;
GtkRBNode *node;
gint y_offset;
-
+
g_return_val_if_fail (tree_view != NULL, FALSE);
g_return_val_if_fail (tree_view->priv->tree != NULL, FALSE);
g_return_val_if_fail (tree_view->priv->bin_window != NULL, FALSE);
if (x < 0 || y < 0)
return FALSE;
-
+
if (column || cell_x)
{
GtkTreeViewColumn *tmp_column;
GList *list;
gint remaining_x = x;
gboolean found = FALSE;
-
+
for (list = tree_view->priv->columns; list; list = list->next)
{
tmp_column = list->data;
if (remaining_x <= tmp_column->width)
{
found = TRUE;
-
+
if (column)
*column = tmp_column;
if (cell_x)
*cell_x = remaining_x;
-
+
break;
}
remaining_x -= tmp_column->width;
TREE_WINDOW_Y_TO_RBTREE_Y (tree_view, y + tree_view->priv->vadjustment->value),
&tree, &node);
}
-
+
if (tree == NULL)
return FALSE;
if (cell_y)
*cell_y = y_offset;
-
+
if (path)
*path = _gtk_tree_view_find_path (tree_view, tree, node);
GtkTreeViewColumn *tmp_column = NULL;
gint total_width;
GList *list;
-
+
if (x1)
*x1 = 0;
for (list = tree_view->priv->columns; list; list = list->next)
{
tmp_column = list->data;
-
+
if (tmp_column == column)
break;
-
+
if (tmp_column->visible)
total_width += tmp_column->width;
}
-
+
if (tmp_column != column)
{
g_warning (G_STRLOC": passed-in column isn't in the tree");
return;
}
-
+
if (x1)
*x1 = total_width;
-
+
if (x2)
{
if (column->visible)
gint total_width;
GList *list;
gint i;
-
+
if (x1)
*x1 = 0;
for (list = tree_view->priv->columns; list; list = list->next)
{
tmp_column = list->data;
-
+
if (tmp_column == column)
break;
-
+
if (tmp_column->visible)
total_width += tmp_column->width;
++i;
}
-
+
if (tmp_column != column)
{
g_warning (G_STRLOC": passed-in column isn't in the tree");
if (i == tree_view->priv->expander_column)
total_width += tree_view->priv->tab_offset * _gtk_rbtree_get_depth (tree);
-
+
if (x1)
*x1 = total_width;
-
+
if (x2)
{
if (column->visible)
- *x2 = total_width + column->width;
+ *x2 = total_width + column->displayed_width;
else
*x2 = total_width; /* width of 0 */
}
GtkTreeViewColumn *tmp_column = NULL;
gint total_width;
gint i;
-
+
i = 0;
total_width = 0;
for (list = tree_view->priv->columns; list; list = list->next)
x_offset = total_width;
break;
}
-
+
if (tmp_column->visible)
total_width += tmp_column->width;
if (x1)
*x1 = x_offset;
-
+
if (tmp_column && tmp_column->visible)
{
/* +1 because x2 isn't included in the range. */
* @path: a #GtkTreePath for the row, or %NULL to get only horizontal coordinates
* @column: a #GtkTreeViewColumn for the column, or %NULL to get only vertical coordiantes
* @rect: rectangle to fill with cell rect
- *
+ *
* Fills the bounding rectangle in tree window coordinates for the
* cell at the row specified by @path and the column specified by
* @column. If @path is %NULL, the y and height fields of the
* not cover the entire tree; there are extra pixels in between rows,
* for example. The returned rectangle is equivalent to the @cell_area
* passed to gtk_cell_renderer_render().
- *
+ *
**/
void
gtk_tree_view_get_cell_area (GtkTreeView *tree_view,
{
GtkRBTree *tree = NULL;
GtkRBNode *node = NULL;
-
+
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
g_return_if_fail (column == NULL || GTK_IS_TREE_VIEW_COLUMN (column));
g_return_if_fail (rect != NULL);
rect->y = 0;
rect->width = 0;
rect->height = 0;
-
+
if (path)
{
/* Get vertical coords */
-
+
_gtk_tree_view_find_node (tree_view, path, &tree, &node);
-
+
if (tree == NULL)
{
g_warning (G_STRLOC": no row corresponding to path");
if (column)
{
gint x2 = 0;
-
+
gtk_tree_view_get_cell_xrange (tree_view, tree, column, &rect->x, &x2);
rect->width = x2 - rect->x;
}
* @path: a #GtkTreePath for the row, or %NULL to get only horizontal coordinates
* @column: a #GtkTreeViewColumn for the column, or %NULL to get only vertical coordiantes
* @rect: rectangle to fill with cell background rect
- *
+ *
* Fills the bounding rectangle in tree window coordinates for the
* cell at the row specified by @path and the column specified by
* @column. If @path is %NULL, the y and height fields of the
* buttons). Contrast with the cell_area, returned by
* gtk_tree_view_get_cell_area(), which returns only the cell itself,
* excluding surrounding borders and the tree expander area.
- *
+ *
**/
void
gtk_tree_view_get_background_area (GtkTreeView *tree_view,
{
GtkRBTree *tree = NULL;
GtkRBNode *node = NULL;
-
+
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
g_return_if_fail (column == NULL || GTK_IS_TREE_VIEW_COLUMN (column));
g_return_if_fail (rect != NULL);
rect->y = 0;
rect->width = 0;
rect->height = 0;
-
+
if (path)
{
/* Get vertical coords */
-
+
_gtk_tree_view_find_node (tree_view, path, &tree, &node);
-
+
if (tree == NULL)
{
g_warning (G_STRLOC": no row corresponding to path");
if (column)
{
gint x2 = 0;
-
+
gtk_tree_view_get_background_xrange (tree_view, tree, column, &rect->x, &x2);
rect->width = x2 - rect->x;
}
/**
* gtk_tree_view_expand_all:
* @tree_view: A #GtkTreeView.
- *
+ *
* Recursively expands all nodes in the @tree_view.
**/
void
gtk_tree_view_expand_all (GtkTreeView *tree_view)
{
- g_return_if_fail (tree_view != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
g_return_if_fail (tree_view->priv->tree != NULL);
gtk_tree_view_expand_all_helper,
tree_view);
- _gtk_tree_view_set_size (tree_view, -1,-1);
+ _gtk_tree_view_update_size (tree_view);
}
static void
node->children,
&iter,
gtk_tree_path_get_depth (path));
+
+ /* Ensure we don't have a dangling pointer to a dead node */
+ ensure_unprelighted (GTK_TREE_VIEW (data));
+
_gtk_rbtree_remove (node->children);
gtk_tree_path_free (path);
}
/**
* gtk_tree_view_collapse_all:
* @tree_view: A #GtkTreeView.
- *
+ *
* Recursively collapses all visible, expanded nodes in @tree_view.
**/
void
gtk_tree_view_collapse_all (GtkTreeView *tree_view)
{
- g_return_if_fail (tree_view != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
g_return_if_fail (tree_view->priv->tree != NULL);
* @tree_view: a #GtkTreeView
* @path: path to a row
* @open_all: whether to recursively expand, or just expand immediate children
- *
+ *
* Opens the row so its children are visible
- *
+ *
* Return value: %TRUE if the row existed and had children
**/
gboolean
GtkTreeIter child;
GtkRBTree *tree;
GtkRBNode *node;
+ gboolean expand;
- g_return_val_if_fail (tree_view != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
g_return_val_if_fail (tree_view->priv->model != NULL, FALSE);
g_return_val_if_fail (path != NULL, FALSE);
if (node->children)
return TRUE;
-
+
gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
if (! gtk_tree_model_iter_has_child (tree_view->priv->model, &iter))
return FALSE;
-
+
+ g_signal_emit (G_OBJECT (tree_view), tree_view_signals[EXPAND_ROW], 0, &iter, path, &expand);
+
+ if (expand)
+ return FALSE;
+
node->children = _gtk_rbtree_new ();
node->children->parent_tree = tree;
node->children->parent_node = node;
* gtk_tree_view_collapse_row:
* @tree_view: a #GtkTreeView
* @path: path to a row in the @tree_view
- *
- * Collapses a row (hides its child rows).
- *
- * Return value: %TRUE if the row was expanded
+ *
+ * Collapses a row (hides its child rows, if they exist.)
+ *
+ * Return value: %TRUE if the row was collapsed.
**/
gboolean
gtk_tree_view_collapse_row (GtkTreeView *tree_view,
GtkRBTree *tree;
GtkRBNode *node;
GtkTreeIter iter;
+ gboolean collapse;
- g_return_val_if_fail (tree_view != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
g_return_val_if_fail (tree_view->priv->tree != NULL, FALSE);
g_return_val_if_fail (path != NULL, FALSE);
return FALSE;
gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
+
+ g_signal_emit (G_OBJECT (tree_view), tree_view_signals[COLLAPSE_ROW], 0, &iter, path, &collapse);
+
+ if (collapse)
+ return FALSE;
+
gtk_tree_view_discover_dirty (tree_view,
node->children,
&iter,
gtk_tree_path_get_depth (path));
+
+ /* Ensure we don't have a dangling pointer to a dead node */
+ ensure_unprelighted (tree_view);
+
+ g_assert (tree_view->priv->prelight_node == NULL);
+
_gtk_rbtree_remove (node->children);
if (GTK_WIDGET_MAPPED (tree_view))
{
GtkWidget *widget;
- g_return_if_fail (tree_view != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
widget = GTK_WIDGET (tree_view);
*
* Converts widget coordinates to coordinates for the
* tree window (the full scrollable area of the tree).
- *
+ *
**/
void
gtk_tree_view_widget_to_tree_coords (GtkTreeView *tree_view,
gint *ty)
{
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
-
+
if (tx)
{
*tx = wx + tree_view->priv->hadjustment->value;
*
* Converts tree coordinates (coordinates in full scrollable
* area of the tree) to widget coordinates.
- *
+ *
**/
void
gtk_tree_view_tree_to_widget_coords (GtkTreeView *tree_view,
}
}
+/**
+ * gtk_tree_view_set_rules_hint
+ * @tree_view: a #GtkTreeView
+ * @setting: %TRUE if the tree requires reading across rows
+ *
+ * This function tells GTK+ that the user interface for your
+ * application requires users to read across tree rows and associate
+ * cells with one another. By default, GTK+ will then render the tree
+ * with alternating row colors. <emphasis>DO NOT</emphasis> use it
+ * just because you prefer the appearance of the ruled tree; that's a
+ * question for the theme. Some themes will draw tree rows in
+ * alternating colors even when rules are turned off, and users who
+ * prefer that appearance all the time can choose those themes. You
+ * should call this function only as a <emphasis>semantic</emphasis>
+ * hint to the theme engine that your tree makes alternating colors
+ * useful from a functional standpoint (since it has lots of columns,
+ * generally).
+ *
+ **/
+void
+gtk_tree_view_set_rules_hint (GtkTreeView *tree_view,
+ gboolean setting)
+{
+ g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+
+ setting = setting != FALSE;
+
+ if (tree_view->priv->has_rules != setting)
+ {
+ tree_view->priv->has_rules = setting;
+ gtk_widget_queue_draw (GTK_WIDGET (tree_view));
+ }
+
+ g_object_notify (G_OBJECT (tree_view), "rules_hint");
+}
+
+/**
+ * gtk_tree_view_get_rules_hint
+ * @tree_view: a #GtkTreeView
+ *
+ * Gets the setting set by gtk_tree_view_set_rules_hint().
+ *
+ * Return value: %TRUE if rules are useful for the user of this tree
+ **/
+gboolean
+gtk_tree_view_get_rules_hint (GtkTreeView *tree_view)
+{
+ g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
+
+ return tree_view->priv->has_rules;
+}
+
/* Drag-and-drop */
-void
+static void
set_source_row (GdkDragContext *context,
+ GtkTreeModel *model,
GtkTreePath *source_row)
{
g_object_set_data_full (G_OBJECT (context),
"gtk-tree-view-source-row",
- source_row ? gtk_tree_path_copy (source_row) : NULL,
- (GDestroyNotify) (source_row ? gtk_tree_path_free : NULL));
+ source_row ? gtk_tree_row_reference_new (model, source_row) : NULL,
+ (GDestroyNotify) (source_row ? gtk_tree_row_reference_free : NULL));
}
-GtkTreePath*
+static GtkTreePath*
get_source_row (GdkDragContext *context)
{
- return g_object_get_data (G_OBJECT (context), "gtk-tree-view-source-row");
+ GtkTreeRowReference *ref =
+ g_object_get_data (G_OBJECT (context), "gtk-tree-view-source-row");
+
+ if (ref)
+ return gtk_tree_row_reference_get_path (ref);
+ else
+ return NULL;
}
-void
+static void
set_dest_row (GdkDragContext *context,
+ GtkTreeModel *model,
GtkTreePath *dest_row)
{
g_object_set_data_full (G_OBJECT (context),
"gtk-tree-view-dest-row",
- dest_row ? gtk_tree_path_copy (dest_row) : NULL,
- (GDestroyNotify) (dest_row ? gtk_tree_path_free : NULL));
+ dest_row ? gtk_tree_row_reference_new (model, dest_row) : NULL,
+ (GDestroyNotify) (dest_row ? gtk_tree_row_reference_free : NULL));
}
-GtkTreePath*
+static GtkTreePath*
get_dest_row (GdkDragContext *context)
{
- return g_object_get_data (G_OBJECT (context), "gtk-tree-view-dest-row");
+ GtkTreeRowReference *ref =
+ g_object_get_data (G_OBJECT (context), "gtk-tree-view-dest-row");
+
+ if (ref)
+ return gtk_tree_row_reference_get_path (ref);
+ else
+ return NULL;
+}
+
+/* Get/set whether drag_motion requested the drag data and
+ * drag_data_received should thus not actually insert the data,
+ * since the data doesn't result from a drop.
+ */
+static void
+set_status_pending (GdkDragContext *context,
+ GdkDragAction suggested_action)
+{
+ g_object_set_data (G_OBJECT (context),
+ "gtk-tree-view-status-pending",
+ GINT_TO_POINTER (suggested_action));
+}
+
+static GdkDragAction
+get_status_pending (GdkDragContext *context)
+{
+ return GPOINTER_TO_INT (g_object_get_data (G_OBJECT (context),
+ "gtk-tree-view-status-pending"));
}
typedef struct _TreeViewDragInfo TreeViewDragInfo;
GtkTargetList *dest_target_list;
GClosure *location_droppable_closure;
-
+
guint source_set : 1;
guint dest_set : 1;
};
if (di->row_draggable_closure)
g_closure_unref (di->row_draggable_closure);
-
+
di->source_target_list = NULL;
di->row_draggable_closure = NULL;
}
if (di->dest_target_list)
gtk_target_list_unref (di->dest_target_list);
-
+
di->location_droppable_closure = NULL;
di->dest_target_list = NULL;
}
if (di == NULL)
{
di = g_new0 (TreeViewDragInfo, 1);
-
+
g_object_set_data_full (G_OBJECT (tree_view),
"gtk-tree-view-drag-info",
di,
GtkTreePath *path = NULL;
GtkTreeViewColumn *column = NULL;
GdkRectangle visible_rect;
-
+
tree_view = GTK_TREE_VIEW (data);
gdk_window_get_pointer (tree_view->priv->bin_window,
- &x, &y, &state);
+ &x, &y, &state);
gtk_tree_view_get_visible_rect (tree_view, &visible_rect);
&column,
NULL,
NULL);
-
+
if (path != NULL)
{
gtk_tree_view_scroll_to_cell (tree_view,
path,
column,
- 0.5, 0.5);
-
+ 0.5, 0.5);
+
gtk_tree_path_free (path);
}
}
-
+
return TRUE;
}
}
}
-#ifdef __GNUC__
-#warning "implement g_closure_sink"
-#endif
-#define g_closure_sink(c)
-
void
gtk_tree_view_set_rows_drag_source (GtkTreeView *tree_view,
GdkModifierType start_button_mask,
TreeViewDragInfo *di;
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
-
+
di = ensure_info (tree_view);
clear_source_info (di);
gpointer user_data)
{
TreeViewDragInfo *di;
-
+
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
gtk_drag_dest_set (GTK_WIDGET (tree_view),
NULL,
0,
actions);
-
+
di = ensure_info (tree_view);
- clear_dest_info (di);
+ clear_dest_info (di);
if (targets)
di->dest_target_list = gtk_target_list_new (targets, n_targets);
g_closure_ref (di->location_droppable_closure);
g_closure_sink (di->location_droppable_closure);
}
-
+
di->dest_set = TRUE;
}
gtk_tree_view_unset_rows_drag_source (GtkTreeView *tree_view)
{
TreeViewDragInfo *di;
-
+
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
-
+
di = get_info (tree_view);
if (di)
gtk_tree_view_unset_rows_drag_dest (GtkTreeView *tree_view)
{
TreeViewDragInfo *di;
-
+
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
-
+
di = get_info (tree_view);
if (di)
GtkTreePath *path,
GtkTreeViewDropPosition pos)
{
+ GtkTreePath *current_dest;
/* Note; this function is exported to allow a custom DND
* implementation, so it can't touch TreeViewDragInfo
*/
-
+
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
- g_print ("drag dest row %p -> %p\n", tree_view->priv->drag_dest_row, path);
-
+ current_dest = NULL;
+
if (tree_view->priv->drag_dest_row)
+ current_dest = gtk_tree_row_reference_get_path (tree_view->priv->drag_dest_row);
+
+ if (current_dest)
{
- gtk_tree_view_queue_draw_path (tree_view, tree_view->priv->drag_dest_row, NULL);
- gtk_tree_path_free (tree_view->priv->drag_dest_row);
+ gtk_tree_view_queue_draw_path (tree_view, current_dest, NULL);
+ gtk_tree_path_free (current_dest);
}
+ if (tree_view->priv->drag_dest_row)
+ gtk_tree_row_reference_free (tree_view->priv->drag_dest_row);
+
tree_view->priv->drag_dest_pos = pos;
-
+
if (path)
{
- tree_view->priv->drag_dest_row = gtk_tree_path_copy (path);
- gtk_tree_view_queue_draw_path (tree_view, tree_view->priv->drag_dest_row, NULL);
+ tree_view->priv->drag_dest_row =
+ gtk_tree_row_reference_new_proxy (G_OBJECT (tree_view), tree_view->priv->model, path);
+ gtk_tree_view_queue_draw_path (tree_view, path, NULL);
}
else
tree_view->priv->drag_dest_row = NULL;
GtkTreeViewDropPosition *pos)
{
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
-
+
if (path)
{
if (tree_view->priv->drag_dest_row)
- *path = gtk_tree_path_copy (tree_view->priv->drag_dest_row);
+ *path = gtk_tree_row_reference_get_path (tree_view->priv->drag_dest_row);
else
*path = NULL;
}
GdkRectangle cell;
GtkTreeViewColumn *column = NULL;
GtkTreePath *tmp_path = NULL;
-
+
/* Note; this function is exported to allow a custom DND
* implementation, so it can't touch TreeViewDragInfo
*/
-
+
g_return_val_if_fail (tree_view != NULL, FALSE);
g_return_val_if_fail (tree_view->priv->tree != NULL, FALSE);
g_return_val_if_fail (drag_x >= 0, FALSE);
gtk_tree_view_widget_to_tree_coords (tree_view, drag_x, drag_y,
&x, &y);
-
+
/* If in the top quarter of a row, we drop before that row; if
* in the bottom quarter, drop after that row; if in the middle,
* and the row has children, drop into the row.
&column,
NULL,
&cell_y))
- return FALSE;
+ return FALSE;
gtk_tree_view_get_background_area (tree_view, tmp_path, column,
&cell);
offset_into_row = cell_y;
-
+
if (path)
*path = tmp_path;
else
gtk_tree_path_free (tmp_path);
tmp_path = NULL;
-
+
quarter = cell.height / 4.0;
-
+
if (pos)
{
if (offset_into_row < quarter)
{
- *pos = GTK_TREE_VIEW_DROP_BEFORE;
+ *pos = GTK_TREE_VIEW_DROP_BEFORE;
}
else if (offset_into_row < quarter * 2)
{
GtkTreePath *path = NULL;
gint button;
gint cell_x, cell_y;
-
+ GtkTreeModel *model;
+
di = get_info (tree_view);
if (di == NULL)
tree_view->priv->press_start_y,
event->x, event->y))
return FALSE;
-
+
+ model = gtk_tree_view_get_model (tree_view);
+
+ if (model == NULL)
+ return FALSE;
+
button = tree_view->priv->pressed_button;
tree_view->priv->pressed_button = -1;
if (path == NULL)
return FALSE;
-
+
/* FIXME if the path doesn't match the row_draggable predicate,
* return FALSE and free path
- */
+ */
/* FIXME Check whether we're a start button, if not return FALSE and
* free path
*/
-
+
context = gtk_drag_begin (GTK_WIDGET (tree_view),
di->source_target_list,
di->source_actions,
gdk_pixmap_unref (row_pix);
}
-
- set_source_row (context, path);
+
+ set_source_row (context, model, path);
gtk_tree_path_free (path);
-
+
return TRUE;
}
GtkTreeModel *model;
TreeViewDragInfo *di;
GtkTreePath *source_row;
-
+
tree_view = GTK_TREE_VIEW (widget);
model = gtk_tree_view_get_model (tree_view);
return;
di = get_info (GTK_TREE_VIEW (widget));
-
- if (di == NULL)
+
+ if (di == NULL)
return;
source_row = get_source_row (context);
if (source_row == NULL)
return;
-
+
/* We can implement the GTK_TREE_MODEL_ROW target generically for
* any model; for DragSource models there are some other targets
* we also support.
gtk_tree_drag_source_drag_data_get (GTK_TREE_DRAG_SOURCE (model),
source_row,
selection_data))
- return;
+ goto done;
/* If drag_data_get does nothing, try providing row data. */
if (selection_data->target == gdk_atom_intern ("GTK_TREE_MODEL_ROW", FALSE))
model,
source_row);
}
+
+ done:
+ gtk_tree_path_free (source_row);
}
{
g_warning ("You must override the default '%s' handler "
"on GtkTreeView when using models that don't support "
- "the %s interface. The simplest way to do this "
+ "the %s interface and enabling drag-and-drop. The simplest way to do this "
"is to connect to '%s' and call "
"gtk_signal_emit_stop_by_name() in your signal handler to prevent "
"the default handler from running. Look at the source code "
"for the default handler in gtktreeview.c to get an idea what "
"your handler should do. (gtktreeview.c is in the GTK source "
- "code.)",
+ "code.) If you're using GTK from a language other than C, "
+ "there may be a more natural way to override default handlers, e.g. via derivation.",
signal, g_type_name (required_iface), signal);
return FALSE;
}
GtkTreeModel *model;
GtkTreeView *tree_view;
GtkTreePath *source_row;
-
+
tree_view = GTK_TREE_VIEW (widget);
model = gtk_tree_view_get_model (tree_view);
if (!check_model_dnd (model, GTK_TYPE_TREE_DRAG_SOURCE, "drag_data_delete"))
return;
-
+
di = get_info (tree_view);
if (di == NULL)
return;
source_row = get_source_row (context);
-
+
+ if (source_row == NULL)
+ return;
gtk_tree_drag_source_drag_data_delete (GTK_TREE_DRAG_SOURCE (model),
source_row);
-
- set_source_row (context, NULL);
+
+ gtk_tree_path_free (source_row);
+
+ set_source_row (context, NULL, NULL);
}
static void
guint time)
{
TreeViewDragInfo *di;
-
+
di = get_info (GTK_TREE_VIEW (widget));
-
+
/* unset any highlight row */
- g_print ("drag leave\n");
gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget),
NULL,
GTK_TREE_VIEW_DROP_BEFORE);
-
+
remove_scroll_timeout (GTK_TREE_VIEW (widget));
remove_open_timeout (GTK_TREE_VIEW (widget));
}
open_row_timeout (gpointer data)
{
GtkTreeView *tree_view = data;
+ GtkTreePath *dest_path = NULL;
+ GtkTreeViewDropPosition pos;
- if (tree_view->priv->drag_dest_row &&
- (tree_view->priv->drag_dest_pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER ||
- tree_view->priv->drag_dest_pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE))
+ gtk_tree_view_get_drag_dest_row (tree_view,
+ &dest_path,
+ &pos);
+
+ if (dest_path &&
+ (pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER ||
+ pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE))
{
- gtk_tree_view_expand_row (tree_view,
- tree_view->priv->drag_dest_row,
- FALSE);
+ gtk_tree_view_expand_row (tree_view, dest_path, FALSE);
tree_view->priv->open_dest_timeout = 0;
+
+ gtk_tree_path_free (dest_path);
+
return FALSE;
- }
+ }
else
- return TRUE;
+ {
+ if (dest_path)
+ gtk_tree_path_free (dest_path);
+ return TRUE;
+ }
}
/* Returns TRUE if event should not be propagated to parent widgets */
GdkDragContext *context,
gint x,
gint y,
- GdkDragAction *suggested_action)
+ GdkDragAction *suggested_action,
+ GdkAtom *target)
{
GtkTreePath *path = NULL;
GtkTreeViewDropPosition pos;
+ GtkTreeViewDropPosition old_pos;
TreeViewDragInfo *di;
GtkWidget *widget;
+ GtkTreePath *old_dest_path = NULL;
*suggested_action = 0;
-
+ *target = GDK_NONE;
+
widget = GTK_WIDGET (tree_view);
-
+
di = get_info (tree_view);
-
+
if (di == NULL)
{
/* someone unset us as a drag dest, note that if
* we return FALSE drag_leave isn't called
*/
- g_print ("no longer a drag dest\n");
gtk_tree_view_set_drag_dest_row (tree_view,
NULL,
GTK_TREE_VIEW_DROP_BEFORE);
remove_scroll_timeout (GTK_TREE_VIEW (widget));
remove_open_timeout (GTK_TREE_VIEW (widget));
-
+
return FALSE; /* no longer a drop site */
}
- /* We don't take this target */
- if (gtk_drag_dest_find_target (widget, context, di->dest_target_list) == GDK_NONE)
+ *target = gtk_drag_dest_find_target (widget, context, di->dest_target_list);
+ if (*target == GDK_NONE)
{
- g_print ("bad target, not accepting\n");
return FALSE;
}
-
+
if (!gtk_tree_view_get_dest_row_at_pos (tree_view,
x, y,
&path,
/* can't drop here */
remove_open_timeout (tree_view);
- g_print ("no drag row here\n");
gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget),
NULL,
GTK_TREE_VIEW_DROP_BEFORE);
/* don't propagate to parent though */
return TRUE;
}
-
+
g_assert (path);
/* If we left the current row's "open" zone, unset the timeout for
* opening the row
*/
- if (tree_view->priv->drag_dest_row &&
- (gtk_tree_path_compare (path, tree_view->priv->drag_dest_row) != 0 ||
+ gtk_tree_view_get_drag_dest_row (tree_view,
+ &old_dest_path,
+ &old_pos);
+
+ if (old_dest_path &&
+ (gtk_tree_path_compare (path, old_dest_path) != 0 ||
!(pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER ||
pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)))
remove_open_timeout (tree_view);
-
+
+ if (old_dest_path)
+ gtk_tree_path_free (old_dest_path);
+
if (TRUE /* FIXME if the location droppable predicate */)
{
GtkWidget *source_widget;
-
+
*suggested_action = context->suggested_action;
-
+
source_widget = gtk_drag_get_source_widget (context);
-
+
if (source_widget == widget)
{
/* Default to MOVE, unless the user has
*suggested_action = GDK_ACTION_MOVE;
}
- g_print ("setting drag dest row\n");
gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget),
path, pos);
}
{
/* can't drop here */
remove_open_timeout (tree_view);
-
- g_print ("droppable predicate false\n");
+
gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget),
NULL,
GTK_TREE_VIEW_DROP_BEFORE);
GtkTreeViewDropPosition pos;
GtkTreeView *tree_view;
GdkDragAction suggested_action = 0;
-
+ GdkAtom target;
+
tree_view = GTK_TREE_VIEW (widget);
-
- g_print ("motion\n");
- if (!set_destination_row (tree_view, context, x, y, &suggested_action))
+ if (!set_destination_row (tree_view, context, x, y, &suggested_action, &target))
return FALSE;
ensure_scroll_timeout (tree_view);
-
+
gtk_tree_view_get_drag_dest_row (tree_view, &path, &pos);
if (path == NULL)
{
/* Can't drop here. */
- g_print ("not over a dest row\n");
gdk_drag_status (context, 0, time);
}
else
pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE))
{
tree_view->priv->open_dest_timeout =
- gtk_timeout_add (250, open_row_timeout, tree_view);
+ gtk_timeout_add (500, open_row_timeout, tree_view);
}
- g_print ("status\n");
- gdk_drag_status (context, suggested_action, time);
+ if (target == gdk_atom_intern ("GTK_TREE_MODEL_ROW", FALSE))
+ {
+ /* Request data so we can use the source row when
+ * determining whether to accept the drop
+ */
+ set_status_pending (context, suggested_action);
+ gtk_drag_get_data (widget, context, target, time);
+ }
+ else
+ {
+ set_status_pending (context, 0);
+ gdk_drag_status (context, suggested_action, time);
+ }
}
if (path)
return TRUE;
}
+static GtkTreePath*
+get_logical_dest_row (GtkTreeView *tree_view)
+
+{
+ /* adjust path to point to the row the drop goes in front of */
+ GtkTreePath *path = NULL;
+ GtkTreeViewDropPosition pos;
+
+ gtk_tree_view_get_drag_dest_row (tree_view, &path, &pos);
+
+ if (path == NULL)
+ return NULL;
+
+ if (pos == GTK_TREE_VIEW_DROP_BEFORE)
+ ; /* do nothing */
+ else if (pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE ||
+ pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER)
+ {
+ /* get first child, drop before it */
+ gtk_tree_path_append_index (path, 0);
+ }
+ else
+ {
+ g_assert (pos == GTK_TREE_VIEW_DROP_AFTER);
+ gtk_tree_path_next (path);
+ }
+
+ return path;
+}
+
static gboolean
gtk_tree_view_drag_drop (GtkWidget *widget,
GdkDragContext *context,
gint y,
guint time)
{
- GtkTreePath *path = NULL;
- GtkTreeViewDropPosition pos;
GtkTreeView *tree_view;
+ GtkTreePath *path;
GdkDragAction suggested_action = 0;
GdkAtom target = GDK_NONE;
TreeViewDragInfo *di;
GtkTreeModel *model;
-
+
tree_view = GTK_TREE_VIEW (widget);
model = gtk_tree_view_get_model (tree_view);
-
- g_print ("drop\n");
-
+
remove_scroll_timeout (GTK_TREE_VIEW (widget));
remove_open_timeout (GTK_TREE_VIEW (widget));
if (di == NULL)
return FALSE;
-
+
if (!check_model_dnd (model, GTK_TYPE_TREE_DRAG_DEST, "drag_drop"))
return FALSE;
-
- if (!set_destination_row (tree_view, context, x, y, &suggested_action))
+
+ if (!set_destination_row (tree_view, context, x, y, &suggested_action, &target))
return FALSE;
- gtk_tree_view_get_drag_dest_row (tree_view, &path, &pos);
+ path = get_logical_dest_row (tree_view);
- if (path != NULL && di->dest_target_list)
+ if (target != GDK_NONE && path != NULL)
{
- target = gtk_drag_dest_find_target (widget, context, di->dest_target_list);
-
- if (target != GDK_NONE)
- {
- g_print ("have target\n");
+ /* in case a motion had requested drag data, change things so we
+ * treat drag data receives as a drop.
+ */
+ set_status_pending (context, 0);
- set_dest_row (context, path);
- }
+ set_dest_row (context, model, path);
}
if (path)
gtk_tree_path_free (path);
-
+
/* Unset this thing */
gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget),
NULL,
GTK_TREE_VIEW_DROP_BEFORE);
-
+
if (target != GDK_NONE)
{
- g_print ("getting data\n");
gtk_drag_get_data (widget, context, target, time);
return TRUE;
}
guint info,
guint time)
{
+ GtkTreePath *path;
TreeViewDragInfo *di;
gboolean accepted = FALSE;
GtkTreeModel *model;
GtkTreeView *tree_view;
GtkTreePath *dest_row;
-
+ GdkDragAction suggested_action;
+
tree_view = GTK_TREE_VIEW (widget);
model = gtk_tree_view_get_model (tree_view);
if (!check_model_dnd (model, GTK_TYPE_TREE_DRAG_DEST, "drag_data_received"))
- return;
+ return;
- g_print ("drag data received\n");
-
di = get_info (tree_view);
if (di == NULL)
return;
+ suggested_action = get_status_pending (context);
+
+ if (suggested_action)
+ {
+ /* We are getting this data due to a request in drag_motion,
+ * rather than due to a request in drag_drop, so we are just
+ * supposed to call drag_status, not actually paste in the
+ * data.
+ */
+ path = get_logical_dest_row (tree_view);
+
+ if (path == NULL)
+ suggested_action = 0;
+
+ if (suggested_action)
+ {
+ GtkTreeModel *src_model = NULL;
+ GtkTreePath *src_path = NULL;
+
+ if (!gtk_selection_data_get_tree_row (selection_data,
+ &src_model,
+ &src_path))
+ suggested_action = 0;
+
+ if (suggested_action)
+ {
+ if (!gtk_tree_drag_dest_row_drop_possible (GTK_TREE_DRAG_DEST (model),
+ src_model,
+ src_path,
+ path))
+ suggested_action = 0;
+
+ gtk_tree_path_free (src_path);
+ }
+ }
+
+ gdk_drag_status (context, suggested_action, time);
+
+ if (path)
+ gtk_tree_path_free (path);
+
+ /* If you can't drop, remove user drop indicator until the next motion */
+ if (suggested_action == 0)
+ gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget),
+ NULL,
+ GTK_TREE_VIEW_DROP_BEFORE);
+
+ return;
+ }
+
dest_row = get_dest_row (context);
if (dest_row == NULL)
return;
-
+
if (selection_data->length >= 0)
{
if (gtk_tree_drag_dest_drag_data_received (GTK_TREE_DRAG_DEST (model),
dest_row,
selection_data))
accepted = TRUE;
-
-
- /* Don't clear drop_row, we may need it in drag_data_delete */
}
-
- gtk_drag_finish (context,
+
+ gtk_drag_finish (context,
accepted,
(context->action == GDK_ACTION_MOVE),
time);
- g_print ("accepted: %d\n", accepted);
-}
+ gtk_tree_path_free (dest_row);
+ /* drop dest_row */
+ set_dest_row (context, NULL, NULL);
+}
projects / ~andy / gtk / blobdiff