* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
+
#include <math.h>
#include <string.h>
-#include <gdk/gdkkeysyms.h>
#include "gtktreeview.h"
+
+#include "gtkadjustment.h"
#include "gtkrbtree.h"
#include "gtktreednd.h"
#include "gtktreeprivate.h"
#include "gtkcellrenderer.h"
-#include "gtkmain.h"
#include "gtkmarshalers.h"
#include "gtkbuildable.h"
#include "gtkbutton.h"
-#include "gtkalignment.h"
#include "gtklabel.h"
-#include "gtkhbox.h"
-#include "gtkvbox.h"
+#include "gtkbox.h"
#include "gtkarrow.h"
#include "gtkintl.h"
#include "gtkbindings.h"
#include "gtkcontainer.h"
#include "gtkentry.h"
#include "gtkframe.h"
+#include "gtkmain.h"
#include "gtktreemodelsort.h"
#include "gtktooltip.h"
#include "gtkscrollable.h"
+#include "gtkcelllayout.h"
#include "gtkprivate.h"
#include "gtkwidgetprivate.h"
#include "gtkentryprivate.h"
+#include "gtkstylecontextprivate.h"
+#include "gtkcssstylepropertyprivate.h"
+#include "gtktypebuiltins.h"
+#include "gtkmain.h"
+#include "gtksettings.h"
+#include "gtkwidgetpath.h"
+#include "a11y/gtktreeviewaccessibleprivate.h"
/**
* </refsect2>
*/
+enum
+{
+ DRAG_COLUMN_WINDOW_STATE_UNSET = 0,
+ DRAG_COLUMN_WINDOW_STATE_ORIGINAL = 1,
+ DRAG_COLUMN_WINDOW_STATE_ARROW = 2,
+ DRAG_COLUMN_WINDOW_STATE_ARROW_LEFT = 3,
+ DRAG_COLUMN_WINDOW_STATE_ARROW_RIGHT = 4
+};
+
+enum
+{
+ RUBBER_BAND_OFF = 0,
+ RUBBER_BAND_MAYBE_START = 1,
+ RUBBER_BAND_ACTIVE = 2
+};
+
+typedef enum {
+ CLEAR_AND_SELECT = (1 << 0),
+ CLAMP_NODE = (1 << 1),
+ CURSOR_INVALID = (1 << 2)
+} SetCursorFlags;
+
+ /* This lovely little value is used to determine how far away from the title bar
+ * you can move the mouse and still have a column drag work.
+ */
+#define TREE_VIEW_COLUMN_DRAG_DEAD_MULTIPLIER(tree_view) (10*gtk_tree_view_get_effective_header_height(tree_view))
+
+#ifdef __GNUC__
+
+#define TREE_VIEW_INTERNAL_ASSERT(expr, ret) G_STMT_START{ \
+ if (!(expr)) \
+ { \
+ g_log (G_LOG_DOMAIN, \
+ G_LOG_LEVEL_CRITICAL, \
+ "%s (%s): assertion `%s' failed.\n" \
+ "There is a disparity between the internal view of the GtkTreeView,\n" \
+ "and the GtkTreeModel. This generally means that the model has changed\n"\
+ "without letting the view know. Any display from now on is likely to\n" \
+ "be incorrect.\n", \
+ G_STRLOC, \
+ G_STRFUNC, \
+ #expr); \
+ return ret; \
+ }; }G_STMT_END
+
+#define TREE_VIEW_INTERNAL_ASSERT_VOID(expr) G_STMT_START{ \
+ if (!(expr)) \
+ { \
+ g_log (G_LOG_DOMAIN, \
+ G_LOG_LEVEL_CRITICAL, \
+ "%s (%s): assertion `%s' failed.\n" \
+ "There is a disparity between the internal view of the GtkTreeView,\n" \
+ "and the GtkTreeModel. This generally means that the model has changed\n"\
+ "without letting the view know. Any display from now on is likely to\n" \
+ "be incorrect.\n", \
+ G_STRLOC, \
+ G_STRFUNC, \
+ #expr); \
+ return; \
+ }; }G_STMT_END
+
+#else
+
+#define TREE_VIEW_INTERNAL_ASSERT(expr, ret) G_STMT_START{ \
+ if (!(expr)) \
+ { \
+ g_log (G_LOG_DOMAIN, \
+ G_LOG_LEVEL_CRITICAL, \
+ "file %s: line %d: assertion `%s' failed.\n" \
+ "There is a disparity between the internal view of the GtkTreeView,\n" \
+ "and the GtkTreeModel. This generally means that the model has changed\n"\
+ "without letting the view know. Any display from now on is likely to\n" \
+ "be incorrect.\n", \
+ __FILE__, \
+ __LINE__, \
+ #expr); \
+ return ret; \
+ }; }G_STMT_END
+
+#define TREE_VIEW_INTERNAL_ASSERT_VOID(expr) G_STMT_START{ \
+ if (!(expr)) \
+ { \
+ g_log (G_LOG_DOMAIN, \
+ G_LOG_LEVEL_CRITICAL, \
+ "file %s: line %d: assertion '%s' failed.\n" \
+ "There is a disparity between the internal view of the GtkTreeView,\n" \
+ "and the GtkTreeModel. This generally means that the model has changed\n"\
+ "without letting the view know. Any display from now on is likely to\n" \
+ "be incorrect.\n", \
+ __FILE__, \
+ __LINE__, \
+ #expr); \
+ return; \
+ }; }G_STMT_END
+#endif
#define GTK_TREE_VIEW_PRIORITY_VALIDATE (GDK_PRIORITY_REDRAW + 5)
#define GTK_TREE_VIEW_PRIORITY_SCROLL_SYNC (GTK_TREE_VIEW_PRIORITY_VALIDATE + 2)
#define GTK_TREE_VIEW_TIME_MS_PER_IDLE 30
#define SCROLL_EDGE_SIZE 15
-#define EXPANDER_EXTRA_PADDING 4
#define GTK_TREE_VIEW_SEARCH_DIALOG_TIMEOUT 5000
#define AUTO_EXPAND_TIMEOUT 500
-/* 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(),
- * i.e. just the cells, no spacing.
- */
-
-#define BACKGROUND_HEIGHT(node) (GTK_RBNODE_GET_HEIGHT (node))
-#define CELL_HEIGHT(node, separator) ((BACKGROUND_HEIGHT (node)) - (separator))
-
/* Translate from bin_window coordinates to rbtree (tree coordinates) and
* vice versa.
*/
#define TREE_WINDOW_Y_TO_RBTREE_Y(tree_view,y) ((y) + tree_view->priv->dy)
#define RBTREE_Y_TO_TREE_WINDOW_Y(tree_view,y) ((y) - tree_view->priv->dy)
-/* This is in bin_window coordinates */
-#define BACKGROUND_FIRST_PIXEL(tree_view,tree,node) (RBTREE_Y_TO_TREE_WINDOW_Y (tree_view, _gtk_rbtree_node_find_offset ((tree), (node))))
-#define CELL_FIRST_PIXEL(tree_view,tree,node,separator) (BACKGROUND_FIRST_PIXEL (tree_view,tree,node) + separator/2)
-
-#define ROW_HEIGHT(tree_view,height) \
- ((height > 0) ? (height) : (tree_view)->priv->expander_size)
-
+typedef struct _GtkTreeViewColumnReorder GtkTreeViewColumnReorder;
+struct _GtkTreeViewColumnReorder
+{
+ gint left_align;
+ gint right_align;
+ GtkTreeViewColumn *left_column;
+ GtkTreeViewColumn *right_column;
+};
typedef struct _GtkTreeViewChild GtkTreeViewChild;
struct _GtkTreeViewChild
};
+struct _GtkTreeViewPrivate
+{
+ GtkTreeModel *model;
+
+ /* tree information */
+ GtkRBTree *tree;
+
+ /* Container info */
+ GList *children;
+ gint width;
+ gint height;
+
+ /* Adjustments */
+ GtkAdjustment *hadjustment;
+ GtkAdjustment *vadjustment;
+ gint min_display_width;
+ gint min_display_height;
+
+ /* Sub windows */
+ GdkWindow *bin_window;
+ GdkWindow *header_window;
+
+ /* Scroll position state keeping */
+ GtkTreeRowReference *top_row;
+ gint top_row_dy;
+ /* dy == y pos of top_row + top_row_dy */
+ /* we cache it for simplicity of the code */
+ gint dy;
+
+ guint presize_handler_timer;
+ guint validate_rows_timer;
+ guint scroll_sync_timer;
+
+ /* Indentation and expander layout */
+ GtkTreeViewColumn *expander_column;
+
+ gint level_indentation;
+
+ /* Key navigation (focus), selection */
+ gint cursor_offset;
+
+ GtkTreeRowReference *anchor;
+ GtkRBNode *cursor_node;
+ GtkRBTree *cursor_tree;
+
+ GtkTreeViewColumn *focus_column;
+
+ /* Current pressed node, previously pressed, prelight */
+ GtkRBNode *button_pressed_node;
+ GtkRBTree *button_pressed_tree;
+
+ gint pressed_button;
+ gint press_start_x;
+ gint press_start_y;
+
+ gint event_last_x;
+ gint event_last_y;
+
+ guint last_button_time;
+ gint last_button_x;
+ gint last_button_y;
+
+ GtkRBNode *prelight_node;
+ GtkRBTree *prelight_tree;
+
+ /* Cell Editing */
+ GtkTreeViewColumn *edited_column;
+
+ /* The node that's currently being collapsed or expanded */
+ GtkRBNode *expanded_collapsed_node;
+ GtkRBTree *expanded_collapsed_tree;
+ guint expand_collapse_timeout;
+
+ /* Auto expand/collapse timeout in hover mode */
+ guint auto_expand_timeout;
+
+ /* Selection information */
+ GtkTreeSelection *selection;
+
+ /* Header information */
+ gint n_columns;
+ GList *columns;
+ gint header_height;
+
+ GtkTreeViewColumnDropFunc column_drop_func;
+ gpointer column_drop_func_data;
+ GDestroyNotify column_drop_func_data_destroy;
+ GList *column_drag_info;
+ GtkTreeViewColumnReorder *cur_reorder;
+
+ gint prev_width_before_expander;
+
+ /* Interactive Header reordering */
+ GdkWindow *drag_window;
+ GdkWindow *drag_highlight_window;
+ GtkTreeViewColumn *drag_column;
+ gint drag_column_x;
+
+ /* Interactive Header Resizing */
+ gint drag_pos;
+ gint x_drag;
+
+ /* Column width allocation */
+ gint minimum_width;
+ gint natural_width;
+ gint n_expand_columns;
+
+ /* ATK Hack */
+ GtkTreeDestroyCountFunc destroy_count_func;
+ gpointer destroy_count_data;
+ GDestroyNotify destroy_count_destroy;
+
+ /* Scroll timeout (e.g. during dnd, rubber banding) */
+ guint scroll_timeout;
+
+ /* Row drag-and-drop */
+ GtkTreeRowReference *drag_dest_row;
+ GtkTreeViewDropPosition drag_dest_pos;
+ guint open_dest_timeout;
+
+ /* Rubber banding */
+ gint rubber_band_status;
+ gint rubber_band_x;
+ gint rubber_band_y;
+ gint rubber_band_extend;
+ gint rubber_band_modify;
+
+ GtkRBNode *rubber_band_start_node;
+ GtkRBTree *rubber_band_start_tree;
+
+ GtkRBNode *rubber_band_end_node;
+ GtkRBTree *rubber_band_end_tree;
+
+ /* fixed height */
+ gint fixed_height;
+
+ /* Scroll-to functionality when unrealized */
+ GtkTreeRowReference *scroll_to_path;
+ GtkTreeViewColumn *scroll_to_column;
+ gfloat scroll_to_row_align;
+ gfloat scroll_to_col_align;
+
+ /* Interactive search */
+ gint selected_iter;
+ gint search_column;
+ GtkTreeViewSearchPositionFunc search_position_func;
+ GtkTreeViewSearchEqualFunc search_equal_func;
+ gpointer search_user_data;
+ GDestroyNotify search_destroy;
+ gpointer search_position_user_data;
+ GDestroyNotify search_position_destroy;
+ GtkWidget *search_window;
+ GtkWidget *search_entry;
+ gulong search_entry_changed_id;
+ guint typeselect_flush_timeout;
+
+ /* Grid and tree lines */
+ GtkTreeViewGridLines grid_lines;
+ double grid_line_dashes[2];
+ int grid_line_width;
+
+ gboolean tree_lines_enabled;
+ double tree_line_dashes[2];
+ int tree_line_width;
+
+ /* Row separators */
+ GtkTreeViewRowSeparatorFunc row_separator_func;
+ gpointer row_separator_data;
+ GDestroyNotify row_separator_destroy;
+
+ /* Tooltip support */
+ gint tooltip_column;
+
+ /* Here comes the bitfield */
+ guint scroll_to_use_align : 1;
+
+ guint fixed_height_mode : 1;
+ guint fixed_height_check : 1;
+
+ guint activate_on_single_click : 1;
+ guint reorderable : 1;
+ guint header_has_focus : 1;
+ guint drag_column_window_state : 3;
+ /* hint to display rows in alternating colors */
+ guint has_rules : 1;
+ guint mark_rows_col_dirty : 1;
+
+ /* for DnD */
+ guint empty_view_drop : 1;
+
+ guint modify_selection_pressed : 1;
+ guint extend_selection_pressed : 1;
+
+ guint init_hadjust_value : 1;
+
+ guint in_top_row_to_dy : 1;
+
+ /* interactive search */
+ guint enable_search : 1;
+ guint disable_popdown : 1;
+ guint search_custom_entry_set : 1;
+
+ guint hover_selection : 1;
+ guint hover_expand : 1;
+ guint imcontext_changed : 1;
+
+ guint rubber_banding_enable : 1;
+
+ guint in_grab : 1;
+
+ /* Whether our key press handler is to avoid sending an unhandled binding to the search entry */
+ guint search_entry_avoid_unhandled_binding : 1;
+
+ /* GtkScrollablePolicy needs to be checked when
+ * driving the scrollable adjustment values */
+ guint hscroll_policy : 1;
+ guint vscroll_policy : 1;
+
+ /* GtkTreeView flags */
+ guint is_list : 1;
+ guint show_expanders : 1;
+ guint in_column_resize : 1;
+ guint arrow_prelit : 1;
+ guint headers_visible : 1;
+ guint draw_keyfocus : 1;
+ guint model_setup : 1;
+ guint in_column_drag : 1;
+};
+
+
/* Signals */
enum
{
PROP_RUBBER_BANDING,
PROP_ENABLE_GRID_LINES,
PROP_ENABLE_TREE_LINES,
- PROP_TOOLTIP_COLUMN
+ PROP_TOOLTIP_COLUMN,
+ PROP_ACTIVATE_ON_SINGLE_CLICK
};
/* object signals */
static void gtk_tree_view_get_preferred_height (GtkWidget *widget,
gint *minimum,
gint *natural);
-static void gtk_tree_view_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
static void gtk_tree_view_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static gboolean gtk_tree_view_draw (GtkWidget *widget,
GdkEventConfigure *event);
#endif
+static GtkWidgetPath * gtk_tree_view_get_path_for_child (GtkContainer *container,
+ GtkWidget *child);
+
static void gtk_tree_view_set_focus_child (GtkContainer *container,
GtkWidget *child);
static gint gtk_tree_view_focus_out (GtkWidget *widget,
static gint gtk_tree_view_focus (GtkWidget *widget,
GtkDirectionType direction);
static void gtk_tree_view_grab_focus (GtkWidget *widget);
-static void gtk_tree_view_style_set (GtkWidget *widget,
- GtkStyle *previous_style);
+static void gtk_tree_view_style_updated (GtkWidget *widget);
static void gtk_tree_view_grab_notify (GtkWidget *widget,
gboolean was_grabbed);
-static void gtk_tree_view_state_changed (GtkWidget *widget,
- GtkStateType previous_state);
+static void gtk_tree_view_state_flags_changed (GtkWidget *widget,
+ GtkStateFlags previous_state);
/* container signals */
static void gtk_tree_view_remove (GtkContainer *container,
guint time);
/* tree_model signals */
-static void gtk_tree_view_set_hadjustment (GtkTreeView *tree_view,
- GtkAdjustment *adjustment);
-static void gtk_tree_view_set_vadjustment (GtkTreeView *tree_view,
- GtkAdjustment *adjustment);
static gboolean gtk_tree_view_real_move_cursor (GtkTreeView *tree_view,
GtkMovementStep step,
gint count);
static void validate_visible_area (GtkTreeView *tree_view);
static gboolean validate_rows_handler (GtkTreeView *tree_view);
static gboolean do_validate_rows (GtkTreeView *tree_view,
- gboolean size_request);
+ gboolean queue_resize);
static gboolean validate_rows (GtkTreeView *tree_view);
static gboolean presize_handler_callback (gpointer data);
static void install_presize_handler (GtkTreeView *tree_view);
/* Internal functions */
static gboolean gtk_tree_view_is_expander_column (GtkTreeView *tree_view,
GtkTreeViewColumn *column);
+static inline gboolean gtk_tree_view_draw_expanders (GtkTreeView *tree_view);
static void gtk_tree_view_add_move_binding (GtkBindingSet *binding_set,
guint keyval,
guint modmask,
static void gtk_tree_view_draw_arrow (GtkTreeView *tree_view,
cairo_t *cr,
GtkRBTree *tree,
- GtkRBNode *node,
- gint x,
- gint y);
+ GtkRBNode *node);
static void gtk_tree_view_get_arrow_xrange (GtkTreeView *tree_view,
GtkRBTree *tree,
gint *x1,
gint *x2);
-static gint gtk_tree_view_new_column_width (GtkTreeView *tree_view,
- gint i,
- gint *x);
static void gtk_tree_view_adjustment_changed (GtkAdjustment *adjustment,
GtkTreeView *tree_view);
static void gtk_tree_view_build_tree (GtkTreeView *tree_view,
gboolean animate);
static void gtk_tree_view_real_set_cursor (GtkTreeView *tree_view,
GtkTreePath *path,
- gboolean clear_and_select,
- gboolean clamp_node);
-static gboolean gtk_tree_view_has_special_cell (GtkTreeView *tree_view);
+ SetCursorFlags flags);
+static gboolean gtk_tree_view_has_can_focus_cell (GtkTreeView *tree_view);
static void column_sizing_notify (GObject *object,
GParamSpec *pspec,
gpointer data);
-static gboolean expand_collapse_timeout (gpointer data);
-static void add_expand_collapse_timeout (GtkTreeView *tree_view,
- GtkRBTree *tree,
- GtkRBNode *node,
- gboolean expand);
-static void remove_expand_collapse_timeout (GtkTreeView *tree_view);
-static void cancel_arrow_animation (GtkTreeView *tree_view);
-static gboolean do_expand_collapse (GtkTreeView *tree_view);
static void gtk_tree_view_stop_rubber_band (GtkTreeView *tree_view);
static void update_prelight (GtkTreeView *tree_view,
int x,
int y);
+static inline gint gtk_tree_view_get_effective_header_height (GtkTreeView *tree_view);
+
+static inline gint gtk_tree_view_get_cell_area_y_offset (GtkTreeView *tree_view,
+ GtkRBTree *tree,
+ GtkRBNode *node,
+ gint vertical_separator);
+static inline gint gtk_tree_view_get_cell_area_height (GtkTreeView *tree_view,
+ GtkRBNode *node,
+ gint vertical_separator);
+
+static inline gint gtk_tree_view_get_row_y_offset (GtkTreeView *tree_view,
+ GtkRBTree *tree,
+ GtkRBNode *node);
+static inline gint gtk_tree_view_get_row_height (GtkTreeView *tree_view,
+ GtkRBNode *node);
+
/* interactive search */
static void gtk_tree_view_ensure_interactive_directory (GtkTreeView *tree_view);
static void gtk_tree_view_search_dialog_hide (GtkWidget *search_dialog,
gint width,
gint height);
static gboolean gtk_tree_view_start_editing (GtkTreeView *tree_view,
- GtkTreePath *cursor_path);
-static void gtk_tree_view_real_start_editing (GtkTreeView *tree_view,
- GtkTreeViewColumn *column,
- GtkTreePath *path,
- GtkCellEditable *cell_editable,
- GdkRectangle *cell_area,
- GdkEvent *event,
- guint flags);
+ GtkTreePath *cursor_path,
+ gboolean edit_only);
static void gtk_tree_view_stop_editing (GtkTreeView *tree_view,
gboolean cancel_editing);
static gboolean gtk_tree_view_real_start_interactive_search (GtkTreeView *tree_view,
const gchar *childname);
static void gtk_tree_view_buildable_init (GtkBuildableIface *iface);
+static GtkAdjustment *gtk_tree_view_do_get_hadjustment (GtkTreeView *tree_view);
+static void gtk_tree_view_do_set_hadjustment (GtkTreeView *tree_view,
+ GtkAdjustment *adjustment);
+static GtkAdjustment *gtk_tree_view_do_get_vadjustment (GtkTreeView *tree_view);
+static void gtk_tree_view_do_set_vadjustment (GtkTreeView *tree_view,
+ GtkAdjustment *adjustment);
static gboolean scroll_row_timeout (gpointer data);
static void add_scroll_timeout (GtkTreeView *tree_view);
widget_class->drag_data_received = gtk_tree_view_drag_data_received;
widget_class->focus = gtk_tree_view_focus;
widget_class->grab_focus = gtk_tree_view_grab_focus;
- widget_class->style_set = gtk_tree_view_style_set;
+ widget_class->style_updated = gtk_tree_view_style_updated;
widget_class->grab_notify = gtk_tree_view_grab_notify;
- widget_class->state_changed = gtk_tree_view_state_changed;
+ widget_class->state_flags_changed = gtk_tree_view_state_flags_changed;
/* GtkContainer signals */
container_class->remove = gtk_tree_view_remove;
container_class->forall = gtk_tree_view_forall;
container_class->set_focus_child = gtk_tree_view_set_focus_child;
+ container_class->get_path_for_child = gtk_tree_view_get_path_for_child;
class->move_cursor = gtk_tree_view_real_move_cursor;
class->select_all = gtk_tree_view_real_select_all;
-1,
GTK_PARAM_READWRITE));
+ /**
+ * GtkTreeView:activate-on-single-click:
+ *
+ * The activate-on-single-click property specifies whether the "row-activated" signal
+ * will be emitted after a single click.
+ *
+ * Since: 3.8
+ */
+ g_object_class_install_property (o_class,
+ PROP_ACTIVATE_ON_SINGLE_CLICK,
+ g_param_spec_boolean ("activate-on-single-click",
+ P_("Activate on Single Click"),
+ P_("Activate row on a single click"),
+ FALSE,
+ GTK_PARAM_READWRITE));
+
/* Style properties */
-#define _TREE_VIEW_EXPANDER_SIZE 12
+#define _TREE_VIEW_EXPANDER_SIZE 14
#define _TREE_VIEW_VERTICAL_SEPARATOR 2
#define _TREE_VIEW_HORIZONTAL_SEPARATOR 2
* @column: the #GtkTreeViewColumn in which the activation occurred
*
* The "row-activated" signal is emitted when the method
- * gtk_tree_view_row_activated() is called or the user double clicks
- * a treeview row. It is also emitted when a non-editable row is
- * selected and one of the keys: Space, Shift+Space, Return or
- * Enter is pressed.
+ * gtk_tree_view_row_activated() is called, when the user double
+ * clicks a treeview row with the "activate-on-single-click"
+ * property set to %FALSE, or when the user single clicks a row when
+ * the "activate-on-single-click" property set to %TRUE. It is also
+ * emitted when a non-editable row is selected and one of the keys:
+ * Space, Shift+Space, Return or Enter is pressed.
*
* For selection handling refer to the <link linkend="TreeWidget">tree
* widget conceptual overview</link> as well as #GtkTreeSelection.
gtk_binding_entry_add_signal (binding_set, GDK_KEY_F, GDK_CONTROL_MASK, "start-interactive-search", 0);
g_type_class_add_private (o_class, sizeof (GtkTreeViewPrivate));
+
+ gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_TREE_VIEW_ACCESSIBLE);
}
static void
gtk_widget_set_can_focus (GTK_WIDGET (tree_view), TRUE);
gtk_widget_set_redraw_on_allocate (GTK_WIDGET (tree_view), FALSE);
- tree_view->priv->flags = GTK_TREE_VIEW_SHOW_EXPANDERS
- | GTK_TREE_VIEW_DRAW_KEYFOCUS
- | GTK_TREE_VIEW_HEADERS_VISIBLE;
+ tree_view->priv->show_expanders = TRUE;
+ tree_view->priv->draw_keyfocus = TRUE;
+ tree_view->priv->headers_visible = TRUE;
+ tree_view->priv->activate_on_single_click = FALSE;
/* We need some padding */
tree_view->priv->dy = 0;
tree_view->priv->header_height = 1;
tree_view->priv->x_drag = 0;
tree_view->priv->drag_pos = -1;
+ tree_view->priv->minimum_width = 0;
+ tree_view->priv->natural_width = 0;
+ tree_view->priv->n_expand_columns = 0;
tree_view->priv->header_has_focus = FALSE;
tree_view->priv->pressed_button = -1;
tree_view->priv->press_start_x = -1;
tree_view->priv->tooltip_column = -1;
- tree_view->priv->post_validation_flag = FALSE;
-
tree_view->priv->last_button_x = -1;
tree_view->priv->last_button_y = -1;
tree_view->priv->event_last_x = -10000;
tree_view->priv->event_last_y = -10000;
- gtk_tree_view_set_vadjustment (tree_view, NULL);
- gtk_tree_view_set_hadjustment (tree_view, NULL);
+ gtk_tree_view_do_set_vadjustment (tree_view, NULL);
+ gtk_tree_view_do_set_hadjustment (tree_view, NULL);
+
+ gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (tree_view)),
+ GTK_STYLE_CLASS_VIEW);
}
\f
gtk_tree_view_set_model (tree_view, g_value_get_object (value));
break;
case PROP_HADJUSTMENT:
- gtk_tree_view_set_hadjustment (tree_view, g_value_get_object (value));
+ gtk_tree_view_do_set_hadjustment (tree_view, g_value_get_object (value));
break;
case PROP_VADJUSTMENT:
- gtk_tree_view_set_vadjustment (tree_view, g_value_get_object (value));
+ gtk_tree_view_do_set_vadjustment (tree_view, g_value_get_object (value));
break;
case PROP_HSCROLL_POLICY:
tree_view->priv->hscroll_policy = g_value_get_enum (value);
case PROP_TOOLTIP_COLUMN:
gtk_tree_view_set_tooltip_column (tree_view, g_value_get_int (value));
break;
+ case PROP_ACTIVATE_ON_SINGLE_CLICK:
+ gtk_tree_view_set_activate_on_single_click (tree_view, g_value_get_boolean (value));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
g_value_set_boolean (value, tree_view->priv->hover_expand);
break;
case PROP_SHOW_EXPANDERS:
- g_value_set_boolean (value, GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_SHOW_EXPANDERS));
+ g_value_set_boolean (value, tree_view->priv->show_expanders);
break;
case PROP_LEVEL_INDENTATION:
g_value_set_int (value, tree_view->priv->level_indentation);
case PROP_TOOLTIP_COLUMN:
g_value_set_int (value, tree_view->priv->tooltip_column);
break;
+ case PROP_ACTIVATE_ON_SINGLE_CLICK:
+ g_value_set_boolean (value, tree_view->priv->activate_on_single_click);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
tree_view->priv->destroy_count_data = NULL;
}
- gtk_tree_row_reference_free (tree_view->priv->cursor);
- tree_view->priv->cursor = NULL;
-
gtk_tree_row_reference_free (tree_view->priv->anchor);
tree_view->priv->anchor = NULL;
g_return_if_fail (gtk_widget_get_mapped (GTK_WIDGET (tree_view)));
- if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE))
+ if (tree_view->priv->headers_visible)
{
GtkTreeViewColumn *column;
+ GtkWidget *button;
+ GdkWindow *window;
for (list = tree_view->priv->columns; list; list = list->next)
{
column = list->data;
- if (gtk_widget_get_visible (column->button) &&
- !gtk_widget_get_mapped (column->button))
- gtk_widget_map (column->button);
+ button = gtk_tree_view_column_get_button (column);
+
+ if (gtk_tree_view_column_get_visible (column) && button)
+ gtk_widget_show_now (button);
+
+ if (gtk_widget_get_visible (button) &&
+ !gtk_widget_get_mapped (button))
+ gtk_widget_map (button);
}
for (list = tree_view->priv->columns; list; list = list->next)
{
column = list->data;
if (gtk_tree_view_column_get_visible (column) == FALSE)
continue;
+
+ window = _gtk_tree_view_column_get_window (column);
if (gtk_tree_view_column_get_resizable (column))
{
- gdk_window_raise (column->window);
- gdk_window_show (column->window);
+ gdk_window_raise (window);
+ gdk_window_show (window);
}
else
- gdk_window_hide (column->window);
+ gdk_window_hide (window);
}
gdk_window_show (tree_view->priv->header_window);
}
gdk_window_show (gtk_widget_get_window (widget));
}
+static void
+gtk_tree_view_ensure_background (GtkTreeView *tree_view)
+{
+ GtkStyleContext *context;
+
+ context = gtk_widget_get_style_context (GTK_WIDGET (tree_view));
+
+ gtk_style_context_set_background (context, tree_view->priv->bin_window);
+ gtk_style_context_set_background (context, gtk_widget_get_window (GTK_WIDGET (tree_view)));
+ gtk_style_context_set_background (context, tree_view->priv->header_window);
+}
+
static void
gtk_tree_view_realize (GtkWidget *widget)
{
GtkAllocation allocation;
- GtkStyle *style;
GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
GdkWindow *window;
GdkWindowAttr attributes;
window = gdk_window_new (gtk_widget_get_parent_window (widget),
&attributes, attributes_mask);
gtk_widget_set_window (widget, window);
- gdk_window_set_user_data (window, widget);
+ gtk_widget_register_window (widget, window);
gtk_widget_get_allocation (widget, &allocation);
/* Make the window for the tree */
attributes.x = 0;
- attributes.y = TREE_VIEW_HEADER_HEIGHT (tree_view);
+ attributes.y = gtk_tree_view_get_effective_header_height (tree_view);
attributes.width = MAX (tree_view->priv->width, allocation.width);
attributes.height = allocation.height;
attributes.event_mask = (GDK_EXPOSURE_MASK |
GDK_SCROLL_MASK |
+ GDK_SMOOTH_SCROLL_MASK |
GDK_POINTER_MOTION_MASK |
GDK_ENTER_NOTIFY_MASK |
GDK_LEAVE_NOTIFY_MASK |
tree_view->priv->bin_window = gdk_window_new (window,
&attributes, attributes_mask);
- gdk_window_set_user_data (tree_view->priv->bin_window, widget);
+ gtk_widget_register_window (widget, tree_view->priv->bin_window);
gtk_widget_get_allocation (widget, &allocation);
tree_view->priv->header_window = gdk_window_new (window,
&attributes, attributes_mask);
- gdk_window_set_user_data (tree_view->priv->header_window, widget);
+ gtk_widget_register_window (widget, tree_view->priv->header_window);
- /* Add them all up. */
- gtk_widget_style_attach (widget);
- style = gtk_widget_get_style (widget);
- gdk_window_set_background (tree_view->priv->bin_window,
- &style->base[gtk_widget_get_state (widget)]);
- gtk_style_set_background (style, tree_view->priv->header_window, GTK_STATE_NORMAL);
+ gtk_tree_view_ensure_background (tree_view);
tmp_list = tree_view->priv->children;
while (tmp_list)
priv->open_dest_timeout = 0;
}
- remove_expand_collapse_timeout (tree_view);
-
if (priv->presize_handler_timer != 0)
{
g_source_remove (priv->presize_handler_timer);
for (list = priv->columns; list; list = list->next)
_gtk_tree_view_column_unrealize_button (GTK_TREE_VIEW_COLUMN (list->data));
- gdk_window_set_user_data (priv->bin_window, NULL);
+ gtk_widget_unregister_window (widget, priv->bin_window);
gdk_window_destroy (priv->bin_window);
priv->bin_window = NULL;
- gdk_window_set_user_data (priv->header_window, NULL);
+ gtk_widget_unregister_window (widget, priv->header_window);
gdk_window_destroy (priv->header_window);
priv->header_window = NULL;
if (priv->drag_window)
{
- gdk_window_set_user_data (priv->drag_window, NULL);
+ gtk_widget_unregister_window (widget, priv->drag_window);
gdk_window_destroy (priv->drag_window);
priv->drag_window = NULL;
}
if (priv->drag_highlight_window)
{
- gdk_window_set_user_data (priv->drag_highlight_window, NULL);
+ gtk_widget_unregister_window (widget, priv->drag_highlight_window);
gdk_window_destroy (priv->drag_highlight_window);
priv->drag_highlight_window = NULL;
}
GTK_WIDGET_CLASS (gtk_tree_view_parent_class)->unrealize (widget);
}
-/* GtkWidget::size_request helper */
+/* GtkWidget::get_preferred_height helper */
static void
-gtk_tree_view_size_request_columns (GtkTreeView *tree_view)
+gtk_tree_view_update_height (GtkTreeView *tree_view)
{
GList *list;
tree_view->priv->header_height = 0;
- if (tree_view->priv->model)
+ for (list = tree_view->priv->columns; list; list = list->next)
{
- for (list = tree_view->priv->columns; list; list = list->next)
- {
- GtkRequisition requisition;
- GtkTreeViewColumn *column = list->data;
-
- if (column->button == NULL)
- continue;
+ GtkRequisition requisition;
+ GtkTreeViewColumn *column = list->data;
+ GtkWidget *button = gtk_tree_view_column_get_button (column);
- column = list->data;
+ if (button == NULL)
+ continue;
- gtk_widget_get_preferred_size (column->button, &requisition, NULL);
- column->button_request = requisition.width;
- tree_view->priv->header_height = MAX (tree_view->priv->header_height, requisition.height);
- }
+ gtk_widget_get_preferred_size (button, &requisition, NULL);
+ tree_view->priv->header_height = MAX (tree_view->priv->header_height, requisition.height);
}
-}
+ if (tree_view->priv->tree == NULL)
+ tree_view->priv->height = 0;
+ else
+ tree_view->priv->height = tree_view->priv->tree->root->offset;
+}
-/* Called only by ::size_request */
static void
-gtk_tree_view_update_size (GtkTreeView *tree_view)
+gtk_tree_view_get_preferred_width (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
{
+ GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
GList *list;
GtkTreeViewColumn *column;
- gint i;
-
- if (tree_view->priv->model == NULL)
- {
- tree_view->priv->width = 0;
- tree_view->priv->prev_width = 0;
- tree_view->priv->height = 0;
- return;
- }
+ gint column_minimum, column_natural;
- tree_view->priv->prev_width = tree_view->priv->width;
- tree_view->priv->width = 0;
+ /* we validate some rows initially just to make sure we have some size.
+ * In practice, with a lot of static lists, this should get a good width.
+ */
+ do_validate_rows (tree_view, FALSE);
+
+ tree_view->priv->minimum_width = 0;
+ tree_view->priv->natural_width = 0;
+ tree_view->priv->n_expand_columns = 0;
/* keep this in sync with size_allocate below */
- for (list = tree_view->priv->columns, i = 0; list; list = list->next, i++)
+ for (list = tree_view->priv->columns; list; list = list->next)
{
- gint max_width, min_width;
- gint real_requested_width = 0;
-
column = list->data;
- if (!gtk_tree_view_column_get_visible (column))
+ if (!gtk_tree_view_column_get_visible (column) || column == tree_view->priv->drag_column)
continue;
- if (column->use_resized_width)
- {
- real_requested_width = column->resized_width;
- }
- else if (gtk_tree_view_column_get_sizing (column) == GTK_TREE_VIEW_COLUMN_FIXED)
- {
- real_requested_width = gtk_tree_view_column_get_fixed_width (column);
- }
- else if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE))
- {
- real_requested_width = MAX (column->requested_width, column->button_request);
- }
- else
- {
- real_requested_width = column->requested_width;
- }
-
- min_width = gtk_tree_view_column_get_min_width (column);
- if (min_width != -1)
- real_requested_width = MAX (real_requested_width, min_width);
-
- max_width = gtk_tree_view_column_get_max_width (column);
- if (max_width != -1)
- real_requested_width = MIN (real_requested_width, max_width);
+ _gtk_tree_view_column_request_width (column, &column_minimum, &column_natural);
+ tree_view->priv->minimum_width += column_minimum;
+ tree_view->priv->natural_width += column_natural;
- tree_view->priv->width += real_requested_width;
+ if (gtk_tree_view_column_get_expand (column))
+ tree_view->priv->n_expand_columns++;
}
- if (tree_view->priv->tree == NULL)
- tree_view->priv->height = 0;
- else
- tree_view->priv->height = tree_view->priv->tree->root->offset;
+ if (minimum != NULL)
+ *minimum = tree_view->priv->minimum_width;
+ if (natural != NULL)
+ *natural = tree_view->priv->natural_width;
}
static void
-gtk_tree_view_size_request (GtkWidget *widget,
- GtkRequisition *requisition)
+gtk_tree_view_get_preferred_height (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
{
GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
- GList *tmp_list;
+ gint height;
- /* we validate some rows initially just to make sure we have some size.
- * In practice, with a lot of static lists, this should get a good width.
- */
- do_validate_rows (tree_view, FALSE);
- gtk_tree_view_size_request_columns (tree_view);
- gtk_tree_view_update_size (GTK_TREE_VIEW (widget));
+ gtk_tree_view_update_height (tree_view);
- requisition->width = tree_view->priv->width;
- requisition->height = tree_view->priv->height + TREE_VIEW_HEADER_HEIGHT (tree_view);
+ height = tree_view->priv->height + gtk_tree_view_get_effective_header_height (tree_view);
- tmp_list = tree_view->priv->children;
+ if (minimum != NULL)
+ *minimum = height;
+ if (natural != NULL)
+ *natural = height;
}
static void
-gtk_tree_view_get_preferred_width (GtkWidget *widget,
- gint *minimum,
- gint *natural)
+gtk_tree_view_modify_column_width (GtkTreeView *tree_view,
+ GtkTreeViewColumn *column,
+ gint width)
{
- GtkRequisition requisition;
+ gboolean is_expand;
+ gint n_expand_others;
+ gint minimum, natural, natural_others;
+ gint expand;
- gtk_tree_view_size_request (widget, &requisition);
+ is_expand = gtk_tree_view_column_get_expand (column);
+ n_expand_others = tree_view->priv->n_expand_columns - (is_expand ? 1 : 0);
- *minimum = *natural = requisition.width;
-}
+ _gtk_tree_view_column_request_width (column, &minimum, &natural);
+ natural_others = tree_view->priv->natural_width - natural;
-static void
-gtk_tree_view_get_preferred_height (GtkWidget *widget,
- gint *minimum,
- gint *natural)
-{
- GtkRequisition requisition;
+ if (natural_others + width < tree_view->priv->width)
+ {
+ /* There is extra space that needs to be taken up by letting some other
+ * column(s) expand: by default, the last column. */
+ if (!n_expand_others)
+ {
+ GList *last = g_list_last (tree_view->priv->columns);
+ while (!gtk_tree_view_column_get_visible (last->data))
+ last = last->prev;
+
+ if (column == last->data)
+ return;
+
+ gtk_tree_view_column_set_expand (last->data, TRUE);
+ n_expand_others++;
+ }
- gtk_tree_view_size_request (widget, &requisition);
+ /* Now try to make this column expandable also. Solving the following
+ * equations reveals what the natural width should be to achieve the
+ * desired width after expanding:
+ *
+ * 1. natural + expand = desired_width
+ * 2. natural + natural_others + expand * (n_expand_others + 1) = total_width
+ *
+ * Solution:
+ * expand = (total_width - natural_others - desired_width) / n_expand_others
+ *
+ * It is possible for the solved natural width to be less than the
+ * minimum; in that case, we cannot let the column expand.
+ */
+ expand = (tree_view->priv->width - natural_others - width) / n_expand_others;
+
+ if (minimum + expand > width)
+ {
+ if (is_expand)
+ gtk_tree_view_column_set_expand (column, FALSE);
+ }
+ else
+ {
+ if (!is_expand)
+ gtk_tree_view_column_set_expand (column, TRUE);
+
+ width -= expand;
+ }
+ }
- *minimum = *natural = requisition.height;
+ gtk_tree_view_column_set_fixed_width (column, width);
}
static int
return width;
}
-static void
-invalidate_column (GtkTreeView *tree_view,
- GtkTreeViewColumn *column)
-{
- gint column_offset = 0;
- GList *list;
- GtkWidget *widget = GTK_WIDGET (tree_view);
- gboolean rtl;
-
- if (!gtk_widget_get_realized (widget))
- return;
-
- rtl = (gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_RTL);
- for (list = (rtl ? g_list_last (tree_view->priv->columns) : g_list_first (tree_view->priv->columns));
- list;
- list = (rtl ? list->prev : list->next))
- {
- GtkTreeViewColumn *tmpcolumn = list->data;
- if (tmpcolumn == column)
- {
- GtkAllocation allocation;
- GdkRectangle invalid_rect;
-
- gtk_widget_get_allocation (widget, &allocation);
- invalid_rect.x = column_offset;
- invalid_rect.y = 0;
- invalid_rect.width = gtk_tree_view_column_get_width (column);
- invalid_rect.height = allocation.height;
-
- gdk_window_invalidate_rect (gtk_widget_get_window (widget), &invalid_rect, TRUE);
- break;
- }
-
- column_offset += gtk_tree_view_column_get_width (tmpcolumn);
- }
-}
-
-static void
-invalidate_last_column (GtkTreeView *tree_view)
-{
- GList *last_column;
- gboolean rtl;
-
- rtl = (gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_RTL);
-
- for (last_column = (rtl ? g_list_first (tree_view->priv->columns) : g_list_last (tree_view->priv->columns));
- last_column;
- last_column = (rtl ? last_column->next : last_column->prev))
- {
- if (gtk_tree_view_column_get_visible (GTK_TREE_VIEW_COLUMN (last_column->data)))
- {
- invalidate_column (tree_view, last_column->data);
- return;
- }
- }
-}
-
-static gint
-gtk_tree_view_get_real_requested_width_from_column (GtkTreeView *tree_view,
- GtkTreeViewColumn *column)
-{
- gint max_width, min_width;
- gint real_requested_width;
-
- if (column->use_resized_width)
- {
- real_requested_width = column->resized_width;
- }
- else if (gtk_tree_view_column_get_sizing (column) == GTK_TREE_VIEW_COLUMN_FIXED)
- {
- real_requested_width = gtk_tree_view_column_get_fixed_width (column);
- }
- else if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE))
- {
- real_requested_width = MAX (column->requested_width, column->button_request);
- }
- else
- {
- real_requested_width = column->requested_width;
- if (real_requested_width < 0)
- real_requested_width = 0;
- }
-
- min_width = gtk_tree_view_column_get_min_width (column);
- if (min_width != -1)
- real_requested_width = MAX (real_requested_width, min_width);
-
- max_width = gtk_tree_view_column_get_max_width (column);
- if (max_width != -1)
- real_requested_width = MIN (real_requested_width, max_width);
-
- return real_requested_width;
-}
-
/* GtkWidget::size_allocate helper */
static void
gtk_tree_view_size_allocate_columns (GtkWidget *widget,
GtkTreeView *tree_view;
GList *list, *first_column, *last_column;
GtkTreeViewColumn *column;
- GtkAllocation allocation;
GtkAllocation widget_allocation;
- gint width = 0;
- gint extra, extra_per_column, extra_for_last;
- gint full_requested_width = 0;
- gint number_of_expand_columns = 0;
- gboolean column_changed = FALSE;
+ gint minimum_width, natural_width, n_expand_columns, width;
+ gint column_minimum, column_natural, column_width;
gboolean rtl;
- gboolean update_expand;
tree_view = GTK_TREE_VIEW (widget);
first_column = first_column->next)
;
- allocation.y = 0;
- allocation.height = tree_view->priv->header_height;
-
rtl = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);
- /* find out how many extra space and expandable columns we have */
- for (list = tree_view->priv->columns; list != last_column->next; list = list->next)
- {
- column = (GtkTreeViewColumn *)list->data;
-
- if (!gtk_tree_view_column_get_visible (column))
- continue;
-
- full_requested_width += gtk_tree_view_get_real_requested_width_from_column (tree_view, column);
-
- if (gtk_tree_view_column_get_expand (column))
- number_of_expand_columns++;
- }
-
- /* Only update the expand value if the width of the widget has changed,
- * or the number of expand columns has changed, or if there are no expand
- * columns, or if we didn't have an size-allocation yet after the
- * last validated node.
- */
- update_expand = (width_changed && *width_changed == TRUE)
- || number_of_expand_columns != tree_view->priv->last_number_of_expand_columns
- || number_of_expand_columns == 0
- || tree_view->priv->post_validation_flag == TRUE;
-
- tree_view->priv->post_validation_flag = FALSE;
-
gtk_widget_get_allocation (widget, &widget_allocation);
- if (!update_expand)
- {
- extra = tree_view->priv->last_extra_space;
- extra_for_last = MAX (widget_allocation.width - full_requested_width - extra, 0);
- }
- else
- {
- extra = MAX (widget_allocation.width - full_requested_width, 0);
- extra_for_last = 0;
- tree_view->priv->last_extra_space = extra;
- }
+ minimum_width = tree_view->priv->minimum_width;
+ natural_width = tree_view->priv->natural_width;
+ n_expand_columns = tree_view->priv->n_expand_columns;
- if (number_of_expand_columns > 0)
- extra_per_column = extra/number_of_expand_columns;
- else
- extra_per_column = 0;
+ width = MAX (widget_allocation.width, minimum_width);
- if (update_expand)
+ /* We change the width here. The user might have been resizing columns,
+ * which changes the total width of the tree view. This is of
+ * importance for getting the horizontal scroll bar right.
+ */
+ if (tree_view->priv->width != width)
{
- tree_view->priv->last_extra_space_per_column = extra_per_column;
- tree_view->priv->last_number_of_expand_columns = number_of_expand_columns;
+ tree_view->priv->width = width;
+ if (width_changed)
+ *width_changed = TRUE;
}
- for (list = (rtl ? last_column : first_column);
- list != (rtl ? first_column->prev : last_column->next);
- list = (rtl ? list->prev : list->next))
+ /* iterate through columns in reverse order */
+ for (list = (rtl ? first_column : last_column);
+ list != (rtl ? last_column->next : first_column->prev);
+ list = (rtl ? list->next : list->prev))
{
- gint real_requested_width = 0;
- gint old_width, column_width;
-
column = list->data;
- old_width = gtk_tree_view_column_get_width (column);
- if (!gtk_tree_view_column_get_visible (column))
+ if (!gtk_tree_view_column_get_visible (column) || column == tree_view->priv->drag_column)
continue;
- /* We need to handle the dragged button specially.
- */
- if (column == tree_view->priv->drag_column)
- {
- GtkAllocation drag_allocation;
-
- drag_allocation.x = 0;
- drag_allocation.y = 0;
- drag_allocation.width = gdk_window_get_width (tree_view->priv->drag_window);
- drag_allocation.height = gdk_window_get_height (tree_view->priv->drag_window);
- gtk_widget_size_allocate (tree_view->priv->drag_column->button,
- &drag_allocation);
- width += drag_allocation.width;
- continue;
- }
-
- real_requested_width = gtk_tree_view_get_real_requested_width_from_column (tree_view, column);
+ _gtk_tree_view_column_request_width (column, &column_minimum, &column_natural);
+
+ column_width = column_natural;
- allocation.x = width;
- column->width = real_requested_width;
-
- if (gtk_tree_view_column_get_expand (column))
- {
- if (number_of_expand_columns == 1)
+ if (width > natural_width)
+ {
+ /* We need to expand some columns. If there are none marked to
+ * expand, give all the extra space to the last column. */
+ if (n_expand_columns == 0)
{
- /* We add the remander to the last column as
- * */
- column->width += extra;
+ column_width = column_natural + (width - natural_width);
}
- else
+ else if (gtk_tree_view_column_get_expand (column))
{
- column->width += extra_per_column;
- extra -= extra_per_column;
- number_of_expand_columns --;
+ column_width = column_natural + (width - natural_width) / n_expand_columns;
+ n_expand_columns--;
}
- }
- else if (number_of_expand_columns == 0 &&
- list == last_column)
+ }
+ else if (width < natural_width)
{
- column->width += extra;
+ /* We need to shrink some columns. Starting with later columns,
+ * shrink each one down to its minimum width as necessary. */
+ column_width = MAX (column_natural + (width - natural_width), column_minimum);
}
+
+ _gtk_tree_view_column_allocate (column, width - column_width, column_width);
+
+ minimum_width -= column_minimum;
+ natural_width -= column_natural;
+ width -= column_width;
+ }
+}
- /* In addition to expand, the last column can get even more
- * extra space so all available space is filled up.
- */
- if (extra_for_last > 0 && list == last_column)
- column->width += extra_for_last;
-
- g_object_notify (G_OBJECT (column), "width");
-
- column_width = gtk_tree_view_column_get_width (column);
- allocation.width = column_width;
- width += column_width;
-
- if (column_width > old_width)
- column_changed = TRUE;
-
- gtk_widget_size_allocate (column->button, &allocation);
+/* GtkWidget::size_allocate helper */
+static void
+gtk_tree_view_size_allocate_drag_column (GtkWidget *widget)
+{
+ GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
+ GtkAllocation drag_allocation;
+ GtkWidget *button;
- if (column->window)
- gdk_window_move_resize (column->window,
- allocation.x + (rtl ? 0 : allocation.width) - TREE_VIEW_DRAG_WIDTH/2,
- allocation.y,
- TREE_VIEW_DRAG_WIDTH, allocation.height);
- }
+ if (tree_view->priv->drag_column == NULL)
+ return;
- /* We change the width here. The user might have been resizing columns,
- * so the total width of the tree view changes.
- */
- tree_view->priv->width = width;
- if (width_changed)
- *width_changed = TRUE;
+ button = gtk_tree_view_column_get_button (tree_view->priv->drag_column);
- if (column_changed)
- gtk_widget_queue_draw (GTK_WIDGET (tree_view));
+ drag_allocation.x = 0;
+ drag_allocation.y = 0;
+ drag_allocation.width = gdk_window_get_width (tree_view->priv->drag_window);
+ drag_allocation.height = gdk_window_get_height (tree_view->priv->drag_window);
+ gtk_widget_size_allocate (button, &drag_allocation);
}
-
static void
gtk_tree_view_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
* tree view (used in updating the adjustments below) might change.
*/
gtk_tree_view_size_allocate_columns (widget, &width_changed);
+ gtk_tree_view_size_allocate_drag_column (widget);
g_object_freeze_notify (G_OBJECT (tree_view->priv->hadjustment));
gtk_adjustment_set_page_size (tree_view->priv->hadjustment,
allocation->width * 0.1);
gtk_adjustment_set_lower (tree_view->priv->hadjustment, 0);
gtk_adjustment_set_upper (tree_view->priv->hadjustment,
- MAX (tree_view->priv->hadjustment->page_size,
+ MAX (gtk_adjustment_get_page_size (tree_view->priv->hadjustment),
tree_view->priv->width));
g_object_thaw_notify (G_OBJECT (tree_view->priv->hadjustment));
else if (allocation->width != old_width)
{
gtk_adjustment_set_value (tree_view->priv->hadjustment,
- CLAMP (tree_view->priv->hadjustment->value - allocation->width + old_width,
+ CLAMP (gtk_adjustment_get_value (tree_view->priv->hadjustment) - allocation->width + old_width,
0,
tree_view->priv->width - allocation->width));
}
- else
- gtk_adjustment_set_value (tree_view->priv->hadjustment,
- CLAMP (tree_view->priv->width - (tree_view->priv->prev_width - tree_view->priv->hadjustment->value),
- 0,
- tree_view->priv->width - allocation->width));
}
else
{
}
}
else
- if (tree_view->priv->hadjustment->value + allocation->width > tree_view->priv->width)
+ if (gtk_adjustment_get_value (tree_view->priv->hadjustment) + allocation->width > tree_view->priv->width)
gtk_adjustment_set_value (tree_view->priv->hadjustment,
MAX (tree_view->priv->width -
allocation->width, 0));
g_object_freeze_notify (G_OBJECT (tree_view->priv->vadjustment));
gtk_adjustment_set_page_size (tree_view->priv->vadjustment,
allocation->height -
- TREE_VIEW_HEADER_HEIGHT (tree_view));
+ gtk_tree_view_get_effective_header_height (tree_view));
gtk_adjustment_set_step_increment (tree_view->priv->vadjustment,
- tree_view->priv->vadjustment->page_size * 0.1);
+ gtk_adjustment_get_page_size (tree_view->priv->vadjustment) * 0.1);
gtk_adjustment_set_page_increment (tree_view->priv->vadjustment,
- tree_view->priv->vadjustment->page_size * 0.9);
+ gtk_adjustment_get_page_size (tree_view->priv->vadjustment) * 0.9);
gtk_adjustment_set_lower (tree_view->priv->vadjustment, 0);
gtk_adjustment_set_upper (tree_view->priv->vadjustment,
- MAX (tree_view->priv->vadjustment->page_size,
+ MAX (gtk_adjustment_get_page_size (tree_view->priv->vadjustment),
tree_view->priv->height));
g_object_thaw_notify (G_OBJECT (tree_view->priv->vadjustment));
/* now the adjustments and window sizes are in sync, we can sync toprow/dy again */
- if (tree_view->priv->height <= tree_view->priv->vadjustment->page_size)
+ if (tree_view->priv->height <= gtk_adjustment_get_page_size (tree_view->priv->vadjustment))
gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment), 0);
- else if (tree_view->priv->vadjustment->value + tree_view->priv->vadjustment->page_size > tree_view->priv->height)
+ else if (gtk_adjustment_get_value (tree_view->priv->vadjustment) + gtk_adjustment_get_page_size (tree_view->priv->vadjustment) > tree_view->priv->height)
gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment),
- tree_view->priv->height - tree_view->priv->vadjustment->page_size);
+ tree_view->priv->height - gtk_adjustment_get_page_size (tree_view->priv->vadjustment));
else if (gtk_tree_row_reference_valid (tree_view->priv->top_row))
gtk_tree_view_top_row_to_dy (tree_view);
else
allocation->x, allocation->y,
allocation->width, allocation->height);
gdk_window_move_resize (tree_view->priv->header_window,
- - (gint) tree_view->priv->hadjustment->value,
+ - (gint) gtk_adjustment_get_value (tree_view->priv->hadjustment),
0,
MAX (tree_view->priv->width, allocation->width),
tree_view->priv->header_height);
gdk_window_move_resize (tree_view->priv->bin_window,
- - (gint) tree_view->priv->hadjustment->value,
- TREE_VIEW_HEADER_HEIGHT (tree_view),
+ - (gint) gtk_adjustment_get_value (tree_view->priv->hadjustment),
+ gtk_tree_view_get_effective_header_height (tree_view),
MAX (tree_view->priv->width, allocation->width),
- allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view));
- }
+ allocation->height - gtk_tree_view_get_effective_header_height (tree_view));
- if (tree_view->priv->tree == NULL)
- invalidate_empty_focus (tree_view);
-
- if (gtk_widget_get_realized (widget))
- {
- gboolean has_expand_column = FALSE;
- for (tmp_list = tree_view->priv->columns; tmp_list; tmp_list = tmp_list->next)
- {
- if (gtk_tree_view_column_get_expand (GTK_TREE_VIEW_COLUMN (tmp_list->data)))
- {
- has_expand_column = TRUE;
- break;
- }
- }
+ if (tree_view->priv->tree == NULL)
+ invalidate_empty_focus (tree_view);
if (width_changed && tree_view->priv->expander_column)
{
tree_view->priv->prev_width_before_expander = width_before_expander;
}
-
- /* This little hack only works if we have an LTR locale, and no column has the */
- if (width_changed)
- {
- if (gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_LTR &&
- ! has_expand_column)
- invalidate_last_column (tree_view);
- else
- gtk_widget_queue_draw (widget);
- }
}
}
if (gtk_widget_get_can_focus (widget) && !gtk_widget_has_focus (widget))
gtk_widget_grab_focus (widget);
- GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_DRAW_KEYFOCUS);
+ tree_view->priv->draw_keyfocus = 0;
}
static inline gboolean
GtkTreeIter tmpiter;
if (iter)
- tmpiter = *iter;
+ tmpiter = *iter;
else
- gtk_tree_model_get_iter (tree_view->priv->model, &tmpiter, path);
+ {
+ if (!gtk_tree_model_get_iter (tree_view->priv->model, &tmpiter, path))
+ return FALSE;
+ }
is_separator = tree_view->priv->row_separator_func (tree_view->priv->model,
&tmpiter,
return is_separator;
}
+static int
+gtk_tree_view_get_expander_size (GtkTreeView *tree_view)
+{
+ gint expander_size;
+ gint horizontal_separator;
+
+ gtk_widget_style_get (GTK_WIDGET (tree_view),
+ "expander-size", &expander_size,
+ "horizontal-separator", &horizontal_separator,
+ NULL);
+
+ return expander_size + (horizontal_separator / 2);
+}
+
static gboolean
gtk_tree_view_button_press (GtkWidget *widget,
GdkEventButton *event)
"horizontal-separator", &horizontal_separator,
NULL);
-
+ /* Don't handle extra mouse buttons events, let them bubble up */
+ if (event->button > 5)
+ return FALSE;
+
/* Because grab_focus can cause reentrancy, we delay grab_focus until after
* we're done handling the button press.
*/
GtkRBNode *node;
GtkRBTree *tree;
GtkTreePath *path;
- gchar *path_string;
gint depth;
gint new_y;
gint y_offset;
gint dval;
gint pre_val, aft_val;
GtkTreeViewColumn *column = NULL;
- GtkCellRenderer *focus_cell = NULL;
gint column_handled_click = FALSE;
gboolean row_double_click = FALSE;
gboolean rtl;
gboolean node_selected;
+ GdkModifierType extend_mod_mask;
+ GdkModifierType modify_mod_mask;
/* Empty tree? */
if (tree_view->priv->tree == NULL)
/* are we in an arrow? */
if (tree_view->priv->prelight_node &&
- GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_ARROW_PRELIT) &&
- TREE_VIEW_DRAW_EXPANDERS (tree_view))
+ tree_view->priv->arrow_prelit &&
+ gtk_tree_view_draw_expanders (tree_view))
{
- if (event->button == 1)
+ if (event->button == GDK_BUTTON_PRIMARY)
{
gtk_grab_add (widget);
tree_view->priv->button_pressed_node = tree_view->priv->prelight_node;
}
/* Get the path and the node */
- path = _gtk_tree_view_find_path (tree_view, tree, node);
+ path = _gtk_tree_path_new_from_rbtree (tree, node);
path_is_selectable = !row_is_separator (tree_view, NULL, path);
if (!path_is_selectable)
depth = gtk_tree_path_get_depth (path);
background_area.y = y_offset + event->y;
- background_area.height = ROW_HEIGHT (tree_view, GTK_RBNODE_GET_HEIGHT (node));
+ background_area.height = gtk_tree_view_get_row_height (tree_view, node);
background_area.x = 0;
if (!gtk_tree_view_column_get_visible (candidate))
continue;
- background_area.width = candidate->width;
+ background_area.width = gtk_tree_view_column_get_width (candidate);
if ((background_area.x > (gint) event->x) ||
(background_area.x + background_area.width <= (gint) event->x))
{
cell_area.x += (depth - 1) * tree_view->priv->level_indentation;
cell_area.width -= (depth - 1) * tree_view->priv->level_indentation;
- if (TREE_VIEW_DRAW_EXPANDERS (tree_view))
+ if (gtk_tree_view_draw_expanders (tree_view))
{
+ gint expander_size = gtk_tree_view_get_expander_size (tree_view);
if (!rtl)
- cell_area.x += depth * tree_view->priv->expander_size;
- cell_area.width -= depth * tree_view->priv->expander_size;
+ cell_area.x += depth * expander_size;
+ cell_area.width -= depth * expander_size;
}
}
break;
return FALSE;
}
- tree_view->priv->focus_column = column;
+ _gtk_tree_view_set_focus_column (tree_view, column);
/* decide if we edit */
- if (event->type == GDK_BUTTON_PRESS && event->button == 1 &&
+ if (event->type == GDK_BUTTON_PRESS && event->button == GDK_BUTTON_PRIMARY &&
!(event->state & gtk_accelerator_get_default_mod_mask ()))
{
GtkTreePath *anchor;
/* FIXME: get the right flags */
guint flags = 0;
- path_string = gtk_tree_path_to_string (path);
-
if (_gtk_tree_view_column_cell_event (column,
- &cell_editable,
(GdkEvent *)event,
- path_string,
- &background_area,
&cell_area, flags))
{
+ GtkCellArea *area = gtk_cell_layout_get_area (GTK_CELL_LAYOUT (column));
+ cell_editable = gtk_cell_area_get_edit_widget (area);
+
if (cell_editable != NULL)
{
- gint left, right;
- GdkRectangle area;
-
- area = cell_area;
- _gtk_tree_view_column_get_neighbor_sizes (column, _gtk_tree_view_column_get_edited_cell (column), &left, &right);
-
- area.x += left;
- area.width -= right + left;
-
- gtk_tree_view_real_start_editing (tree_view,
- column,
- path,
- cell_editable,
- &area,
- (GdkEvent *)event,
- flags);
- g_free (path_string);
gtk_tree_path_free (path);
gtk_tree_path_free (anchor);
return TRUE;
}
column_handled_click = TRUE;
}
- g_free (path_string);
}
if (anchor)
gtk_tree_path_free (anchor);
}
+ extend_mod_mask =
+ gtk_widget_get_modifier_mask (widget, GDK_MODIFIER_INTENT_EXTEND_SELECTION);
+
+ modify_mod_mask =
+ gtk_widget_get_modifier_mask (widget, GDK_MODIFIER_INTENT_MODIFY_SELECTION);
+
/* select */
node_selected = GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED);
- pre_val = tree_view->priv->vadjustment->value;
+ pre_val = gtk_adjustment_get_value (tree_view->priv->vadjustment);
/* we only handle selection modifications on the first button press
*/
if (event->type == GDK_BUTTON_PRESS)
{
- if ((event->state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
- tree_view->priv->ctrl_pressed = TRUE;
- if ((event->state & GDK_SHIFT_MASK) == GDK_SHIFT_MASK)
- tree_view->priv->shift_pressed = TRUE;
+ GtkCellRenderer *focus_cell;
+
+ if ((event->state & modify_mod_mask) == modify_mod_mask)
+ tree_view->priv->modify_selection_pressed = TRUE;
+ if ((event->state & extend_mod_mask) == extend_mod_mask)
+ tree_view->priv->extend_selection_pressed = TRUE;
+
+ /* We update the focus cell here, this is also needed if the
+ * column does not contain an editable cell. In this case,
+ * GtkCellArea did not receive the event for processing (and
+ * could not update the focus cell).
+ */
+ focus_cell = _gtk_tree_view_column_get_cell_at_pos (column,
+ &cell_area,
+ &background_area,
+ event->x,
+ event->y);
- focus_cell = _gtk_tree_view_column_get_cell_at_pos (column, event->x - background_area.x);
if (focus_cell)
gtk_tree_view_column_focus_cell (column, focus_cell);
- if (event->state & GDK_CONTROL_MASK)
+ if (event->state & modify_mod_mask)
{
- gtk_tree_view_real_set_cursor (tree_view, path, FALSE, TRUE);
+ gtk_tree_view_real_set_cursor (tree_view, path, CLAMP_NODE);
gtk_tree_view_real_toggle_cursor_row (tree_view);
}
- else if (event->state & GDK_SHIFT_MASK)
+ else if (event->state & extend_mod_mask)
{
- gtk_tree_view_real_set_cursor (tree_view, path, FALSE, TRUE);
+ gtk_tree_view_real_set_cursor (tree_view, path, CLAMP_NODE);
gtk_tree_view_real_select_cursor_row (tree_view, FALSE);
}
else
{
- gtk_tree_view_real_set_cursor (tree_view, path, TRUE, TRUE);
+ gtk_tree_view_real_set_cursor (tree_view, path, CLEAR_AND_SELECT | CLAMP_NODE);
}
- tree_view->priv->ctrl_pressed = FALSE;
- tree_view->priv->shift_pressed = FALSE;
+ tree_view->priv->modify_selection_pressed = FALSE;
+ tree_view->priv->extend_selection_pressed = FALSE;
}
/* the treeview may have been scrolled because of _set_cursor,
* correct here
*/
- aft_val = tree_view->priv->vadjustment->value;
+ aft_val = gtk_adjustment_get_value (tree_view->priv->vadjustment);
dval = pre_val - aft_val;
cell_area.y += dval;
if (tree_view->priv->rubber_banding_enable
&& !node_selected
- && tree_view->priv->selection->type == GTK_SELECTION_MULTIPLE)
+ && gtk_tree_selection_get_mode (tree_view->priv->selection) == GTK_SELECTION_MULTIPLE)
{
tree_view->priv->press_start_y += tree_view->priv->dy;
tree_view->priv->rubber_band_x = event->x;
tree_view->priv->rubber_band_y = event->y + tree_view->priv->dy;
tree_view->priv->rubber_band_status = RUBBER_BAND_MAYBE_START;
- if ((event->state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
- tree_view->priv->rubber_band_ctrl = TRUE;
- if ((event->state & GDK_SHIFT_MASK) == GDK_SHIFT_MASK)
- tree_view->priv->rubber_band_shift = TRUE;
+ if ((event->state & modify_mod_mask) == modify_mod_mask)
+ tree_view->priv->rubber_band_modify = TRUE;
+ if ((event->state & extend_mod_mask) == extend_mod_mask)
+ tree_view->priv->rubber_band_extend = TRUE;
}
}
- /* Test if a double click happened on the same row. */
- if (event->button == 1 && event->type == GDK_BUTTON_PRESS)
+ if (event->button == GDK_BUTTON_PRIMARY && event->type == GDK_BUTTON_PRESS)
{
- int double_click_time, double_click_distance;
-
- g_object_get (gtk_settings_get_default (),
- "gtk-double-click-time", &double_click_time,
- "gtk-double-click-distance", &double_click_distance,
- NULL);
- /* Same conditions as _gdk_event_button_generate */
- if (tree_view->priv->last_button_x != -1 &&
- (event->time < tree_view->priv->last_button_time + double_click_time) &&
- (ABS (event->x - tree_view->priv->last_button_x) <= double_click_distance) &&
- (ABS (event->y - tree_view->priv->last_button_y) <= double_click_distance))
+ /* Test if a double click happened on the same row. */
+ if (!tree_view->priv->activate_on_single_click)
{
- /* We do no longer compare paths of this row and the
- * row clicked previously. We use the double click
- * distance to decide whether this is a valid click,
- * allowing the mouse to slightly move over another row.
- */
- row_double_click = TRUE;
-
- tree_view->priv->last_button_time = 0;
- tree_view->priv->last_button_x = -1;
- tree_view->priv->last_button_y = -1;
+ int double_click_time, double_click_distance;
+
+ g_object_get (gtk_settings_get_default (),
+ "gtk-double-click-time", &double_click_time,
+ "gtk-double-click-distance", &double_click_distance,
+ NULL);
+
+ /* Same conditions as _gdk_event_button_generate */
+ if (tree_view->priv->last_button_x != -1 &&
+ (event->time < tree_view->priv->last_button_time + double_click_time) &&
+ (ABS (event->x - tree_view->priv->last_button_x) <= double_click_distance) &&
+ (ABS (event->y - tree_view->priv->last_button_y) <= double_click_distance))
+ {
+ /* We do no longer compare paths of this row and the
+ * row clicked previously. We use the double click
+ * distance to decide whether this is a valid click,
+ * allowing the mouse to slightly move over another row.
+ */
+ row_double_click = TRUE;
+
+ tree_view->priv->last_button_time = 0;
+ tree_view->priv->last_button_x = -1;
+ tree_view->priv->last_button_y = -1;
+ }
+ else
+ {
+ tree_view->priv->last_button_time = event->time;
+ tree_view->priv->last_button_x = event->x;
+ tree_view->priv->last_button_y = event->y;
+ }
}
else
{
- tree_view->priv->last_button_time = event->time;
- tree_view->priv->last_button_x = event->x;
- tree_view->priv->last_button_y = event->y;
+ tree_view->priv->button_pressed_node = tree_view->priv->prelight_node;
+ tree_view->priv->button_pressed_tree = tree_view->priv->prelight_tree;
}
}
for (i = 0, list = tree_view->priv->columns; list; list = list->next, i++)
{
column = list->data;
- if (event->window == column->window &&
+ if (event->window == _gtk_tree_view_column_get_window (column) &&
gtk_tree_view_column_get_resizable (column) &&
- column->window)
+ _gtk_tree_view_column_get_window (column))
{
- GtkAllocation button_allocation;
gpointer drag_data;
+ gint column_width, x;
if (event->type == GDK_2BUTTON_PRESS &&
gtk_tree_view_column_get_sizing (column) != GTK_TREE_VIEW_COLUMN_AUTOSIZE)
{
- column->use_resized_width = FALSE;
+ gtk_tree_view_column_set_fixed_width (column, -1);
+ gtk_tree_view_column_set_expand (column, FALSE);
_gtk_tree_view_column_autosize (tree_view, column);
return TRUE;
}
- if (gdk_pointer_grab (column->window, FALSE,
- GDK_POINTER_MOTION_HINT_MASK |
- GDK_BUTTON1_MOTION_MASK |
- GDK_BUTTON_RELEASE_MASK,
- NULL, NULL, event->time))
- return FALSE;
+ if (gdk_device_grab (gdk_event_get_device ((GdkEvent*)event),
+ _gtk_tree_view_column_get_window (column),
+ GDK_OWNERSHIP_NONE,
+ FALSE,
+ GDK_POINTER_MOTION_HINT_MASK
+ | GDK_BUTTON1_MOTION_MASK
+ | GDK_BUTTON_RELEASE_MASK,
+ NULL,
+ event->time) != GDK_GRAB_SUCCESS)
+ return FALSE;
- gtk_grab_add (widget);
- GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE);
- column->resized_width = gtk_tree_view_column_get_width (column) -
- tree_view->priv->last_extra_space_per_column;
+ gtk_grab_add (widget);
+ tree_view->priv->in_column_resize = TRUE;
/* block attached dnd signal handler */
drag_data = g_object_get_data (G_OBJECT (widget), "gtk-site-data");
0, 0, NULL, NULL,
drag_data);
- gtk_widget_get_allocation (column->button, &button_allocation);
+ column_width = gtk_tree_view_column_get_width (column);
+ gdk_window_get_device_position (tree_view->priv->bin_window,
+ gdk_event_get_device ((GdkEvent *) event),
+ &x, NULL, NULL);
+
tree_view->priv->drag_pos = i;
- tree_view->priv->x_drag = button_allocation.x + (rtl ? 0 : button_allocation.width);
+ tree_view->priv->x_drag = x + (rtl ? column_width : -column_width);
if (!gtk_widget_has_focus (widget))
gtk_widget_grab_focus (widget);
GdkEventButton *event)
{
GtkTreeView *tree_view;
+ GtkWidget *button;
GList *l;
gboolean rtl;
+ GdkDevice *device, *other;
+ GtkStyleContext *context;
tree_view = GTK_TREE_VIEW (widget);
rtl = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);
- gdk_display_pointer_ungrab (gtk_widget_get_display (widget), GDK_CURRENT_TIME);
- gdk_display_keyboard_ungrab (gtk_widget_get_display (widget), GDK_CURRENT_TIME);
+ device = gdk_event_get_device ((GdkEvent*)event);
+ other = gdk_device_get_associated_device (device);
+ gdk_device_ungrab (device, event->time);
+ gdk_device_ungrab (other, event->time);
/* Move the button back */
- g_object_ref (tree_view->priv->drag_column->button);
- gtk_container_remove (GTK_CONTAINER (tree_view), tree_view->priv->drag_column->button);
- gtk_widget_set_parent_window (tree_view->priv->drag_column->button, tree_view->priv->header_window);
- gtk_widget_set_parent (tree_view->priv->drag_column->button, GTK_WIDGET (tree_view));
- g_object_unref (tree_view->priv->drag_column->button);
+ button = gtk_tree_view_column_get_button (tree_view->priv->drag_column);
+
+ context = gtk_widget_get_style_context (button);
+ gtk_style_context_remove_class (context, GTK_STYLE_CLASS_DND);
+
+ g_object_ref (button);
+ gtk_container_remove (GTK_CONTAINER (tree_view), button);
+ gtk_widget_set_parent_window (button, tree_view->priv->header_window);
+ gtk_widget_set_parent (button, GTK_WIDGET (tree_view));
+ g_object_unref (button);
gtk_widget_queue_resize (widget);
if (gtk_tree_view_column_get_resizable (tree_view->priv->drag_column))
{
- gdk_window_raise (tree_view->priv->drag_column->window);
- gdk_window_show (tree_view->priv->drag_column->window);
+ gdk_window_raise (_gtk_tree_view_column_get_window (tree_view->priv->drag_column));
+ gdk_window_show (_gtk_tree_view_column_get_window (tree_view->priv->drag_column));
}
else
- gdk_window_hide (tree_view->priv->drag_column->window);
+ gdk_window_hide (_gtk_tree_view_column_get_window (tree_view->priv->drag_column));
- gtk_widget_grab_focus (tree_view->priv->drag_column->button);
+ gtk_widget_grab_focus (button);
if (rtl)
{
tree_view->priv->cur_reorder->left_column);
}
tree_view->priv->drag_column = NULL;
- gdk_window_hide (tree_view->priv->drag_window);
+ gtk_widget_unregister_window (widget, tree_view->priv->drag_window);
+ gdk_window_destroy (tree_view->priv->drag_window);
+ tree_view->priv->drag_window = NULL;
for (l = tree_view->priv->column_drag_info; l != NULL; l = l->next)
g_slice_free (GtkTreeViewColumnReorder, l->data);
/* Reset our flags */
tree_view->priv->drag_column_window_state = DRAG_COLUMN_WINDOW_STATE_UNSET;
- GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_DRAG);
+ tree_view->priv->in_column_drag = FALSE;
return TRUE;
}
0, 0, NULL, NULL,
drag_data);
- GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE);
+ tree_view->priv->in_column_resize = FALSE;
gtk_grab_remove (widget);
- gdk_display_pointer_ungrab (gdk_window_get_display (event->window),
- event->time);
+ gdk_device_ungrab (gdk_event_get_device ((GdkEvent*)event), event->time);
return TRUE;
}
+static gboolean
+button_event_modifies_selection (GdkEventButton *event)
+{
+ return (event->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) != 0;
+}
+
static gboolean
gtk_tree_view_button_release (GtkWidget *widget,
GdkEventButton *event)
{
GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
- if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_IN_COLUMN_DRAG))
+ if (tree_view->priv->in_column_drag)
return gtk_tree_view_button_release_drag_column (widget, event);
if (tree_view->priv->rubber_band_status)
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))
+ if (tree_view->priv->in_column_resize)
return gtk_tree_view_button_release_column_resize (widget, event);
if (tree_view->priv->button_pressed_node == NULL)
return FALSE;
- if (event->button == 1)
+ if (event->button == GDK_BUTTON_PRIMARY
+ && tree_view->priv->button_pressed_node == tree_view->priv->prelight_node)
{
- gtk_grab_remove (widget);
- if (tree_view->priv->button_pressed_node == tree_view->priv->prelight_node &&
- GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_ARROW_PRELIT))
+ if (tree_view->priv->arrow_prelit)
{
GtkTreePath *path = NULL;
- path = _gtk_tree_view_find_path (tree_view,
- tree_view->priv->button_pressed_tree,
- tree_view->priv->button_pressed_node);
+ path = _gtk_tree_path_new_from_rbtree (tree_view->priv->button_pressed_tree,
+ tree_view->priv->button_pressed_node);
/* Actually activate the node */
if (tree_view->priv->button_pressed_node->children == NULL)
gtk_tree_view_real_expand_row (tree_view, path,
tree_view->priv->button_pressed_node, TRUE);
gtk_tree_path_free (path);
}
+ else if (tree_view->priv->activate_on_single_click
+ && !button_event_modifies_selection (event))
+ {
+ GtkTreePath *path = NULL;
+
+ path = _gtk_tree_path_new_from_rbtree (tree_view->priv->button_pressed_tree,
+ tree_view->priv->button_pressed_node);
+ gtk_tree_view_row_activated (tree_view, path, tree_view->priv->focus_column);
+ gtk_tree_path_free (path);
+ }
+ gtk_grab_remove (widget);
tree_view->priv->button_pressed_tree = NULL;
tree_view->priv->button_pressed_node = NULL;
}
{
GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
- if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_IN_COLUMN_DRAG))
+ if (tree_view->priv->in_column_drag)
gtk_tree_view_button_release_drag_column (widget, (GdkEventButton *)event);
- if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE))
+ if (tree_view->priv->in_column_resize)
gtk_tree_view_button_release_column_resize (widget, (GdkEventButton *)event);
return TRUE;
if ((node->flags & GTK_RBNODE_IS_PARENT) == 0)
return FALSE;
- arrow.y = BACKGROUND_FIRST_PIXEL (tree_view, tree, node);
-
- arrow.height = ROW_HEIGHT (tree_view, BACKGROUND_HEIGHT (node));
+ arrow.y = gtk_tree_view_get_row_y_offset (tree_view, tree, node);
+ arrow.height = gtk_tree_view_get_row_height (tree_view, node);
gtk_tree_view_get_arrow_xrange (tree_view, tree, &arrow.x, &x2);
if (tree_view->priv->prelight_node)
{
- path = _gtk_tree_view_find_path (tree_view,
- tree_view->priv->prelight_tree,
- tree_view->priv->prelight_node);
+ path = _gtk_tree_path_new_from_rbtree (tree_view->priv->prelight_tree,
+ tree_view->priv->prelight_node);
if (tree_view->priv->prelight_node->children)
gtk_tree_view_collapse_row (tree_view, path);
/* We are still on the same node,
but we might need to take care of the arrow */
- if (tree && node && TREE_VIEW_DRAW_EXPANDERS (tree_view))
+ if (tree && node && gtk_tree_view_draw_expanders (tree_view))
{
gboolean over_arrow;
- gboolean flag_set;
over_arrow = coords_are_over_arrow (tree_view, tree, node, x, y);
- flag_set = GTK_TREE_VIEW_FLAG_SET (tree_view,
- GTK_TREE_VIEW_ARROW_PRELIT);
- if (over_arrow != flag_set)
+ if (over_arrow != tree_view->priv->arrow_prelit)
{
if (over_arrow)
- GTK_TREE_VIEW_SET_FLAG (tree_view,
- GTK_TREE_VIEW_ARROW_PRELIT);
+ tree_view->priv->arrow_prelit = TRUE;
else
- GTK_TREE_VIEW_UNSET_FLAG (tree_view,
- GTK_TREE_VIEW_ARROW_PRELIT);
+ tree_view->priv->arrow_prelit = FALSE;
gtk_tree_view_queue_draw_arrow (tree_view, tree, node);
}
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)
- && TREE_VIEW_DRAW_EXPANDERS (tree_view))
+ if (tree_view->priv->arrow_prelit
+ && gtk_tree_view_draw_expanders (tree_view))
{
- GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_ARROW_PRELIT);
+ tree_view->priv->arrow_prelit = FALSE;
gtk_tree_view_queue_draw_arrow (tree_view,
tree_view->priv->prelight_tree,
/* Prelight the new node and arrow */
- if (TREE_VIEW_DRAW_EXPANDERS (tree_view)
+ if (gtk_tree_view_draw_expanders (tree_view)
&& coords_are_over_arrow (tree_view, tree, node, x, y))
{
- GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_ARROW_PRELIT);
+ tree_view->priv->arrow_prelit = TRUE;
gtk_tree_view_queue_draw_arrow (tree_view, tree, node);
}
if (tree_view->priv->hover_selection &&
(mode == GTK_SELECTION_SINGLE || mode == GTK_SELECTION_BROWSE) &&
!(tree_view->priv->edited_column &&
- tree_view->priv->edited_column->editable_widget))
+ gtk_cell_area_get_edit_widget
+ (gtk_cell_layout_get_area (GTK_CELL_LAYOUT (tree_view->priv->edited_column)))))
{
if (node)
{
{
GtkTreePath *path;
- path = _gtk_tree_view_find_path (tree_view, tree, node);
+ path = _gtk_tree_path_new_from_rbtree (tree, node);
gtk_tree_selection_select_path (tree_view->priv->selection, path);
if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
{
- GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_DRAW_KEYFOCUS);
- gtk_tree_view_real_set_cursor (tree_view, path, FALSE, FALSE);
+ tree_view->priv->draw_keyfocus = FALSE;
+ gtk_tree_view_real_set_cursor (tree_view, path, 0);
}
gtk_tree_path_free (path);
}
{
GtkAllocation left_allocation, right_allocation;
GdkRectangle visible_rect;
+ GtkWidget *button;
gtk_tree_view_get_visible_rect (tree_view, &visible_rect);
if (reorder->left_column)
{
- gtk_widget_get_allocation (reorder->left_column->button, &left_allocation);
+ button = gtk_tree_view_column_get_button (reorder->left_column);
+ gtk_widget_get_allocation (button, &left_allocation);
x = left_allocation.x + left_allocation.width;
}
else
{
- gtk_widget_get_allocation (reorder->right_column->button, &right_allocation);
+ button = gtk_tree_view_column_get_button (reorder->right_column);
+ gtk_widget_get_allocation (button, &right_allocation);
x = right_allocation.x;
}
if (tree_view->priv->drag_column_window_state != DRAG_COLUMN_WINDOW_STATE_ORIGINAL)
{
GtkAllocation drag_allocation;
+ GtkWidget *button;
if (tree_view->priv->drag_highlight_window)
{
- gdk_window_set_user_data (tree_view->priv->drag_highlight_window,
- NULL);
+ gtk_widget_unregister_window (GTK_WIDGET (tree_view), tree_view->priv->drag_highlight_window);
gdk_window_destroy (tree_view->priv->drag_highlight_window);
}
+ button = gtk_tree_view_column_get_button (tree_view->priv->drag_column);
attributes.window_type = GDK_WINDOW_CHILD;
attributes.wclass = GDK_INPUT_OUTPUT;
attributes.x = tree_view->priv->drag_column_x;
attributes.y = 0;
- gtk_widget_get_allocation (tree_view->priv->drag_column->button, &drag_allocation);
+ gtk_widget_get_allocation (button, &drag_allocation);
width = attributes.width = drag_allocation.width;
height = attributes.height = drag_allocation.height;
attributes.visual = gtk_widget_get_visual (GTK_WIDGET (tree_view));
attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK;
attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
tree_view->priv->drag_highlight_window = gdk_window_new (tree_view->priv->header_window, &attributes, attributes_mask);
- gdk_window_set_user_data (tree_view->priv->drag_highlight_window, GTK_WIDGET (tree_view));
+ gtk_widget_register_window (GTK_WIDGET (tree_view), tree_view->priv->drag_highlight_window);
mask_image = cairo_image_surface_create (CAIRO_FORMAT_A1, width, height);
cr = cairo_create (mask_image);
else if (arrow_type == DRAG_COLUMN_WINDOW_STATE_ARROW)
{
GtkAllocation button_allocation;
+ GtkWidget *button;
- width = tree_view->priv->expander_size;
+ width = gtk_tree_view_get_expander_size (tree_view);
/* Get x, y, width, height of arrow */
gdk_window_get_origin (tree_view->priv->header_window, &x, &y);
if (reorder->left_column)
{
- gtk_widget_get_allocation (reorder->left_column->button, &button_allocation);
+ button = gtk_tree_view_column_get_button (reorder->left_column);
+ gtk_widget_get_allocation (button, &button_allocation);
x += button_allocation.x + button_allocation.width - width/2;
height = button_allocation.height;
}
else
{
- gtk_widget_get_allocation (reorder->right_column->button, &button_allocation);
+ button = gtk_tree_view_column_get_button (reorder->right_column);
+ gtk_widget_get_allocation (button, &button_allocation);
x += button_allocation.x - width/2;
height = button_allocation.height;
}
- y -= tree_view->priv->expander_size/2; /* The arrow takes up only half the space */
- height += tree_view->priv->expander_size;
+ y -= width/2; /* The arrow takes up only half the space */
+ height += width;
/* Create the new window */
if (tree_view->priv->drag_column_window_state != DRAG_COLUMN_WINDOW_STATE_ARROW)
{
if (tree_view->priv->drag_highlight_window)
{
- gdk_window_set_user_data (tree_view->priv->drag_highlight_window,
- NULL);
+ gtk_widget_unregister_window (GTK_WIDGET (tree_view), tree_view->priv->drag_highlight_window);
gdk_window_destroy (tree_view->priv->drag_highlight_window);
}
attributes.height = height;
tree_view->priv->drag_highlight_window = gdk_window_new (gtk_widget_get_root_window (widget),
&attributes, attributes_mask);
- gdk_window_set_user_data (tree_view->priv->drag_highlight_window, GTK_WIDGET (tree_view));
+ gtk_widget_register_window (GTK_WIDGET (tree_view), tree_view->priv->drag_highlight_window);
mask_image = cairo_image_surface_create (CAIRO_FORMAT_A1, width, height);
arrow_type == DRAG_COLUMN_WINDOW_STATE_ARROW_RIGHT)
{
GtkAllocation allocation;
+ GtkWidget *button;
+ gint expander_size;
- width = tree_view->priv->expander_size;
+ expander_size = gtk_tree_view_get_expander_size (tree_view);
/* Get x, y, width, height of arrow */
- width = width/2; /* remember, the arrow only takes half the available width */
+ width = expander_size/2; /* remember, the arrow only takes half the available width */
gdk_window_get_origin (gtk_widget_get_window (widget),
&x, &y);
if (arrow_type == DRAG_COLUMN_WINDOW_STATE_ARROW_RIGHT)
if (reorder->left_column)
{
- gtk_widget_get_allocation (reorder->left_column->button, &allocation);
+ button = gtk_tree_view_column_get_button (reorder->left_column);
+ gtk_widget_get_allocation (button, &allocation);
height = allocation.height;
}
else
{
- gtk_widget_get_allocation (reorder->right_column->button, &allocation);
+ button = gtk_tree_view_column_get_button (reorder->right_column);
+ gtk_widget_get_allocation (button, &allocation);
height = allocation.height;
}
- y -= tree_view->priv->expander_size;
- height += 2*tree_view->priv->expander_size;
+ y -= expander_size;
+ height += 2 * expander_size;
/* Create the new window */
if (tree_view->priv->drag_column_window_state != DRAG_COLUMN_WINDOW_STATE_ARROW_LEFT &&
{
if (tree_view->priv->drag_highlight_window)
{
- gdk_window_set_user_data (tree_view->priv->drag_highlight_window,
- NULL);
+ gtk_widget_unregister_window (GTK_WIDGET (tree_view), tree_view->priv->drag_highlight_window);
gdk_window_destroy (tree_view->priv->drag_highlight_window);
}
attributes.y = y;
attributes.width = width;
attributes.height = height;
- tree_view->priv->drag_highlight_window = gdk_window_new (NULL, &attributes, attributes_mask);
- gdk_window_set_user_data (tree_view->priv->drag_highlight_window, GTK_WIDGET (tree_view));
+ tree_view->priv->drag_highlight_window = gdk_window_new (gtk_widget_get_root_window (widget), &attributes, attributes_mask);
+ gtk_widget_register_window (GTK_WIDGET (tree_view), tree_view->priv->drag_highlight_window);
mask_image = cairo_image_surface_create (CAIRO_FORMAT_A1, width, height);
}
cairo_move_to (cr, 0, 0);
cairo_line_to (cr, width, width);
- cairo_line_to (cr, 0, tree_view->priv->expander_size);
+ cairo_line_to (cr, 0, expander_size);
cairo_move_to (cr, 0, height);
cairo_line_to (cr, width, height - width);
- cairo_line_to (cr, 0, height - tree_view->priv->expander_size);
+ cairo_line_to (cr, 0, height - expander_size);
cairo_fill (cr);
cairo_destroy (cr);
column = gtk_tree_view_get_column (tree_view, tree_view->priv->drag_pos);
- if (event->is_hint || event->window != gtk_widget_get_window (widget))
- gtk_widget_get_pointer (widget, &x, NULL);
- else
- x = event->x;
+ gdk_window_get_device_position (tree_view->priv->bin_window,
+ gdk_event_get_device ((GdkEvent *) event),
+ &x, NULL, NULL);
- if (tree_view->priv->hadjustment)
- x += tree_view->priv->hadjustment->value;
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+ new_width = MAX (tree_view->priv->x_drag - x, 0);
+ else
+ new_width = MAX (x - tree_view->priv->x_drag, 0);
- new_width = gtk_tree_view_new_column_width (tree_view,
- tree_view->priv->drag_pos, &x);
- if (x != tree_view->priv->x_drag &&
- (new_width != gtk_tree_view_column_get_fixed_width (column)))
- {
- column->use_resized_width = TRUE;
- column->resized_width = new_width;
- if (gtk_tree_view_column_get_expand (column))
- column->resized_width -= tree_view->priv->last_extra_space_per_column;
- gtk_widget_queue_resize (widget);
- }
+ if (new_width != gtk_tree_view_column_get_width (column))
+ gtk_tree_view_modify_column_width (tree_view, column, new_width);
return FALSE;
}
static void
-gtk_tree_view_update_current_reorder (GtkTreeView *tree_view)
+gtk_tree_view_update_current_reorder (GtkTreeView *tree_view,
+ GdkEvent *event)
{
GtkTreeViewColumnReorder *reorder = NULL;
GList *list;
gint mouse_x;
- gdk_window_get_pointer (tree_view->priv->header_window, &mouse_x, NULL, NULL);
+ gdk_window_get_device_position (tree_view->priv->header_window,
+ gdk_event_get_device (event),
+ &mouse_x, NULL, NULL);
for (list = tree_view->priv->column_drag_info; list; list = list->next)
{
reorder = (GtkTreeViewColumnReorder *) list->data;
gint y;
gint offset;
- gdk_window_get_pointer (tree_view->priv->bin_window, NULL, &y, NULL);
+ gdk_window_get_device_position (tree_view->priv->bin_window,
+ gdk_device_manager_get_client_pointer (
+ gdk_display_get_device_manager (
+ gtk_widget_get_display (GTK_WIDGET (tree_view)))),
+ NULL, &y, NULL);
y += tree_view->priv->dy;
gtk_tree_view_get_visible_rect (tree_view, &visible_rect);
}
gtk_adjustment_set_value (tree_view->priv->vadjustment,
- MAX (tree_view->priv->vadjustment->value + offset, 0.0));
+ MAX (gtk_adjustment_get_value (tree_view->priv->vadjustment) + offset, 0.0));
}
static gboolean
-gtk_tree_view_horizontal_autoscroll (GtkTreeView *tree_view)
+gtk_tree_view_horizontal_autoscroll (GtkTreeView *tree_view,
+ GdkEvent *event)
{
GdkRectangle visible_rect;
gint x;
gint offset;
- gdk_window_get_pointer (tree_view->priv->bin_window, &x, NULL, NULL);
+ gdk_window_get_device_position (tree_view->priv->bin_window,
+ gdk_event_get_device (event),
+ &x, NULL, NULL);
gtk_tree_view_get_visible_rect (tree_view, &visible_rect);
offset = offset/3;
gtk_adjustment_set_value (tree_view->priv->hadjustment,
- MAX (tree_view->priv->hadjustment->value + offset, 0.0));
+ MAX (gtk_adjustment_get_value (tree_view->priv->hadjustment) + offset, 0.0));
return TRUE;
GtkAllocation allocation, button_allocation;
GtkTreeView *tree_view = (GtkTreeView *) widget;
GtkTreeViewColumn *column = tree_view->priv->drag_column;
+ GtkWidget *button;
gint x, y;
/* Sanity Check */
(event->window != tree_view->priv->drag_window))
return FALSE;
+ button = gtk_tree_view_column_get_button (column);
+
/* Handle moving the header */
gdk_window_get_position (tree_view->priv->drag_window, &x, &y);
gtk_widget_get_allocation (widget, &allocation);
- gtk_widget_get_allocation (column->button, &button_allocation);
- x = CLAMP (x + (gint)event->x - column->drag_x, 0,
+ gtk_widget_get_allocation (button, &button_allocation);
+ x = CLAMP (x + (gint)event->x - _gtk_tree_view_column_get_drag_x (column), 0,
MAX (tree_view->priv->width, allocation.width) - button_allocation.width);
gdk_window_move (tree_view->priv->drag_window, x, y);
/* autoscroll, if needed */
- gtk_tree_view_horizontal_autoscroll (tree_view);
+ gtk_tree_view_horizontal_autoscroll (tree_view, (GdkEvent *) event);
/* Update the current reorder position and arrow; */
- gtk_tree_view_update_current_reorder (tree_view);
+ gtk_tree_view_update_current_reorder (tree_view, (GdkEvent *) event);
return TRUE;
}
gtk_widget_queue_draw (GTK_WIDGET (tree_view));
/* The anchor path should be set to the start path */
- tmp_path = _gtk_tree_view_find_path (tree_view,
- tree_view->priv->rubber_band_start_tree,
- tree_view->priv->rubber_band_start_node);
+ tmp_path = _gtk_tree_path_new_from_rbtree (tree_view->priv->rubber_band_start_tree,
+ tree_view->priv->rubber_band_start_node);
if (tree_view->priv->anchor)
gtk_tree_row_reference_free (tree_view->priv->anchor);
gtk_tree_path_free (tmp_path);
/* ... and the cursor to the end path */
- tmp_path = _gtk_tree_view_find_path (tree_view,
- tree_view->priv->rubber_band_end_tree,
- tree_view->priv->rubber_band_end_node);
- gtk_tree_view_real_set_cursor (GTK_TREE_VIEW (tree_view), tmp_path, FALSE, FALSE);
+ tmp_path = _gtk_tree_path_new_from_rbtree (tree_view->priv->rubber_band_end_tree,
+ tree_view->priv->rubber_band_end_node);
+ gtk_tree_view_real_set_cursor (GTK_TREE_VIEW (tree_view), tmp_path, 0);
gtk_tree_path_free (tmp_path);
_gtk_tree_selection_emit_changed (tree_view->priv->selection);
/* Clear status variables */
tree_view->priv->rubber_band_status = RUBBER_BAND_OFF;
- tree_view->priv->rubber_band_shift = 0;
- tree_view->priv->rubber_band_ctrl = 0;
+ tree_view->priv->rubber_band_extend = FALSE;
+ tree_view->priv->rubber_band_modify = FALSE;
tree_view->priv->rubber_band_start_node = NULL;
tree_view->priv->rubber_band_start_tree = NULL;
GtkTreePath *path;
gboolean selectable;
- path = _gtk_tree_view_find_path (tree_view, start_tree, start_node);
+ path = _gtk_tree_path_new_from_rbtree (start_tree, start_node);
selectable = _gtk_tree_selection_row_is_selectable (tree_view->priv->selection, start_node, path);
gtk_tree_path_free (path);
if (select)
{
- if (tree_view->priv->rubber_band_shift)
- GTK_RBNODE_SET_FLAG (start_node, GTK_RBNODE_IS_SELECTED);
- else if (tree_view->priv->rubber_band_ctrl)
+ if (tree_view->priv->rubber_band_extend)
+ GTK_RBNODE_SET_FLAG (start_node, GTK_RBNODE_IS_SELECTED);
+ else if (tree_view->priv->rubber_band_modify)
{
/* Toggle the selection state */
if (GTK_RBNODE_FLAG_SET (start_node, GTK_RBNODE_IS_SELECTED))
else
{
/* Mirror the above */
- if (tree_view->priv->rubber_band_shift)
+ if (tree_view->priv->rubber_band_extend)
GTK_RBNODE_UNSET_FLAG (start_node, GTK_RBNODE_IS_SELECTED);
- else if (tree_view->priv->rubber_band_ctrl)
+ else if (tree_view->priv->rubber_band_modify)
{
/* Toggle the selection state */
if (GTK_RBNODE_FLAG_SET (start_node, GTK_RBNODE_IS_SELECTED))
if (start_node->children)
{
start_tree = start_node->children;
- start_node = start_tree->root;
- while (start_node->left != start_tree->nil)
- start_node = start_node->left;
+ start_node = _gtk_rbtree_first (start_tree);
}
else
{
old_area.width = ABS (tree_view->priv->rubber_band_x - tree_view->priv->press_start_x) + 1;
old_area.height = ABS (tree_view->priv->rubber_band_y - tree_view->priv->press_start_y) + 1;
- gdk_window_get_pointer (tree_view->priv->bin_window, &x, &y, NULL);
+ gdk_window_get_device_position (tree_view->priv->bin_window,
+ gdk_device_manager_get_client_pointer (
+ gdk_display_get_device_manager (
+ gtk_widget_get_display (GTK_WIDGET (tree_view)))),
+ &x, &y, NULL);
x = MAX (x, 0);
y = MAX (y, 0) + tree_view->priv->dy;
cairo_t *cr)
{
GdkRectangle rect;
- GtkStyle *style;
+ GtkStyleContext *context;
cairo_save (cr);
+ context = gtk_widget_get_style_context (GTK_WIDGET (tree_view));
+
+ gtk_style_context_save (context);
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_RUBBERBAND);
+
rect.x = MIN (tree_view->priv->press_start_x, tree_view->priv->rubber_band_x);
rect.y = MIN (tree_view->priv->press_start_y, tree_view->priv->rubber_band_y) - tree_view->priv->dy;
rect.width = ABS (tree_view->priv->press_start_x - tree_view->priv->rubber_band_x) + 1;
rect.height = ABS (tree_view->priv->press_start_y - tree_view->priv->rubber_band_y) + 1;
- cairo_set_line_width (cr, 1.0);
-
- style = gtk_widget_get_style (GTK_WIDGET (tree_view));
-
- gdk_cairo_set_source_color (cr, &style->fg[GTK_STATE_NORMAL]);
-
gdk_cairo_rectangle (cr, &rect);
cairo_clip (cr);
- cairo_paint_with_alpha (cr, 0.25);
- cairo_rectangle (cr,
- rect.x + 0.5, rect.y + 0.5,
- rect.width - 1, rect.height - 1);
- cairo_stroke (cr);
+ gtk_render_background (context, cr,
+ rect.x, rect.y,
+ rect.width, rect.height);
+ gtk_render_frame (context, cr,
+ rect.x, rect.y,
+ rect.width, rect.height);
+ gtk_style_context_restore (context);
cairo_restore (cr);
}
tree_view = (GtkTreeView *) widget;
/* Resizing a column */
- if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE))
+ if (tree_view->priv->in_column_resize)
return gtk_tree_view_motion_resize_column (widget, event);
/* Drag column */
- if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_IN_COLUMN_DRAG))
+ if (tree_view->priv->in_column_drag)
return gtk_tree_view_motion_drag_column (widget, event);
/* Sanity check it */
GtkWidget *widget = GTK_WIDGET (tree_view);
gint w, h;
- if (!gtk_widget_has_focus (widget))
+ if (!gtk_widget_has_visible_focus (widget))
return;
w = gdk_window_get_width (tree_view->priv->bin_window) - 2;
h = gdk_window_get_height (tree_view->priv->bin_window) - 2;
if (w > 0 && h > 0)
- gtk_paint_focus (gtk_widget_get_style (widget),
- cr,
- gtk_widget_get_state (widget),
- widget,
- NULL,
- 1, 1, w, h);
+ {
+ GtkStyleContext *context;
+
+ context = gtk_widget_get_style_context (widget);
+
+ gtk_render_focus (context, cr, 1, 1, w, h);
+ }
}
typedef enum {
g_assert_not_reached ();
/* fall through */
case GTK_TREE_VIEW_FOREGROUND_LINE:
- cairo_set_line_width (cr, 1.0);
- gdk_cairo_set_source_color (cr,
- >k_widget_get_style (GTK_WIDGET (tree_view))->fg[gtk_widget_get_state (GTK_WIDGET (tree_view))]);
+ {
+ GtkStyleContext *context;
+ GtkStateFlags state;
+ GdkRGBA color;
+
+ context = gtk_widget_get_style_context (GTK_WIDGET (tree_view));
+ state = gtk_widget_get_state_flags (GTK_WIDGET (tree_view));
+
+ cairo_set_line_width (cr, 1.0);
+ gtk_style_context_get_color (context, state, &color);
+ gdk_cairo_set_source_rgba (cr, &color);
+ }
+
break;
}
{
GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
GtkTreePath *path;
- GtkStyle *style;
GtkRBTree *tree;
GList *list;
GtkRBNode *node;
- GtkRBNode *cursor = NULL;
- GtkRBTree *cursor_tree = NULL;
GtkRBNode *drag_highlight = NULL;
GtkRBTree *drag_highlight_tree = NULL;
GtkTreeIter iter;
gint expander_cell_width;
gint bin_window_width;
gint bin_window_height;
- GtkTreePath *cursor_path;
GtkTreePath *drag_dest_path;
GList *first_column, *last_column;
gint vertical_separator;
gint horizontal_separator;
- gint focus_line_width;
gboolean allow_rules;
- gboolean has_special_cell;
+ gboolean has_can_focus_cell;
gboolean rtl;
gint n_visible_columns;
- gint pointer_x, pointer_y;
gint grid_line_width;
- gboolean got_pointer = FALSE;
+ gint expander_size;
gboolean draw_vgrid_lines, draw_hgrid_lines;
+ GtkStyleContext *context;
+ gboolean parity;
rtl = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);
+ context = gtk_widget_get_style_context (widget);
gtk_widget_style_get (widget,
"horizontal-separator", &horizontal_separator,
"vertical-separator", &vertical_separator,
"allow-rules", &allow_rules,
- "focus-line-width", &focus_line_width,
NULL);
if (tree_view->priv->tree == NULL)
return TRUE;
}
- style = gtk_widget_get_style (widget);
-
bin_window_width = gdk_window_get_width (tree_view->priv->bin_window);
bin_window_height = gdk_window_get_height (tree_view->priv->bin_window);
cairo_rectangle (cr, 0, 0, bin_window_width, bin_window_height);
if (tree_view->priv->height < bin_window_height)
{
- gtk_paint_flat_box (style,
- cr,
- gtk_widget_get_state (widget),
- GTK_SHADOW_NONE,
- widget,
- "cell_even",
- 0, tree_view->priv->height,
- bin_window_width,
- bin_window_height - tree_view->priv->height);
+ gtk_style_context_save (context);
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_CELL);
+
+ gtk_render_background (context, cr,
+ 0, tree_view->priv->height,
+ bin_window_width,
+ bin_window_height - tree_view->priv->height);
+
+ gtk_style_context_restore (context);
}
if (node == NULL)
return TRUE;
/* find the path for the node */
- path = _gtk_tree_view_find_path ((GtkTreeView *)widget,
- tree,
- node);
+ path = _gtk_tree_path_new_from_rbtree (tree, node);
gtk_tree_model_get_iter (tree_view->priv->model,
&iter,
path);
depth = gtk_tree_path_get_depth (path);
gtk_tree_path_free (path);
- cursor_path = NULL;
drag_dest_path = NULL;
- if (tree_view->priv->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)
drag_dest_path = gtk_tree_row_reference_get_path (tree_view->priv->drag_dest_row);
draw_hgrid_lines =
tree_view->priv->grid_lines == GTK_TREE_VIEW_GRID_LINES_HORIZONTAL
|| tree_view->priv->grid_lines == GTK_TREE_VIEW_GRID_LINES_BOTH;
+ expander_size = gtk_tree_view_get_expander_size (tree_view);
if (draw_vgrid_lines || draw_hgrid_lines)
gtk_widget_style_get (widget, "grid-line-width", &grid_line_width, NULL);
* start at the first node of the event, and walk the tree in
* order, drawing each successive node.
*/
+
+ parity = !(_gtk_rbtree_node_get_index (tree, node) % 2);
do
{
- gboolean parity;
gboolean is_separator = FALSE;
gboolean is_first = FALSE;
gboolean is_last = FALSE;
-
+ gint n_col = 0;
+
+ parity = !parity;
is_separator = row_is_separator (tree_view, &iter, NULL);
- max_height = ROW_HEIGHT (tree_view, BACKGROUND_HEIGHT (node));
+ max_height = gtk_tree_view_get_row_height (tree_view, node);
cell_offset = 0;
highlight_x = 0; /* should match x coord of first cell */
if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
flags |= GTK_CELL_RENDERER_SELECTED;
- parity = _gtk_rbtree_node_find_parity (tree, node);
-
/* we *need* to set cell data on all cells before the call
- * to _has_special_cell, else _has_special_cell() does not
+ * to _has_can_focus_cell, else _has_can_focus_cell() does not
* return a correct value.
*/
for (list = (rtl ? g_list_last (tree_view->priv->columns) : g_list_first (tree_view->priv->columns));
node->children?TRUE:FALSE);
}
- has_special_cell = gtk_tree_view_has_special_cell (tree_view);
+ has_can_focus_cell = gtk_tree_view_has_can_focus_cell (tree_view);
for (list = (rtl ? g_list_last (tree_view->priv->columns) : g_list_first (tree_view->priv->columns));
list;
list = (rtl ? list->prev : list->next))
{
GtkTreeViewColumn *column = list->data;
- const gchar *detail = NULL;
- gchar new_detail[128];
+ GtkRegionFlags row_flags = 0, column_flags = 0;
+ GtkStateFlags state = 0;
gint width;
- GtkStateType state;
+ gboolean draw_focus;
if (!gtk_tree_view_column_get_visible (column))
continue;
+ n_col++;
width = gtk_tree_view_column_get_width (column);
if (cell_offset > clip.x + clip.width ||
else
flags &= ~GTK_CELL_RENDERER_SORTED;
- if (cursor == node)
+ if (tree_view->priv->cursor_node == node)
flags |= GTK_CELL_RENDERER_FOCUSED;
else
flags &= ~GTK_CELL_RENDERER_FOCUSED;
+ if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PARENT))
+ flags |= GTK_CELL_RENDERER_EXPANDABLE;
+ else
+ flags &= ~GTK_CELL_RENDERER_EXPANDABLE;
+
+ if (node->children)
+ flags |= GTK_CELL_RENDERER_EXPANDED;
+ else
+ flags &= ~GTK_CELL_RENDERER_EXPANDED;
+
background_area.x = cell_offset;
background_area.width = width;
*/
if (allow_rules && tree_view->priv->has_rules)
{
- if ((flags & GTK_CELL_RENDERER_SORTED) &&
- n_visible_columns >= 3)
- {
- 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) &&
- n_visible_columns >= 3)
- {
- if (parity)
- detail = "cell_odd_sorted";
- else
- detail = "cell_even_sorted";
- }
+ if (parity)
+ row_flags |= GTK_REGION_ODD;
else
- {
- if (parity)
- detail = "cell_odd";
- else
- detail = "cell_even";
- }
+ row_flags |= GTK_REGION_EVEN;
}
- g_assert (detail);
-
- if (gtk_widget_get_state (widget) == GTK_STATE_INSENSITIVE)
- state = GTK_STATE_INSENSITIVE;
- else if (flags & GTK_CELL_RENDERER_SELECTED)
- state = GTK_STATE_SELECTED;
- else
- state = GTK_STATE_NORMAL;
+ if ((flags & GTK_CELL_RENDERER_SORTED) &&
+ n_visible_columns >= 3)
+ column_flags |= GTK_REGION_SORTED;
- /* Draw background */
is_first = (rtl ? !list->next : !list->prev);
is_last = (rtl ? !list->prev : !list->next);
- /* (I don't like the snprintfs either, but couldn't find a
- * less messy way).
- */
- if (is_first && is_last)
- g_snprintf (new_detail, 127, "%s", detail);
- else if (is_first)
- g_snprintf (new_detail, 127, "%s_start", detail);
- else if (is_last)
- g_snprintf (new_detail, 127, "%s_end", detail);
- else
- g_snprintf (new_detail, 127, "%s_middle", detail);
-
- gtk_paint_flat_box (style,
- cr,
- state,
- GTK_SHADOW_NONE,
- widget,
- new_detail,
- background_area.x,
- background_area.y,
- background_area.width,
- background_area.height);
+ if (is_first)
+ column_flags |= GTK_REGION_FIRST;
+
+ if (is_last)
+ column_flags |= GTK_REGION_LAST;
+
+ if ((n_col % 2) == 0)
+ column_flags |= GTK_REGION_EVEN;
+ else
+ column_flags |= GTK_REGION_ODD;
+
+ gtk_style_context_save (context);
+
+ state = gtk_cell_renderer_get_state (NULL, widget, flags);
+ gtk_style_context_set_state (context, state);
+
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_CELL);
+ gtk_style_context_add_region (context, GTK_STYLE_REGION_ROW, row_flags);
+ gtk_style_context_add_region (context, GTK_STYLE_REGION_COLUMN, column_flags);
+
+ if (node == tree_view->priv->cursor_node && has_can_focus_cell
+ && ((column == tree_view->priv->focus_column
+ && tree_view->priv->draw_keyfocus &&
+ gtk_widget_has_visible_focus (widget))
+ || (column == tree_view->priv->edited_column)))
+ draw_focus = TRUE;
+ else
+ draw_focus = FALSE;
+
+ /* Draw background */
+ gtk_render_background (context, cr,
+ background_area.x,
+ background_area.y,
+ background_area.width,
+ background_area.height);
+
+ /* Draw frame */
+ gtk_render_frame (context, cr,
+ background_area.x,
+ background_area.y,
+ background_area.width,
+ background_area.height);
if (gtk_tree_view_is_expander_column (tree_view, column))
{
cell_area.x += (depth - 1) * tree_view->priv->level_indentation;
cell_area.width -= (depth - 1) * tree_view->priv->level_indentation;
- if (TREE_VIEW_DRAW_EXPANDERS(tree_view))
+ if (gtk_tree_view_draw_expanders (tree_view))
{
+ int expander_size = gtk_tree_view_get_expander_size (tree_view);
if (!rtl)
- cell_area.x += depth * tree_view->priv->expander_size;
- cell_area.width -= depth * tree_view->priv->expander_size;
+ cell_area.x += depth * expander_size;
+ cell_area.width -= depth * expander_size;
}
/* If we have an expander column, the highlight underline
expander_cell_width = cell_area.width;
if (is_separator)
- gtk_paint_hline (style,
- cr,
- state,
- widget,
- NULL,
- cell_area.x,
- cell_area.x + cell_area.width,
- cell_area.y + cell_area.height / 2);
+ {
+ gtk_style_context_save (context);
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_SEPARATOR);
+
+ gtk_render_line (context, cr,
+ cell_area.x,
+ cell_area.y + cell_area.height / 2,
+ cell_area.x + cell_area.width,
+ cell_area.y + cell_area.height / 2);
+
+ gtk_style_context_restore (context);
+ }
else
- _gtk_tree_view_column_cell_render (column,
- cr,
- &background_area,
- &cell_area,
- flags);
- if (TREE_VIEW_DRAW_EXPANDERS(tree_view)
+ {
+ _gtk_tree_view_column_cell_render (column,
+ cr,
+ &background_area,
+ &cell_area,
+ flags,
+ draw_focus);
+ }
+
+ if (gtk_tree_view_draw_expanders (tree_view)
&& (node->flags & GTK_RBNODE_IS_PARENT) == GTK_RBNODE_IS_PARENT)
{
- if (!got_pointer)
- {
- gdk_window_get_pointer (tree_view->priv->bin_window,
- &pointer_x, &pointer_y, NULL);
- got_pointer = TRUE;
- }
-
gtk_tree_view_draw_arrow (GTK_TREE_VIEW (widget),
cr,
tree,
- node,
- pointer_x, pointer_y);
+ node);
}
}
else
{
if (is_separator)
- gtk_paint_hline (style,
- cr,
- state,
- widget,
- NULL,
- cell_area.x,
- cell_area.x + cell_area.width,
- cell_area.y + cell_area.height / 2);
+ {
+ gtk_style_context_save (context);
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_SEPARATOR);
+
+ gtk_render_line (context, cr,
+ cell_area.x,
+ cell_area.y + cell_area.height / 2,
+ cell_area.x + cell_area.width,
+ cell_area.y + cell_area.height / 2);
+
+ gtk_style_context_restore (context);
+ }
else
_gtk_tree_view_column_cell_render (column,
cr,
&background_area,
&cell_area,
- flags);
+ flags,
+ draw_focus);
}
if (draw_hgrid_lines)
{
gtk_tree_view_draw_line (tree_view, cr,
GTK_TREE_VIEW_TREE_LINE,
- x + tree_view->priv->expander_size * (depth - 1.5) * mult,
+ x + expander_size * (depth - 1.5) * mult,
y1,
- x + tree_view->priv->expander_size * (depth - 1.1) * mult,
+ x + expander_size * (depth - 1.1) * mult,
y1);
}
else if (depth > 1)
{
gtk_tree_view_draw_line (tree_view, cr,
GTK_TREE_VIEW_TREE_LINE,
- x + tree_view->priv->expander_size * (depth - 1.5) * mult,
+ x + expander_size * (depth - 1.5) * mult,
y1,
- x + tree_view->priv->expander_size * (depth - 0.5) * mult,
+ x + expander_size * (depth - 0.5) * mult,
y1);
}
if (!_gtk_rbtree_next (tree, node))
gtk_tree_view_draw_line (tree_view, cr,
GTK_TREE_VIEW_TREE_LINE,
- x + tree_view->priv->expander_size * (depth - 1.5) * mult,
+ x + expander_size * (depth - 1.5) * mult,
y0,
- x + tree_view->priv->expander_size * (depth - 1.5) * mult,
+ x + expander_size * (depth - 1.5) * mult,
y1);
else
gtk_tree_view_draw_line (tree_view, cr,
GTK_TREE_VIEW_TREE_LINE,
- x + tree_view->priv->expander_size * (depth - 1.5) * mult,
+ x + expander_size * (depth - 1.5) * mult,
y0,
- x + tree_view->priv->expander_size * (depth - 1.5) * mult,
+ x + expander_size * (depth - 1.5) * mult,
y2);
tmp_node = tree->parent_node;
if (_gtk_rbtree_next (tmp_tree, tmp_node))
gtk_tree_view_draw_line (tree_view, cr,
GTK_TREE_VIEW_TREE_LINE,
- x + tree_view->priv->expander_size * (i - 0.5) * mult,
+ x + expander_size * (i - 0.5) * mult,
y0,
- x + tree_view->priv->expander_size * (i - 0.5) * mult,
+ x + expander_size * (i - 0.5) * mult,
y2);
tmp_node = tmp_tree->parent_node;
}
}
- if (node == cursor && has_special_cell &&
- ((column == tree_view->priv->focus_column &&
- GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_DRAW_KEYFOCUS) &&
- gtk_widget_has_focus (widget)) ||
- (column == tree_view->priv->edited_column)))
- {
- _gtk_tree_view_column_cell_draw_focus (column,
- cr,
- &background_area,
- &cell_area,
- flags);
- }
-
+ gtk_style_context_restore (context);
cell_offset += gtk_tree_view_column_get_width (column);
}
GtkRBTree *tree = NULL;
GtkRBNode *node = NULL;
+ gtk_style_context_save (context);
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_DND);
+
switch (tree_view->priv->drag_dest_pos)
{
case GTK_TREE_VIEW_DROP_BEFORE:
if (tree == NULL)
break;
- gtk_paint_focus (style,
- cr,
- gtk_widget_get_state (widget),
- widget,
- (is_first
- ? (is_last ? "treeview-drop-indicator" : "treeview-drop-indicator-left" )
- : (is_last ? "treeview-drop-indicator-right" : "tree-view-drop-indicator-middle" )),
- 0, BACKGROUND_FIRST_PIXEL (tree_view, tree, node)
- - focus_line_width / 2,
- gdk_window_get_width (tree_view->priv->bin_window),
- ROW_HEIGHT (tree_view, BACKGROUND_HEIGHT (node))
- - focus_line_width + 1);
+ gtk_render_frame (context, cr,
+ 0, gtk_tree_view_get_row_y_offset (tree_view, tree, node),
+ gdk_window_get_width (tree_view->priv->bin_window),
+ gtk_tree_view_get_row_height (tree_view, node));
break;
}
rtl ? 0 : bin_window_width,
highlight_y);
}
+
+ gtk_style_context_restore (context);
}
/* draw the big row-spanning focus rectangle, if needed */
- if (!has_special_cell && node == cursor &&
- GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_DRAW_KEYFOCUS) &&
- gtk_widget_has_focus (widget))
+ if (!has_can_focus_cell && node == tree_view->priv->cursor_node &&
+ tree_view->priv->draw_keyfocus &&
+ gtk_widget_has_visible_focus (widget))
{
gint tmp_y, tmp_height;
- GtkStateType focus_rect_state;
+ GtkStateFlags focus_rect_state = 0;
+
+ gtk_style_context_save (context);
- focus_rect_state =
- flags & GTK_CELL_RENDERER_SELECTED ? GTK_STATE_SELECTED :
- (flags & GTK_CELL_RENDERER_PRELIT ? GTK_STATE_PRELIGHT :
- (flags & GTK_CELL_RENDERER_INSENSITIVE ? GTK_STATE_INSENSITIVE :
- GTK_STATE_NORMAL));
+ focus_rect_state = gtk_cell_renderer_get_state (NULL, widget, flags);
+ gtk_style_context_set_state (context, focus_rect_state);
if (draw_hgrid_lines)
{
- tmp_y = BACKGROUND_FIRST_PIXEL (tree_view, tree, node) + grid_line_width / 2;
- tmp_height = ROW_HEIGHT (tree_view, BACKGROUND_HEIGHT (node)) - grid_line_width;
+ tmp_y = gtk_tree_view_get_row_y_offset (tree_view, tree, node) + grid_line_width / 2;
+ tmp_height = gtk_tree_view_get_row_height (tree_view, node) - grid_line_width;
}
else
{
- tmp_y = BACKGROUND_FIRST_PIXEL (tree_view, tree, node);
- tmp_height = ROW_HEIGHT (tree_view, BACKGROUND_HEIGHT (node));
+ tmp_y = gtk_tree_view_get_row_y_offset (tree_view, tree, node);
+ tmp_height = gtk_tree_view_get_row_height (tree_view, node);
}
- gtk_paint_focus (style,
- cr,
- focus_rect_state,
- widget,
- (is_first
- ? (is_last ? "treeview" : "treeview-left" )
- : (is_last ? "treeview-right" : "treeview-middle" )),
- 0, tmp_y,
- gdk_window_get_width (tree_view->priv->bin_window),
- tmp_height);
+ gtk_render_focus (context, cr,
+ 0, tmp_y,
+ gdk_window_get_width (tree_view->priv->bin_window),
+ tmp_height);
+
+ gtk_style_context_restore (context);
}
y_offset += max_height;
gboolean has_child;
tree = node->children;
- node = tree->root;
-
- g_assert (node != tree->nil);
+ node = _gtk_rbtree_first (tree);
- while (node->left != tree->nil)
- node = node->left;
has_child = gtk_tree_model_iter_children (tree_view->priv->model,
&iter,
&parent);
if (tree_view->priv->rubber_band_status == RUBBER_BAND_ACTIVE)
gtk_tree_view_paint_rubber_band (tree_view, cr);
- if (cursor_path)
- gtk_tree_path_free (cursor_path);
-
if (drag_dest_path)
gtk_tree_path_free (drag_dest_path);
cairo_t *cr)
{
GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
+ GtkWidget *button;
+ GtkStyleContext *context;
+
+ context = gtk_widget_get_style_context (widget);
+ gtk_render_background (context, cr,
+ 0, 0,
+ gtk_widget_get_allocated_width (widget),
+ gtk_widget_get_allocated_height (widget));
if (gtk_cairo_should_draw_window (cr, tree_view->priv->bin_window))
{
cairo_save (cr);
gtk_cairo_transform_to_window (cr, widget, tree_view->priv->bin_window);
-
gtk_tree_view_bin_draw (widget, cr);
cairo_restore (cr);
}
}
+ gtk_style_context_save (context);
+ gtk_style_context_remove_class (context, GTK_STYLE_CLASS_VIEW);
+
if (gtk_cairo_should_draw_window (cr, tree_view->priv->header_window))
{
GList *list;
continue;
if (gtk_tree_view_column_get_visible (column))
- gtk_container_propagate_draw (GTK_CONTAINER (tree_view),
- column->button,
- cr);
+ {
+ button = gtk_tree_view_column_get_button (column);
+ gtk_container_propagate_draw (GTK_CONTAINER (tree_view),
+ button, cr);
+ }
}
}
if (tree_view->priv->drag_window &&
gtk_cairo_should_draw_window (cr, tree_view->priv->drag_window))
{
+ button = gtk_tree_view_column_get_button (tree_view->priv->drag_column);
gtk_container_propagate_draw (GTK_CONTAINER (tree_view),
- tree_view->priv->drag_column->button,
- cr);
+ button, cr);
}
- return TRUE;
+ gtk_style_context_restore (context);
+
+ return FALSE;
}
enum
GdkEventKey *event)
{
GtkTreeView *tree_view = (GtkTreeView *) widget;
+ GtkWidget *button;
if (tree_view->priv->rubber_band_status)
{
return TRUE;
}
- if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_IN_COLUMN_DRAG))
+ if (tree_view->priv->in_column_drag)
{
if (event->keyval == GDK_KEY_Escape)
{
return TRUE;
}
- if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE))
+ if (tree_view->priv->headers_visible)
{
GList *focus_column;
gboolean rtl;
focus_column = focus_column->next)
{
GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN (focus_column->data);
-
- if (gtk_widget_has_focus (column->button))
+
+ button = gtk_tree_view_column_get_button (column);
+ if (gtk_widget_has_focus (button))
break;
}
|| event->keyval == GDK_KEY_Right || event->keyval == GDK_KEY_KP_Right))
{
GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN (focus_column->data);
- gint max_width, min_width;
+ gint column_width;
if (!gtk_tree_view_column_get_resizable (column))
{
return TRUE;
}
+ column_width = gtk_tree_view_column_get_width (column);
+
if (event->keyval == (rtl ? GDK_KEY_Right : GDK_KEY_Left)
|| event->keyval == (rtl ? GDK_KEY_KP_Right : GDK_KEY_KP_Left))
{
- GtkRequisition button_req;
- gint old_width = column->resized_width;
-
- gtk_widget_get_preferred_size (column->button, &button_req, NULL);
-
- column->resized_width = MAX (column->resized_width,
- gtk_tree_view_column_get_width (column));
- column->resized_width -= 2;
- if (column->resized_width < 0)
- column->resized_width = 0;
-
- min_width = gtk_tree_view_column_get_min_width (column);
- if (min_width == -1)
- column->resized_width = MAX (button_req.width,
- column->resized_width);
- else
- {
- column->resized_width = MAX (min_width,
- column->resized_width);
- }
-
- max_width = gtk_tree_view_column_get_max_width (column);
- if (max_width != -1)
- column->resized_width = MIN (column->resized_width, max_width);
-
- column->use_resized_width = TRUE;
-
- if (column->resized_width != old_width)
- gtk_widget_queue_resize (widget);
- else
- gtk_widget_error_bell (widget);
+ column_width = MAX (column_width - 2, 0);
}
else if (event->keyval == (rtl ? GDK_KEY_Left : GDK_KEY_Right)
|| event->keyval == (rtl ? GDK_KEY_KP_Left : GDK_KEY_KP_Right))
{
- gint old_width = column->resized_width;
-
- column->resized_width = MAX (column->resized_width,
- gtk_tree_view_column_get_width (column));
- column->resized_width += 2;
-
- max_width = gtk_tree_view_column_get_max_width (column);
- if (max_width != -1)
- column->resized_width = MIN (column->resized_width, max_width);
-
- column->use_resized_width = TRUE;
-
- if (column->resized_width != old_width)
- gtk_widget_queue_resize (widget);
- else
- gtk_widget_error_bell (widget);
+ column_width = column_width + 2;
}
+ gtk_tree_view_modify_column_width (tree_view, column, column_width);
return TRUE;
}
{
GtkTreeView *tree_view;
- if (event->mode == GDK_CROSSING_GRAB)
+ if (event->mode == GDK_CROSSING_GRAB ||
+ event->mode == GDK_CROSSING_GTK_GRAB ||
+ event->mode == GDK_CROSSING_GTK_UNGRAB)
return TRUE;
tree_view = GTK_TREE_VIEW (widget);
gint y;
y = _gtk_rbtree_node_find_offset (tree, node)
- - tree_view->priv->vadjustment->value
- + TREE_VIEW_HEADER_HEIGHT (tree_view);
+ - gtk_adjustment_get_value (tree_view->priv->vadjustment)
+ + gtk_tree_view_get_effective_header_height (tree_view);
gtk_widget_get_allocation (GTK_WIDGET (tree_view), &allocation);
gtk_widget_queue_draw_area (GTK_WIDGET (tree_view),
int height;
y = _gtk_rbtree_node_find_offset (tree, node);
- height = ROW_HEIGHT (tree_view, GTK_RBNODE_GET_HEIGHT (node));
+ height = gtk_tree_view_get_row_height (tree_view, node);
- if (y >= tree_view->priv->vadjustment->value &&
- y + height <= (tree_view->priv->vadjustment->value
- + tree_view->priv->vadjustment->page_size))
+ if (y >= gtk_adjustment_get_value (tree_view->priv->vadjustment) &&
+ y + height <= (gtk_adjustment_get_value (tree_view->priv->vadjustment)
+ + gtk_adjustment_get_page_size (tree_view->priv->vadjustment)))
return TRUE;
return FALSE;
gint height = 0;
gint horizontal_separator;
gint vertical_separator;
- gint focus_line_width;
gint depth = gtk_tree_path_get_depth (path);
gboolean retval = FALSE;
gboolean is_separator = FALSE;
gint grid_line_width;
gboolean wide_separators;
gint separator_height;
+ gint expander_size;
/* double check the row needs validating */
if (! GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID) &&
gtk_widget_style_get (GTK_WIDGET (tree_view),
"focus-padding", &focus_pad,
- "focus-line-width", &focus_line_width,
"horizontal-separator", &horizontal_separator,
"vertical-separator", &vertical_separator,
"grid-line-width", &grid_line_width,
draw_hgrid_lines =
tree_view->priv->grid_lines == GTK_TREE_VIEW_GRID_LINES_HORIZONTAL
|| tree_view->priv->grid_lines == GTK_TREE_VIEW_GRID_LINES_BOTH;
+ expander_size = gtk_tree_view_get_expander_size (tree_view);
for (last_column = g_list_last (tree_view->priv->columns);
last_column &&
for (list = tree_view->priv->columns; list; list = list->next)
{
- gint tmp_width;
- gint tmp_height;
+ gint padding = 0;
+ gint original_width;
+ gint new_width;
+ gint row_height;
column = list->data;
if (!gtk_tree_view_column_get_visible (column))
continue;
- if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_COLUMN_INVALID) && !column->dirty)
+ if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_COLUMN_INVALID) &&
+ !_gtk_tree_view_column_cell_get_dirty (column))
continue;
+ original_width = _gtk_tree_view_column_get_requested_width (column);
+
gtk_tree_view_column_cell_set_cell_data (column, tree_view->priv->model, iter,
GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PARENT),
node->children?TRUE:FALSE);
gtk_tree_view_column_cell_get_size (column,
NULL, NULL, NULL,
- &tmp_width, &tmp_height);
+ NULL, &row_height);
if (!is_separator)
{
- tmp_height += vertical_separator;
- height = MAX (height, tmp_height);
- height = MAX (height, tree_view->priv->expander_size);
+ row_height += vertical_separator;
+ height = MAX (height, row_height);
+ height = MAX (height, expander_size);
}
else
{
if (gtk_tree_view_is_expander_column (tree_view, column))
{
- tmp_width = tmp_width + horizontal_separator + (depth - 1) * tree_view->priv->level_indentation;
+ padding += horizontal_separator + (depth - 1) * tree_view->priv->level_indentation;
- if (TREE_VIEW_DRAW_EXPANDERS (tree_view))
- tmp_width += depth * tree_view->priv->expander_size;
+ if (gtk_tree_view_draw_expanders (tree_view))
+ padding += depth * expander_size;
}
else
- tmp_width = tmp_width + horizontal_separator;
+ padding += horizontal_separator;
if (draw_vgrid_lines)
{
if (list->data == first_column || list->data == last_column)
- tmp_width += grid_line_width / 2.0;
+ padding += grid_line_width / 2.0;
else
- tmp_width += grid_line_width;
+ padding += grid_line_width;
}
- if (tmp_width > column->requested_width)
- {
- retval = TRUE;
- column->requested_width = tmp_width;
- }
+ /* Update the padding for the column */
+ _gtk_tree_view_column_push_padding (column, padding);
+ new_width = _gtk_tree_view_column_get_requested_width (column);
+
+ if (new_width > original_width)
+ retval = TRUE;
}
if (draw_hgrid_lines)
_gtk_rbtree_node_set_height (tree, node, height);
}
_gtk_rbtree_node_mark_valid (tree, node);
- tree_view->priv->post_validation_flag = TRUE;
return retval;
}
return;
gtk_widget_get_allocation (GTK_WIDGET (tree_view), &allocation);
- total_height = allocation.height - TREE_VIEW_HEADER_HEIGHT (tree_view);
+ total_height = allocation.height - gtk_tree_view_get_effective_header_height (tree_view);
if (total_height == 0)
return;
if (tree_view->priv->scroll_to_use_align)
{
- gint height = ROW_HEIGHT (tree_view, GTK_RBNODE_GET_HEIGHT (node));
+ gint height = gtk_tree_view_get_row_height (tree_view, node);
area_above = (total_height - height) *
tree_view->priv->scroll_to_row_align;
area_below = total_height - area_above - height;
* 2) row visible
*/
gint dy;
- gint height = ROW_HEIGHT (tree_view, GTK_RBNODE_GET_HEIGHT (node));
+ gint height = gtk_tree_view_get_row_height (tree_view, node);
dy = _gtk_rbtree_node_find_offset (tree, node);
- if (dy >= tree_view->priv->vadjustment->value &&
- dy + height <= (tree_view->priv->vadjustment->value
- + tree_view->priv->vadjustment->page_size))
+ if (dy >= gtk_adjustment_get_value (tree_view->priv->vadjustment) &&
+ dy + height <= (gtk_adjustment_get_value (tree_view->priv->vadjustment)
+ + gtk_adjustment_get_page_size (tree_view->priv->vadjustment)))
{
/* row visible: keep the row at the same position */
- area_above = dy - tree_view->priv->vadjustment->value;
- area_below = (tree_view->priv->vadjustment->value +
- tree_view->priv->vadjustment->page_size)
+ area_above = dy - gtk_adjustment_get_value (tree_view->priv->vadjustment);
+ area_below = (gtk_adjustment_get_value (tree_view->priv->vadjustment) +
+ gtk_adjustment_get_page_size (tree_view->priv->vadjustment))
- dy - height;
}
else
{
/* row not visible */
if (dy >= 0
- && dy + height <= tree_view->priv->vadjustment->page_size)
+ && dy + height <= gtk_adjustment_get_page_size (tree_view->priv->vadjustment))
{
/* row at the beginning -- fixed */
area_above = dy;
- area_below = tree_view->priv->vadjustment->page_size
+ area_below = gtk_adjustment_get_page_size (tree_view->priv->vadjustment)
- area_above - height;
}
- else if (dy >= (tree_view->priv->vadjustment->upper -
- tree_view->priv->vadjustment->page_size))
+ else if (dy >= (gtk_adjustment_get_upper (tree_view->priv->vadjustment) -
+ gtk_adjustment_get_page_size (tree_view->priv->vadjustment)))
{
/* row at the end -- fixed */
- area_above = dy - (tree_view->priv->vadjustment->upper -
- tree_view->priv->vadjustment->page_size);
- area_below = tree_view->priv->vadjustment->page_size -
+ area_above = dy - (gtk_adjustment_get_upper (tree_view->priv->vadjustment) -
+ gtk_adjustment_get_page_size (tree_view->priv->vadjustment));
+ area_below = gtk_adjustment_get_page_size (tree_view->priv->vadjustment) -
area_above - height;
if (area_below < 0)
{
- area_above = tree_view->priv->vadjustment->page_size - height;
+ area_above = gtk_adjustment_get_page_size (tree_view->priv->vadjustment) - height;
area_below = 0;
}
}
}
else
{
- path = _gtk_tree_view_find_path (tree_view, tree, node);
+ path = _gtk_tree_path_new_from_rbtree (tree, node);
total_height += offset;
}
size_changed = TRUE;
}
area_above = 0;
- area_below = total_height - ROW_HEIGHT (tree_view, GTK_RBNODE_GET_HEIGHT (node));
+ area_below = total_height - gtk_tree_view_get_row_height (tree_view, node);
}
above_path = gtk_tree_path_copy (path);
GtkTreePath *tmppath;
GtkTreeIter tmpiter;
- tmppath = _gtk_tree_view_find_path (tree_view, tmptree, tmpnode);
+ tmppath = _gtk_tree_path_new_from_rbtree (tmptree, tmpnode);
gtk_tree_model_get_iter (tree_view->priv->model, &tmpiter, tmppath);
if (GTK_RBNODE_FLAG_SET (tmpnode, GTK_RBNODE_INVALID) ||
gboolean has_child;
tree = node->children;
- node = tree->root;
-
- g_assert (node != tree->nil);
+ node = _gtk_rbtree_first (tree);
- while (node->left != tree->nil)
- node = node->left;
has_child = gtk_tree_model_iter_children (tree_view->priv->model,
&iter,
&parent);
size_changed = TRUE;
}
- area_below -= ROW_HEIGHT (tree_view, GTK_RBNODE_GET_HEIGHT (node));
+ area_below -= gtk_tree_view_get_row_height (tree_view, node);
}
gtk_tree_path_free (path);
break;
gtk_tree_path_free (above_path);
- above_path = _gtk_tree_view_find_path (tree_view, tree, node);
+ above_path = _gtk_tree_path_new_from_rbtree (tree, node);
gtk_tree_model_get_iter (tree_view->priv->model, &iter, above_path);
if (validate_row (tree_view, tree, node, &iter, above_path))
size_changed = TRUE;
}
- area_above -= ROW_HEIGHT (tree_view, GTK_RBNODE_GET_HEIGHT (node));
+ area_above -= gtk_tree_view_get_row_height (tree_view, node);
}
/* if we scrolled to a path, we need to set the dy here,
need_redraw = TRUE;
}
- else if (tree_view->priv->height <= tree_view->priv->vadjustment->page_size)
+ else if (tree_view->priv->height <= gtk_adjustment_get_page_size (tree_view->priv->vadjustment))
{
/* when we are not scrolling, we should never set dy to something
* else than zero. we update top_row to be in sync with dy = 0.
gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment), 0);
gtk_tree_view_dy_to_top_row (tree_view);
}
- else if (tree_view->priv->vadjustment->value + tree_view->priv->vadjustment->page_size > tree_view->priv->height)
+ else if (gtk_adjustment_get_value (tree_view->priv->vadjustment) + gtk_adjustment_get_page_size (tree_view->priv->vadjustment) > tree_view->priv->height)
{
- gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment), tree_view->priv->height - tree_view->priv->vadjustment->page_size);
+ gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment), tree_view->priv->height - gtk_adjustment_get_page_size (tree_view->priv->vadjustment));
gtk_tree_view_dy_to_top_row (tree_view);
}
else
gtk_widget_get_preferred_size (GTK_WIDGET (tree_view),
&requisition, NULL);
- tree_view->priv->hadjustment->upper = MAX (tree_view->priv->hadjustment->upper, (gfloat)requisition.width);
- tree_view->priv->vadjustment->upper = MAX (tree_view->priv->vadjustment->upper, (gfloat)requisition.height);
- gtk_adjustment_changed (tree_view->priv->hadjustment);
- gtk_adjustment_changed (tree_view->priv->vadjustment);
+ gtk_adjustment_set_upper (tree_view->priv->hadjustment,
+ MAX (gtk_adjustment_get_upper (tree_view->priv->hadjustment), requisition.width));
+ gtk_adjustment_set_upper (tree_view->priv->vadjustment,
+ MAX (gtk_adjustment_get_upper (tree_view->priv->vadjustment), requisition.height));
gtk_widget_queue_resize (GTK_WIDGET (tree_view));
}
tree = tree_view->priv->tree;
node = tree->root;
- path = _gtk_tree_view_find_path (tree_view, tree, node);
+ path = _gtk_tree_path_new_from_rbtree (tree, node);
gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
validate_row (tree_view, tree, node, &iter, path);
gtk_tree_path_free (path);
- tree_view->priv->fixed_height = ROW_HEIGHT (tree_view, GTK_RBNODE_GET_HEIGHT (node));
+ tree_view->priv->fixed_height = gtk_tree_view_get_row_height (tree_view, node);
}
_gtk_rbtree_set_fixed_height (tree_view->priv->tree,
static gboolean
do_validate_rows (GtkTreeView *tree_view, gboolean queue_resize)
{
+ static gboolean prevent_recursion_hack = FALSE;
+
GtkRBTree *tree = NULL;
GtkRBNode *node = NULL;
gboolean validated_area = FALSE;
GTimer *timer;
gint i = 0;
+ gint y = -1;
gint prev_height = -1;
gboolean fixed_height = TRUE;
g_assert (tree_view);
+ /* prevent infinite recursion via get_preferred_width() */
+ if (prevent_recursion_hack)
+ return FALSE;
+
if (tree_view->priv->tree == NULL)
return FALSE;
do
{
+ gboolean changed = FALSE;
+
if (! GTK_RBNODE_FLAG_SET (tree_view->priv->tree->root, GTK_RBNODE_DESCENDANTS_INVALID))
{
retval = FALSE;
do
{
- if (node->left != tree->nil &&
+ if (!_gtk_rbtree_is_nil (node->left) &&
GTK_RBNODE_FLAG_SET (node->left, GTK_RBNODE_DESCENDANTS_INVALID))
{
node = node->left;
}
- else if (node->right != tree->nil &&
+ else if (!_gtk_rbtree_is_nil (node->right) &&
GTK_RBNODE_FLAG_SET (node->right, GTK_RBNODE_DESCENDANTS_INVALID))
{
node = node->right;
g_assert_not_reached ();
}
while (TRUE);
- path = _gtk_tree_view_find_path (tree_view, tree, node);
+ path = _gtk_tree_path_new_from_rbtree (tree, node);
gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
}
- validated_area = validate_row (tree_view, tree, node, &iter, path) ||
- validated_area;
+ changed = validate_row (tree_view, tree, node, &iter, path);
+ validated_area = changed || validated_area;
+
+ if (changed)
+ {
+ gint offset = gtk_tree_view_get_row_y_offset (tree_view, tree, node);
+
+ if (y == -1 || y > offset)
+ y = offset;
+ }
if (!tree_view->priv->fixed_height_check)
{
gint height;
- height = ROW_HEIGHT (tree_view, GTK_RBNODE_GET_HEIGHT (node));
+ height = gtk_tree_view_get_row_height (tree_view, node);
if (prev_height < 0)
prev_height = height;
else if (prev_height != height)
* Currently bypassing this but the real solution is to not update the scroll adjustments
* untill we've recieved an allocation (never update scroll adjustments from size-requests).
*/
- gtk_tree_view_size_request (GTK_WIDGET (tree_view), &requisition);
+ prevent_recursion_hack = TRUE;
+ gtk_tree_view_get_preferred_width (GTK_WIDGET (tree_view), &requisition.width, NULL);
+ gtk_tree_view_get_preferred_height (GTK_WIDGET (tree_view), &requisition.height, NULL);
+ prevent_recursion_hack = FALSE;
+
+ /* If rows above the current position have changed height, this has
+ * affected the current view and thus needs a redraw.
+ */
+ if (y != -1 && y < gtk_adjustment_get_value (tree_view->priv->vadjustment))
+ gtk_widget_queue_draw (GTK_WIDGET (tree_view));
- tree_view->priv->hadjustment->upper = MAX (tree_view->priv->hadjustment->upper, (gfloat)requisition.width);
- tree_view->priv->vadjustment->upper = MAX (tree_view->priv->vadjustment->upper, (gfloat)requisition.height);
- gtk_adjustment_changed (tree_view->priv->hadjustment);
- gtk_adjustment_changed (tree_view->priv->vadjustment);
+ gtk_adjustment_set_upper (tree_view->priv->hadjustment,
+ MAX (gtk_adjustment_get_upper (tree_view->priv->hadjustment), requisition.width));
+ gtk_adjustment_set_upper (tree_view->priv->vadjustment,
+ MAX (gtk_adjustment_get_upper (tree_view->priv->vadjustment), requisition.height));
if (queue_resize)
- gtk_widget_queue_resize (GTK_WIDGET (tree_view));
+ gtk_widget_queue_resize_no_redraw (GTK_WIDGET (tree_view));
}
if (path) gtk_tree_path_free (path);
gtk_widget_get_preferred_size (GTK_WIDGET (tree_view),
&requisition, NULL);
- tree_view->priv->hadjustment->upper = MAX (tree_view->priv->hadjustment->upper, (gfloat)requisition.width);
- tree_view->priv->vadjustment->upper = MAX (tree_view->priv->vadjustment->upper, (gfloat)requisition.height);
- gtk_adjustment_changed (tree_view->priv->hadjustment);
- gtk_adjustment_changed (tree_view->priv->vadjustment);
+ gtk_adjustment_set_upper (tree_view->priv->hadjustment,
+ MAX (gtk_adjustment_get_upper (tree_view->priv->hadjustment), requisition.width));
+ gtk_adjustment_set_upper (tree_view->priv->vadjustment,
+ MAX (gtk_adjustment_get_upper (tree_view->priv->vadjustment), requisition.height));
gtk_widget_queue_resize (GTK_WIDGET (tree_view));
}
}
}
-static void
-gtk_tree_view_bin_process_updates (GtkTreeView *tree_view)
-{
- /* Prior to drawing, we make sure the visible area is validated. */
- if (tree_view->priv->presize_handler_timer)
- {
- g_source_remove (tree_view->priv->presize_handler_timer);
- tree_view->priv->presize_handler_timer = 0;
-
- do_presize_handler (tree_view);
- }
-
- gdk_window_process_updates (tree_view->priv->bin_window, TRUE);
-}
-
static gboolean
scroll_sync_handler (GtkTreeView *tree_view)
{
- if (tree_view->priv->height <= tree_view->priv->vadjustment->page_size)
+ if (tree_view->priv->height <= gtk_adjustment_get_page_size (tree_view->priv->vadjustment))
gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment), 0);
else if (gtk_tree_row_reference_valid (tree_view->priv->top_row))
gtk_tree_view_top_row_to_dy (tree_view);
}
else
{
- path = _gtk_tree_view_find_path (tree_view, tree, node);
+ path = _gtk_tree_path_new_from_rbtree (tree, node);
gtk_tree_view_set_top_row (tree_view, path, offset);
gtk_tree_path_free (path);
}
return;
}
- if (ROW_HEIGHT (tree_view, BACKGROUND_HEIGHT (node))
+ if (gtk_tree_view_get_row_height (tree_view, node)
< tree_view->priv->top_row_dy)
{
/* new top row -- do NOT install the idle handler */
new_dy = _gtk_rbtree_node_find_offset (tree, node);
new_dy += tree_view->priv->top_row_dy;
- if (new_dy + tree_view->priv->vadjustment->page_size > tree_view->priv->height)
- new_dy = tree_view->priv->height - tree_view->priv->vadjustment->page_size;
+ if (new_dy + gtk_adjustment_get_page_size (tree_view->priv->vadjustment) > tree_view->priv->height)
+ new_dy = tree_view->priv->height - gtk_adjustment_get_page_size (tree_view->priv->vadjustment);
new_dy = MAX (0, new_dy);
void
-_gtk_tree_view_install_mark_rows_col_dirty (GtkTreeView *tree_view)
+_gtk_tree_view_install_mark_rows_col_dirty (GtkTreeView *tree_view,
+ gboolean install_handler)
{
tree_view->priv->mark_rows_col_dirty = TRUE;
- install_presize_handler (tree_view);
+ if (install_handler)
+ install_presize_handler (tree_view);
}
/*
GtkTreeViewColumn *column = NULL;
GdkRectangle visible_rect;
- GDK_THREADS_ENTER ();
+ gdk_threads_enter ();
tree_view = GTK_TREE_VIEW (data);
- gdk_window_get_pointer (tree_view->priv->bin_window,
- &x, &y, &state);
+ gdk_window_get_device_position (tree_view->priv->bin_window,
+ gdk_device_manager_get_client_pointer (
+ gdk_display_get_device_manager (
+ gtk_widget_get_display (GTK_WIDGET (tree_view)))),
+ &x, &y, &state);
gtk_tree_view_get_visible_rect (tree_view, &visible_rect);
}
}
- GDK_THREADS_LEAVE ();
+ gdk_threads_leave ();
return TRUE;
}
di = get_info (tree_view);
- if (di == NULL || y - TREE_VIEW_HEADER_HEIGHT (tree_view) < 0)
+ if (di == NULL || y - gtk_tree_view_get_effective_header_height (tree_view) < 0)
{
/* someone unset us as a drag dest, note that if
* we return FALSE drag_leave isn't called
&cell_x,
&cell_y);
- g_return_if_fail (path != NULL);
+ /* If path is NULL, there's nothing we can drag. For now, we silently
+ * bail out. Actually, dragging should not be possible from an empty
+ * tree view, but there's no way we can cancel that from here.
+ * Automatically unsetting the tree view as drag source for empty models
+ * is something that would likely break other people's code ...
+ */
+ if (!path)
+ return;
row_pix = gtk_tree_view_create_row_drag_icon (tree_view,
path);
(gdk_drag_context_get_selected_action (context) == GDK_ACTION_MOVE),
time);
- if (gtk_tree_path_get_depth (dest_row) == 1
- && gtk_tree_path_get_indices (dest_row)[0] == 0)
+ if (gtk_tree_path_get_depth (dest_row) == 1 &&
+ gtk_tree_path_get_indices (dest_row)[0] == 0 &&
+ gtk_tree_model_iter_n_children (tree_view->priv->model, NULL) != 0)
{
/* special special case drag to "0", scroll to first item */
if (!tree_view->priv->scroll_to_path)
while (tmp_list)
{
GtkTreeViewColumn *column;
+ GtkWidget *button;
+
column = tmp_list->data;
- if (column->button == widget)
+ button = gtk_tree_view_column_get_button (column);
+
+ if (button == widget)
{
gtk_widget_unparent (widget);
return;
GtkTreeView *tree_view = GTK_TREE_VIEW (container);
GtkTreeViewChild *child = NULL;
GtkTreeViewColumn *column;
+ GtkWidget *button;
GList *tmp_list;
tmp_list = tree_view->priv->children;
for (tmp_list = tree_view->priv->columns; tmp_list; tmp_list = tmp_list->next)
{
column = tmp_list->data;
+ button = gtk_tree_view_column_get_button (column);
- if (column->button)
- (* callback) (column->button, callback_data);
+ if (button)
+ (* callback) (button, callback_data);
}
}
-/* Returns TRUE if the treeview contains no "special" (editable or activatable)
- * cells. If so we draw one big row-spanning focus rectangle.
+/* Returns TRUE is any of the columns contains a cell that can-focus.
+ * If this is not the case, a column-spanning focus rectangle will be
+ * drawn.
*/
static gboolean
-gtk_tree_view_has_special_cell (GtkTreeView *tree_view)
+gtk_tree_view_has_can_focus_cell (GtkTreeView *tree_view)
{
GList *list;
for (list = tree_view->priv->columns; list; list = list->next)
{
- if (!gtk_tree_view_column_get_visible (GTK_TREE_VIEW_COLUMN (list->data)))
+ GtkTreeViewColumn *column = list->data;
+
+ if (!gtk_tree_view_column_get_visible (column))
continue;
- if (_gtk_tree_view_column_count_special_cells (list->data))
+ if (gtk_cell_area_is_activatable (gtk_cell_layout_get_area (GTK_CELL_LAYOUT (column))))
return TRUE;
}
{
tree_view->priv->fixed_height_mode = 0;
tree_view->priv->fixed_height = -1;
-
- /* force a revalidation */
- install_presize_handler (tree_view);
}
else
{
tree_view->priv->fixed_height_mode = 1;
tree_view->priv->fixed_height = -1;
-
- if (tree_view->priv->tree)
- initialize_fixed_height_mode (tree_view);
}
+ /* force a revalidation */
+ install_presize_handler (tree_view);
+
g_object_notify (G_OBJECT (tree_view), "fixed-height-mode");
}
{
GtkTreeViewColumn *column;
GtkWidget *focus_child;
-
+ GtkWidget *button;
GList *last_column, *first_column;
GList *tmp_list;
gboolean rtl;
- if (! GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE))
+ if (! tree_view->priv->headers_visible)
return FALSE;
focus_child = gtk_container_get_focus_child (GTK_CONTAINER (tree_view));
while (first_column)
{
column = GTK_TREE_VIEW_COLUMN (first_column->data);
+ button = gtk_tree_view_column_get_button (column);
- if (gtk_widget_get_can_focus (column->button) &&
+ if (gtk_widget_get_can_focus (button) &&
gtk_tree_view_column_get_visible (column) &&
(gtk_tree_view_column_get_clickable (column) ||
gtk_tree_view_column_get_reorderable (column)))
while (last_column)
{
column = GTK_TREE_VIEW_COLUMN (last_column->data);
+ button = gtk_tree_view_column_get_button (column);
- if (gtk_widget_get_can_focus (column->button) &&
+ if (gtk_widget_get_can_focus (button) &&
gtk_tree_view_column_get_visible (column) &&
(gtk_tree_view_column_get_clickable (column) ||
gtk_tree_view_column_get_reorderable (column)))
case GTK_DIR_DOWN:
if (focus_child == NULL)
{
- if (tree_view->priv->focus_column != NULL &&
- gtk_widget_get_can_focus (tree_view->priv->focus_column->button))
- focus_child = tree_view->priv->focus_column->button;
+ if (tree_view->priv->focus_column != NULL)
+ button = gtk_tree_view_column_get_button (tree_view->priv->focus_column);
+ else
+ button = NULL;
+
+ if (button && gtk_widget_get_can_focus (button))
+ focus_child = button;
else
- focus_child = GTK_TREE_VIEW_COLUMN (first_column->data)->button;
+ focus_child = gtk_tree_view_column_get_button (GTK_TREE_VIEW_COLUMN (first_column->data));
+
gtk_widget_grab_focus (focus_child);
break;
}
if (focus_child == NULL)
{
if (tree_view->priv->focus_column != NULL)
- focus_child = tree_view->priv->focus_column->button;
+ focus_child = gtk_tree_view_column_get_button (tree_view->priv->focus_column);
else if (dir == GTK_DIR_LEFT)
- focus_child = GTK_TREE_VIEW_COLUMN (last_column->data)->button;
+ focus_child = gtk_tree_view_column_get_button (GTK_TREE_VIEW_COLUMN (last_column->data));
else
- focus_child = GTK_TREE_VIEW_COLUMN (first_column->data)->button;
+ focus_child = gtk_tree_view_column_get_button (GTK_TREE_VIEW_COLUMN (first_column->data));
+
gtk_widget_grab_focus (focus_child);
break;
}
/* 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)
+ if (gtk_tree_view_column_get_button (GTK_TREE_VIEW_COLUMN (tmp_list->data)) == focus_child)
break;
if ((tmp_list == first_column && dir == (rtl ? GTK_DIR_RIGHT : GTK_DIR_LEFT))
while (tmp_list)
{
GtkTreeViewColumn *column;
+ GtkWidget *button;
if (dir == (rtl ? GTK_DIR_LEFT : GTK_DIR_RIGHT))
tmp_list = tmp_list->next;
break;
}
column = tmp_list->data;
- if (column->button &&
+ button = gtk_tree_view_column_get_button (column);
+ if (button &&
gtk_tree_view_column_get_visible (column) &&
- gtk_widget_get_can_focus (column->button))
+ gtk_widget_get_can_focus (button))
{
- focus_child = column->button;
- gtk_widget_grab_focus (column->button);
+ focus_child = button;
+ gtk_widget_grab_focus (button);
break;
}
}
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_tree_view_column_get_button (GTK_TREE_VIEW_COLUMN (tmp_list->data)) == focus_child)
{
- tree_view->priv->focus_column = GTK_TREE_VIEW_COLUMN (tmp_list->data);
+ _gtk_tree_view_set_focus_column (tree_view, GTK_TREE_VIEW_COLUMN (tmp_list->data));
break;
}
gtk_tree_path_free (*path);
if (node)
- *path = _gtk_tree_view_find_path (tree_view, tree, node);
+ *path = _gtk_tree_path_new_from_rbtree (tree, node);
else
*path = NULL;
}
}
static void
-gtk_tree_view_style_set (GtkWidget *widget,
- GtkStyle *previous_style)
+gtk_tree_view_style_updated (GtkWidget *widget)
{
GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
- GtkStyle *style;
GList *list;
GtkTreeViewColumn *column;
+ GtkStyleContext *style_context;
+ const GtkBitmask *changes;
+
+ GTK_WIDGET_CLASS (gtk_tree_view_parent_class)->style_updated (widget);
if (gtk_widget_get_realized (widget))
{
- style = gtk_widget_get_style (widget);
- gdk_window_set_background (tree_view->priv->bin_window,
- &style->base[gtk_widget_get_state (widget)]);
- gtk_style_set_background (style, tree_view->priv->header_window, GTK_STATE_NORMAL);
+ gtk_tree_view_ensure_background (tree_view);
gtk_tree_view_set_grid_lines (tree_view, tree_view->priv->grid_lines);
gtk_tree_view_set_enable_tree_lines (tree_view, tree_view->priv->tree_lines_enabled);
}
- gtk_widget_style_get (widget,
- "expander-size", &tree_view->priv->expander_size,
- NULL);
- tree_view->priv->expander_size += EXPANDER_EXTRA_PADDING;
-
- for (list = tree_view->priv->columns; list; list = list->next)
+ style_context = gtk_widget_get_style_context (widget);
+ changes = _gtk_style_context_get_changes (style_context);
+ if (changes == NULL || _gtk_css_style_property_changes_affect_size (changes))
{
- column = list->data;
- _gtk_tree_view_column_cell_set_dirty (column, TRUE);
- }
-
- tree_view->priv->fixed_height = -1;
- _gtk_rbtree_mark_invalid (tree_view->priv->tree);
+ for (list = tree_view->priv->columns; list; list = list->next)
+ {
+ column = list->data;
+ _gtk_tree_view_column_cell_set_dirty (column, TRUE);
+ }
- gtk_widget_queue_resize (widget);
+ tree_view->priv->fixed_height = -1;
+ _gtk_rbtree_mark_invalid (tree_view->priv->tree);
+ }
}
for (list = tree_view->priv->columns; list; list = list->next)
{
- if (GTK_TREE_VIEW_COLUMN (list->data)->button == child)
+ if (gtk_tree_view_column_get_button (GTK_TREE_VIEW_COLUMN (list->data)) == child)
{
- tree_view->priv->focus_column = GTK_TREE_VIEW_COLUMN (list->data);
+ _gtk_tree_view_set_focus_column (tree_view, GTK_TREE_VIEW_COLUMN (list->data));
break;
}
}
GTK_CONTAINER_CLASS (gtk_tree_view_parent_class)->set_focus_child (container, child);
}
+static GtkWidgetPath *
+gtk_tree_view_get_path_for_child (GtkContainer *container,
+ GtkWidget *child)
+{
+ GtkTreeView *tree_view = GTK_TREE_VIEW (container);
+ GtkWidgetPath *path;
+ gboolean rtl;
+ GList *list, *visible_columns = NULL;
+ gint n_col = 0;
+
+ path = GTK_CONTAINER_CLASS (gtk_tree_view_parent_class)->get_path_for_child (container, child);
+ rtl = (gtk_widget_get_direction (GTK_WIDGET (container)) == GTK_TEXT_DIR_RTL);
+
+ for (list = tree_view->priv->columns; list; list = list->next)
+ {
+ GtkTreeViewColumn *column = list->data;
+
+ if (gtk_tree_view_column_get_visible (column))
+ visible_columns = g_list_prepend (visible_columns, column);
+ }
+
+ if (!rtl)
+ visible_columns = g_list_reverse (visible_columns);
+
+ for (list = visible_columns; list != NULL; list = list->next)
+ {
+ GtkTreeViewColumn *column = list->data;
+ GtkRegionFlags flags = 0;
+
+ n_col++;
+
+ if (gtk_tree_view_column_get_widget (column) != child &&
+ gtk_tree_view_column_get_button (column) != child)
+ continue;
+
+ if ((n_col % 2) == 0)
+ flags |= GTK_REGION_EVEN;
+ else
+ flags |= GTK_REGION_ODD;
+
+ if (n_col == 1)
+ flags |= GTK_REGION_FIRST;
+
+ if (!list->next)
+ flags |= GTK_REGION_LAST;
+
+ gtk_widget_path_iter_add_region (path, gtk_widget_path_length (path) - 2, GTK_STYLE_REGION_COLUMN_HEADER, flags);
+ break;
+ }
+ g_list_free (visible_columns);
+
+ return path;
+}
+
static gboolean
gtk_tree_view_real_move_cursor (GtkTreeView *tree_view,
GtkMovementStep step,
return FALSE;
gtk_tree_view_stop_editing (tree_view, FALSE);
- GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_DRAW_KEYFOCUS);
+ tree_view->priv->draw_keyfocus = TRUE;
gtk_widget_grab_focus (GTK_WIDGET (tree_view));
if (gtk_get_current_event_state (&state))
{
- if ((state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
- tree_view->priv->ctrl_pressed = TRUE;
- if ((state & GDK_SHIFT_MASK) == GDK_SHIFT_MASK)
- tree_view->priv->shift_pressed = TRUE;
+ GdkModifierType extend_mod_mask;
+ GdkModifierType modify_mod_mask;
+
+ extend_mod_mask =
+ gtk_widget_get_modifier_mask (GTK_WIDGET (tree_view),
+ GDK_MODIFIER_INTENT_EXTEND_SELECTION);
+
+ modify_mod_mask =
+ gtk_widget_get_modifier_mask (GTK_WIDGET (tree_view),
+ GDK_MODIFIER_INTENT_MODIFY_SELECTION);
+
+ if ((state & modify_mod_mask) == modify_mod_mask)
+ tree_view->priv->modify_selection_pressed = TRUE;
+ if ((state & extend_mod_mask) == extend_mod_mask)
+ tree_view->priv->extend_selection_pressed = TRUE;
}
/* else we assume not pressed */
g_assert_not_reached ();
}
- tree_view->priv->ctrl_pressed = FALSE;
- tree_view->priv->shift_pressed = FALSE;
+ tree_view->priv->modify_selection_pressed = FALSE;
+ tree_view->priv->extend_selection_pressed = FALSE;
return TRUE;
}
g_return_if_fail (path != NULL || iter != NULL);
- if (tree_view->priv->cursor != NULL)
- cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
+ if (tree_view->priv->cursor_node != NULL)
+ cursor_path = _gtk_tree_path_new_from_rbtree (tree_view->priv->cursor_tree,
+ tree_view->priv->cursor_node);
else
cursor_path = NULL;
if (tree == NULL)
goto done;
+ _gtk_tree_view_accessible_changed (tree_view, tree, node);
+
if (tree_view->priv->fixed_height_mode
&& tree_view->priv->fixed_height >= 0)
{
{
GtkTreeView *tree_view = (GtkTreeView *) data;
gint *indices;
- GtkRBTree *tmptree, *tree;
+ GtkRBTree *tree;
GtkRBNode *tmpnode = NULL;
gint depth;
gint i = 0;
if (tree_view->priv->tree == NULL)
tree_view->priv->tree = _gtk_rbtree_new ();
- tmptree = tree = tree_view->priv->tree;
+ tree = tree_view->priv->tree;
/* Update all row-references */
gtk_tree_row_reference_inserted (G_OBJECT (data), path);
/* First, find the parent tree */
while (i < depth - 1)
{
- if (tmptree == NULL)
+ if (tree == NULL)
{
/* We aren't showing the node */
node_visible = FALSE;
goto done;
}
- tmpnode = _gtk_rbtree_find_count (tmptree, indices[i] + 1);
+ tmpnode = _gtk_rbtree_find_count (tree, indices[i] + 1);
if (tmpnode == NULL)
{
g_warning ("A node was inserted with a parent that's not in the tree.\n" \
/* 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);
+ GtkTreePath *tmppath = _gtk_tree_path_new_from_rbtree (tree, tmpnode);
gtk_tree_view_row_has_child_toggled (model, tmppath, NULL, data);
gtk_tree_path_free (tmppath);
goto done;
}
- tmptree = tmpnode->children;
- tree = tmptree;
+ tree = tmpnode->children;
i++;
}
tmpnode = _gtk_rbtree_insert_after (tree, tmpnode, height, FALSE);
}
+ _gtk_tree_view_accessible_add (tree_view, tree, tmpnode);
+
done:
if (height > 0)
{
goto done;
if (has_child)
- GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_IS_PARENT);
+ {
+ GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_IS_PARENT);
+ _gtk_tree_view_accessible_add_state (tree_view, tree, node, GTK_CELL_RENDERER_EXPANDABLE);
+ }
else
- GTK_RBNODE_UNSET_FLAG (node, GTK_RBNODE_IS_PARENT);
+ {
+ GTK_RBNODE_UNSET_FLAG (node, GTK_RBNODE_IS_PARENT);
+ _gtk_tree_view_accessible_remove_state (tree_view, tree, node, GTK_CELL_RENDERER_EXPANDABLE);
+ }
- if (has_child && GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_IS_LIST))
+ if (has_child && tree_view->priv->is_list)
{
- GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_IS_LIST);
- if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_SHOW_EXPANDERS))
+ tree_view->priv->is_list = FALSE;
+ if (tree_view->priv->show_expanders)
{
GList *list;
for (list = tree_view->priv->columns; list; list = list->next)
if (gtk_tree_view_column_get_visible (GTK_TREE_VIEW_COLUMN (list->data)))
{
- GTK_TREE_VIEW_COLUMN (list->data)->dirty = TRUE;
_gtk_tree_view_column_cell_set_dirty (GTK_TREE_VIEW_COLUMN (list->data), TRUE);
break;
}
{
gint *value = (gint *)data;
- *value = GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED);
+ *value |= GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED);
if (node->children && !*value)
_gtk_rbtree_traverse (node->children, node->children->root, G_POST_ORDER, check_selection_helper, data);
GtkRBTree *tree;
GtkRBNode *node;
GList *list;
- gint selection_changed = FALSE;
+ gboolean selection_changed = FALSE, cursor_changed = FALSE;
+ GtkRBTree *cursor_tree = NULL;
+ GtkRBNode *cursor_node = NULL;
g_return_if_fail (path != NULL);
/* Cancel editting if we've started */
gtk_tree_view_stop_editing (tree_view, TRUE);
- /* If we have a node expanded/collapsed timeout, remove it */
- remove_expand_collapse_timeout (tree_view);
+ /* If the cursor row got deleted, move the cursor to the next row */
+ if (tree_view->priv->cursor_node &&
+ (tree_view->priv->cursor_node == node ||
+ (node->children && (tree_view->priv->cursor_tree == node->children ||
+ _gtk_rbtree_contains (node->children, tree_view->priv->cursor_tree)))))
+ {
+ GtkTreePath *cursor_path;
+
+ cursor_tree = tree;
+ cursor_node = _gtk_rbtree_next (tree, node);
+ /* find the first node that is not going to be deleted */
+ while (cursor_node == NULL && cursor_tree->parent_tree)
+ {
+ cursor_node = _gtk_rbtree_next (cursor_tree->parent_tree,
+ cursor_tree->parent_node);
+ cursor_tree = cursor_tree->parent_tree;
+ }
+
+ if (cursor_node != NULL)
+ cursor_path = _gtk_tree_path_new_from_rbtree (cursor_tree, cursor_node);
+ else
+ cursor_path = NULL;
+
+ if (cursor_path == NULL ||
+ ! search_first_focusable_path (tree_view, &cursor_path, TRUE,
+ &cursor_tree, &cursor_node))
+ {
+ /* It looks like we reached the end of the view without finding
+ * a focusable row. We will step backwards to find the last
+ * focusable row.
+ */
+ _gtk_rbtree_prev_full (tree, node, &cursor_tree, &cursor_node);
+ if (cursor_node)
+ {
+ cursor_path = _gtk_tree_path_new_from_rbtree (cursor_tree, cursor_node);
+ if (! search_first_focusable_path (tree_view, &cursor_path, FALSE,
+ &cursor_tree, &cursor_node))
+ cursor_node = NULL;
+ gtk_tree_path_free (cursor_path);
+ }
+ }
+ else if (cursor_path)
+ gtk_tree_path_free (cursor_path);
+
+ cursor_changed = TRUE;
+ }
if (tree_view->priv->destroy_count_func)
{
if (tree_view->priv->tree == tree)
tree_view->priv->tree = NULL;
+ _gtk_tree_view_accessible_remove_state (tree_view,
+ tree->parent_tree, tree->parent_node,
+ GTK_CELL_RENDERER_EXPANDED);
+ _gtk_tree_view_accessible_remove (tree_view, tree, NULL);
_gtk_rbtree_remove (tree);
}
else
{
+ _gtk_tree_view_accessible_remove (tree_view, tree, node);
_gtk_rbtree_remove_node (tree, node);
}
gtk_widget_queue_resize (GTK_WIDGET (tree_view));
+ if (cursor_changed)
+ {
+ if (cursor_node)
+ {
+ GtkTreePath *cursor_path = _gtk_tree_path_new_from_rbtree (cursor_tree, cursor_node);
+ gtk_tree_view_real_set_cursor (tree_view, cursor_path, CLEAR_AND_SELECT | CURSOR_INVALID);
+ gtk_tree_path_free (cursor_path);
+ }
+ else
+ gtk_tree_view_real_set_cursor (tree_view, NULL, CLEAR_AND_SELECT | CURSOR_INVALID);
+ }
if (selection_changed)
g_signal_emit_by_name (tree_view->priv->selection, "changed");
}
/* we need to be unprelighted */
ensure_unprelighted (tree_view);
- /* clear the timeout */
- cancel_arrow_animation (tree_view);
-
_gtk_rbtree_reorder (tree, new_order, len);
+ _gtk_tree_view_accessible_reorder (tree_view);
+
gtk_widget_queue_draw (GTK_WIDGET (tree_view));
gtk_tree_view_dy_to_top_row (tree_view);
*x2 = total_width; /* width of 0 */
}
}
+
static void
gtk_tree_view_get_arrow_xrange (GtkTreeView *tree_view,
GtkRBTree *tree,
GList *list;
GtkTreeViewColumn *tmp_column = NULL;
gint total_width;
+ gint expander_size, expander_render_size;
+ gint horizontal_separator;
gboolean indent_expanders;
gboolean rtl;
+ gtk_widget_style_get (GTK_WIDGET (tree_view),
+ "indent-expanders", &indent_expanders,
+ "horizontal-separator", &horizontal_separator,
+ NULL);
+
rtl = (gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_RTL);
+ expander_size = gtk_tree_view_get_expander_size (tree_view);
+ expander_render_size = expander_size - (horizontal_separator / 2);
total_width = 0;
for (list = (rtl ? g_list_last (tree_view->priv->columns) : g_list_first (tree_view->priv->columns));
if (gtk_tree_view_is_expander_column (tree_view, tmp_column))
{
if (rtl)
- x_offset = total_width + gtk_tree_view_column_get_width (tmp_column) - tree_view->priv->expander_size;
+ x_offset = total_width + gtk_tree_view_column_get_width (tmp_column) - expander_size;
else
x_offset = total_width;
break;
total_width += gtk_tree_view_column_get_width (tmp_column);
}
- gtk_widget_style_get (GTK_WIDGET (tree_view),
- "indent-expanders", &indent_expanders,
- NULL);
+ x_offset += (expander_size - expander_render_size);
if (indent_expanders)
{
if (rtl)
- x_offset -= tree_view->priv->expander_size * _gtk_rbtree_get_depth (tree);
+ x_offset -= expander_size * _gtk_rbtree_get_depth (tree);
else
- x_offset += tree_view->priv->expander_size * _gtk_rbtree_get_depth (tree);
+ x_offset += expander_size * _gtk_rbtree_get_depth (tree);
}
*x1 = x_offset;
if (tmp_column &&
gtk_tree_view_column_get_visible (tmp_column))
/* +1 because x2 isn't included in the range. */
- *x2 = *x1 + tree_view->priv->expander_size + 1;
+ *x2 = *x1 + expander_render_size + 1;
else
*x2 = *x1;
}
{
GtkRBNode *temp = NULL;
GtkTreePath *path = NULL;
- gboolean is_list = GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_IS_LIST);
do
{
}
}
- if (is_list)
+ if (tree_view->priv->is_list)
continue;
if (recurse)
/* just return if the node is visible, avoiding a costly expose */
node_dy = _gtk_rbtree_node_find_offset (tree, node);
- height = ROW_HEIGHT (tree_view, GTK_RBNODE_GET_HEIGHT (node));
+ height = gtk_tree_view_get_row_height (tree_view, node);
if (! GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID)
- && node_dy >= tree_view->priv->vadjustment->value
- && node_dy + height <= (tree_view->priv->vadjustment->value
- + tree_view->priv->vadjustment->page_size))
+ && node_dy >= gtk_adjustment_get_value (tree_view->priv->vadjustment)
+ && node_dy + height <= (gtk_adjustment_get_value (tree_view->priv->vadjustment)
+ + gtk_adjustment_get_page_size (tree_view->priv->vadjustment)))
return;
- path = _gtk_tree_view_find_path (tree_view, tree, node);
+ path = _gtk_tree_path_new_from_rbtree (tree, node);
if (path)
{
- /* We process updates because we want to clear old selected items when we scroll.
- * if this is removed, we get a "selection streak" at the bottom. */
- gtk_tree_view_bin_process_updates (tree_view);
-
gtk_tree_view_scroll_to_cell (tree_view, path, NULL, FALSE, 0.0, 0.0);
gtk_tree_path_free (path);
}
if (column == NULL)
return;
- gtk_widget_get_allocation (column->button, &allocation);
+ gtk_widget_get_allocation (gtk_tree_view_column_get_button (column), &allocation);
x = allocation.x;
width = allocation.width;
- if (width > tree_view->priv->hadjustment->page_size)
+ if (width > gtk_adjustment_get_page_size (tree_view->priv->hadjustment))
{
/* The column is larger than the horizontal page size. If the
* column has cells which can be focussed individually, then we make
* focus cell is bigger than the page size, we make sure the
* left-hand side of the cell is visible).
*
- * If the column does not have those so-called special cells, we
+ * If the column does not have an activatable cell, we
* make sure the left-hand side of the column is visible.
*/
- if (focus_to_cell && gtk_tree_view_has_special_cell (tree_view))
+ if (focus_to_cell && gtk_tree_view_has_can_focus_cell (tree_view))
{
- GtkTreePath *cursor_path;
- GdkRectangle background_area, cell_area, focus_area;
-
- cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
-
- gtk_tree_view_get_cell_area (tree_view,
- cursor_path, column, &cell_area);
- gtk_tree_view_get_background_area (tree_view,
- cursor_path, column,
- &background_area);
-
- gtk_tree_path_free (cursor_path);
+ GtkCellArea *cell_area;
+ GtkCellRenderer *focus_cell;
- _gtk_tree_view_column_get_focus_area (column,
- &background_area,
- &cell_area,
- &focus_area);
+ cell_area = gtk_cell_layout_get_area (GTK_CELL_LAYOUT (column));
+ focus_cell = gtk_cell_area_get_focus_cell (cell_area);
- x = focus_area.x;
- width = focus_area.width;
-
- if (width < tree_view->priv->hadjustment->page_size)
- {
- if ((tree_view->priv->hadjustment->value + tree_view->priv->hadjustment->page_size) < (x + width))
- gtk_adjustment_set_value (tree_view->priv->hadjustment,
- x + width - tree_view->priv->hadjustment->page_size);
- else if (tree_view->priv->hadjustment->value > x)
- gtk_adjustment_set_value (tree_view->priv->hadjustment, x);
- }
- }
+ if (gtk_tree_view_column_cell_get_position (column, focus_cell,
+ &x, &width))
+ {
+ if (width < gtk_adjustment_get_page_size (tree_view->priv->hadjustment))
+ {
+ if (gtk_adjustment_get_value (tree_view->priv->hadjustment) + gtk_adjustment_get_page_size (tree_view->priv->hadjustment) < x + width)
+ gtk_adjustment_set_value (tree_view->priv->hadjustment,
+ x + width - gtk_adjustment_get_page_size (tree_view->priv->hadjustment));
+ else if (gtk_adjustment_get_value (tree_view->priv->hadjustment) > x)
+ gtk_adjustment_set_value (tree_view->priv->hadjustment, x);
+ }
+ }
+ }
gtk_adjustment_set_value (tree_view->priv->hadjustment, x);
}
else
{
- if ((tree_view->priv->hadjustment->value + tree_view->priv->hadjustment->page_size) < (x + width))
+ if ((gtk_adjustment_get_value (tree_view->priv->hadjustment) + gtk_adjustment_get_page_size (tree_view->priv->hadjustment)) < (x + width))
gtk_adjustment_set_value (tree_view->priv->hadjustment,
- x + width - tree_view->priv->hadjustment->page_size);
- else if (tree_view->priv->hadjustment->value > x)
+ x + width - gtk_adjustment_get_page_size (tree_view->priv->hadjustment));
+ else if (gtk_adjustment_get_value (tree_view->priv->hadjustment) > x)
gtk_adjustment_set_value (tree_view->priv->hadjustment, x);
}
}
/* This function could be more efficient. I'll optimize it if profiling seems
* to imply that it is important */
GtkTreePath *
-_gtk_tree_view_find_path (GtkTreeView *tree_view,
- GtkRBTree *tree,
- GtkRBNode *node)
+_gtk_tree_path_new_from_rbtree (GtkRBTree *tree,
+ GtkRBNode *node)
{
GtkTreePath *path;
GtkRBTree *tmp_tree;
path = gtk_tree_path_new ();
g_return_val_if_fail (node != NULL, path);
- g_return_val_if_fail (node != tree->nil, path);
count = 1 + node->left->count;
tmp_tree = tree;
while (tmp_tree)
{
- while (tmp_node != tmp_tree->nil)
+ while (!_gtk_rbtree_is_nil (tmp_node))
{
if (tmp_node->right == last)
count += 1 + tmp_node->left->count;
{
GList *list;
- if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_IS_LIST))
+ if (tree_view->priv->is_list)
return FALSE;
if (tree_view->priv->expander_column != NULL)
return FALSE;
}
+static inline gboolean
+gtk_tree_view_draw_expanders (GtkTreeView *tree_view)
+{
+ if (!tree_view->priv->is_list && tree_view->priv->show_expanders)
+ return TRUE;
+ /* else */
+ return FALSE;
+}
+
static void
gtk_tree_view_add_move_binding (GtkBindingSet *binding_set,
guint keyval,
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;
+ new_node = _gtk_rbtree_first (new_tree);
if (!gtk_tree_model_iter_children (model, &child, iter))
return FALSE;
- retval = retval || gtk_tree_view_unref_tree_helper (model, &child, new_tree, new_node);
+ retval = gtk_tree_view_unref_tree_helper (model, &child, new_tree, new_node) | retval;
}
if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
if (!tree)
return FALSE;
- node = tree->root;
- while (node && node->left != tree->nil)
- node = node->left;
+ node = _gtk_rbtree_first (tree);
g_return_val_if_fail (node != NULL, FALSE);
- path = _gtk_tree_view_find_path (tree_view, tree, node);
+ path = _gtk_tree_path_new_from_rbtree (tree, node);
gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_view->priv->model),
&iter, path);
retval = gtk_tree_view_unref_tree_helper (GTK_TREE_MODEL (tree_view->priv->model), &iter, tree, node);
if (tmp_list->next != NULL)
{
GtkAllocation right_allocation, left_allocation;
+ GtkWidget *left_button, *right_button;
g_assert (tmp_list->next->data);
- gtk_widget_get_allocation (reorder->right_column->button, &right_allocation);
- gtk_widget_get_allocation (((GtkTreeViewColumnReorder *)tmp_list->next->data)->left_column->button, &left_allocation);
+ right_button = gtk_tree_view_column_get_button (reorder->right_column);
+ left_button = gtk_tree_view_column_get_button
+ (((GtkTreeViewColumnReorder *)tmp_list->next->data)->left_column);
+
+ gtk_widget_get_allocation (right_button, &right_allocation);
+ gtk_widget_get_allocation (left_button, &left_allocation);
left = reorder->right_align = (right_allocation.x + right_allocation.width + left_allocation.x) / 2;
}
else
GtkAllocation allocation;
GtkAllocation button_allocation;
GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (tree_view));
- GdkDisplay *display = gdk_screen_get_display (screen);
+ GtkWidget *button;
+ GdkDevice *pointer, *keyboard;
+ GdkWindowAttr attributes;
+ guint attributes_mask;
+ GtkStyleContext *context;
g_return_if_fail (tree_view->priv->column_drag_info == NULL);
g_return_if_fail (tree_view->priv->cur_reorder == NULL);
+ g_return_if_fail (tree_view->priv->drag_window == NULL);
gtk_tree_view_set_column_drag_info (tree_view, column);
if (tree_view->priv->column_drag_info == NULL)
return;
- if (tree_view->priv->drag_window == NULL)
- {
- GdkWindowAttr attributes;
- guint attributes_mask;
+ button = gtk_tree_view_column_get_button (column);
- gtk_widget_get_allocation (column->button, &button_allocation);
+ context = gtk_widget_get_style_context (button);
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_DND);
- attributes.window_type = GDK_WINDOW_CHILD;
- attributes.wclass = GDK_INPUT_OUTPUT;
- attributes.x = button_allocation.x;
- attributes.y = 0;
- attributes.width = button_allocation.width;
- attributes.height = button_allocation.height;
- attributes.visual = gtk_widget_get_visual (GTK_WIDGET (tree_view));
- attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK;
- attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
+ gtk_widget_get_allocation (button, &button_allocation);
- tree_view->priv->drag_window = gdk_window_new (tree_view->priv->bin_window,
- &attributes,
- attributes_mask);
- gdk_window_set_user_data (tree_view->priv->drag_window, GTK_WIDGET (tree_view));
+ attributes.window_type = GDK_WINDOW_CHILD;
+ attributes.wclass = GDK_INPUT_OUTPUT;
+ attributes.x = button_allocation.x;
+ attributes.y = 0;
+ attributes.width = button_allocation.width;
+ attributes.height = button_allocation.height;
+ attributes.visual = gtk_widget_get_visual (GTK_WIDGET (tree_view));
+ attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK;
+ attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
+
+ tree_view->priv->drag_window = gdk_window_new (tree_view->priv->header_window,
+ &attributes,
+ attributes_mask);
+ gtk_widget_register_window (GTK_WIDGET (tree_view), tree_view->priv->drag_window);
+
+ if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
+ {
+ keyboard = device;
+ pointer = gdk_device_get_associated_device (device);
+ }
+ else
+ {
+ pointer = device;
+ keyboard = gdk_device_get_associated_device (device);
}
- gdk_display_pointer_ungrab (display, GDK_CURRENT_TIME);
- gdk_display_keyboard_ungrab (display, GDK_CURRENT_TIME);
+ gdk_device_ungrab (pointer, GDK_CURRENT_TIME);
+ gdk_device_ungrab (keyboard, GDK_CURRENT_TIME);
- gtk_grab_remove (column->button);
+ gtk_grab_remove (button);
send_event = gdk_event_new (GDK_LEAVE_NOTIFY);
send_event->crossing.send_event = TRUE;
- send_event->crossing.window = g_object_ref (gtk_button_get_event_window (GTK_BUTTON (column->button)));
+ send_event->crossing.window = g_object_ref (gtk_button_get_event_window (GTK_BUTTON (button)));
send_event->crossing.subwindow = NULL;
send_event->crossing.detail = GDK_NOTIFY_ANCESTOR;
send_event->crossing.time = GDK_CURRENT_TIME;
gdk_event_set_device (send_event, device);
- gtk_propagate_event (column->button, send_event);
+ gtk_propagate_event (button, send_event);
gdk_event_free (send_event);
send_event = gdk_event_new (GDK_BUTTON_RELEASE);
send_event->button.y = -1;
send_event->button.axes = NULL;
send_event->button.state = 0;
- send_event->button.button = 1;
+ send_event->button.button = GDK_BUTTON_PRIMARY;
send_event->button.x_root = 0;
send_event->button.y_root = 0;
gdk_event_set_device (send_event, device);
- gtk_propagate_event (column->button, send_event);
+ gtk_propagate_event (button, send_event);
gdk_event_free (send_event);
/* Kids, don't try this at home */
- g_object_ref (column->button);
- gtk_container_remove (GTK_CONTAINER (tree_view), column->button);
- gtk_widget_set_parent_window (column->button, tree_view->priv->drag_window);
- gtk_widget_set_parent (column->button, GTK_WIDGET (tree_view));
- g_object_unref (column->button);
+ g_object_ref (button);
+ gtk_container_remove (GTK_CONTAINER (tree_view), button);
+ gtk_widget_set_parent_window (button, tree_view->priv->drag_window);
+ gtk_widget_set_parent (button, GTK_WIDGET (tree_view));
+ g_object_unref (button);
- gtk_widget_get_allocation (column->button, &button_allocation);
+ gtk_widget_get_allocation (button, &button_allocation);
tree_view->priv->drag_column_x = button_allocation.x;
allocation = button_allocation;
allocation.x = 0;
- gtk_widget_size_allocate (column->button, &allocation);
- gtk_widget_set_parent_window (column->button, tree_view->priv->drag_window);
+ gtk_widget_size_allocate (button, &allocation);
+ gtk_widget_set_parent_window (button, tree_view->priv->drag_window);
tree_view->priv->drag_column = column;
gdk_window_show (tree_view->priv->drag_window);
while (gtk_events_pending ())
gtk_main_iteration ();
- GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_DRAG);
- gdk_pointer_grab (tree_view->priv->drag_window,
- FALSE,
- GDK_POINTER_MOTION_MASK|GDK_BUTTON_RELEASE_MASK,
- NULL, NULL, GDK_CURRENT_TIME);
- gdk_keyboard_grab (tree_view->priv->drag_window,
- FALSE,
- GDK_CURRENT_TIME);
+ tree_view->priv->in_column_drag = TRUE;
+
+ gdk_device_grab (pointer,
+ tree_view->priv->drag_window,
+ GDK_OWNERSHIP_NONE,
+ FALSE,
+ GDK_POINTER_MOTION_MASK|GDK_BUTTON_RELEASE_MASK,
+ NULL,
+ GDK_CURRENT_TIME);
+ gdk_device_grab (keyboard,
+ tree_view->priv->drag_window,
+ GDK_OWNERSHIP_NONE,
+ FALSE,
+ GDK_KEY_PRESS_MASK|GDK_KEY_RELEASE_MASK,
+ NULL,
+ GDK_CURRENT_TIME);
}
static void
gtk_widget_get_allocation (GTK_WIDGET (tree_view), &allocation);
rect.x = 0;
- rect.width = MAX (tree_view->priv->expander_size, MAX (tree_view->priv->width, allocation.width));
+ rect.width = gtk_tree_view_get_expander_size (tree_view);
+ rect.width = MAX (rect.width, MAX (tree_view->priv->width, allocation.width));
- rect.y = BACKGROUND_FIRST_PIXEL (tree_view, tree, node);
- rect.height = ROW_HEIGHT (tree_view, BACKGROUND_HEIGHT (node));
+ rect.y = gtk_tree_view_get_row_y_offset (tree_view, tree, node);
+ rect.height = gtk_tree_view_get_row_height (tree_view, node);
gdk_window_invalidate_rect (tree_view->priv->bin_window, &rect, TRUE);
}
rect.x = 0;
rect.width = MAX (tree_view->priv->width, allocation.width);
- rect.y = BACKGROUND_FIRST_PIXEL (tree_view, tree, node);
- rect.height = ROW_HEIGHT (tree_view, BACKGROUND_HEIGHT (node));
+ rect.y = gtk_tree_view_get_row_y_offset (tree_view, tree, node);
+ rect.height = gtk_tree_view_get_row_height (tree_view, node);
if (clip_rect)
{
}
}
+static inline gint
+gtk_tree_view_get_effective_header_height (GtkTreeView *tree_view)
+{
+ if (tree_view->priv->headers_visible)
+ return tree_view->priv->header_height;
+ /* else */
+ return 0;
+}
+
+gint
+_gtk_tree_view_get_header_height (GtkTreeView *tree_view)
+{
+ return tree_view->priv->header_height;
+}
+
+void
+_gtk_tree_view_get_row_separator_func (GtkTreeView *tree_view,
+ GtkTreeViewRowSeparatorFunc *func,
+ gpointer *data)
+{
+ *func = tree_view->priv->row_separator_func;
+ *data = tree_view->priv->row_separator_data;
+}
+
+GtkTreePath *
+_gtk_tree_view_get_anchor_path (GtkTreeView *tree_view)
+{
+ if (tree_view->priv->anchor)
+ return gtk_tree_row_reference_get_path (tree_view->priv->anchor);
+
+ return NULL;
+}
+
+void
+_gtk_tree_view_set_anchor_path (GtkTreeView *tree_view,
+ GtkTreePath *anchor_path)
+{
+ if (tree_view->priv->anchor)
+ {
+ gtk_tree_row_reference_free (tree_view->priv->anchor);
+ tree_view->priv->anchor = NULL;
+ }
+
+ if (anchor_path && tree_view->priv->model)
+ tree_view->priv->anchor =
+ gtk_tree_row_reference_new_proxy (G_OBJECT (tree_view),
+ tree_view->priv->model, anchor_path);
+}
+
+GtkRBTree *
+_gtk_tree_view_get_rbtree (GtkTreeView *tree_view)
+{
+ return tree_view->priv->tree;
+}
+
+gboolean
+_gtk_tree_view_get_cursor_node (GtkTreeView *tree_view,
+ GtkRBTree **tree,
+ GtkRBNode **node)
+{
+ GtkTreeViewPrivate *priv;
+
+ priv = tree_view->priv;
+
+ if (priv->cursor_node == NULL)
+ return FALSE;
+
+ *tree = priv->cursor_tree;
+ *node = priv->cursor_node;
+
+ return TRUE;
+}
+
+GdkWindow *
+_gtk_tree_view_get_header_window (GtkTreeView *tree_view)
+{
+ return tree_view->priv->header_window;
+}
+
+GtkTreeViewColumn *
+_gtk_tree_view_get_focus_column (GtkTreeView *tree_view)
+{
+ return tree_view->priv->focus_column;
+}
+
+void
+_gtk_tree_view_set_focus_column (GtkTreeView *tree_view,
+ GtkTreeViewColumn *column)
+{
+ GtkTreeViewColumn *old_column = tree_view->priv->focus_column;
+
+ if (old_column == column)
+ return;
+
+ tree_view->priv->focus_column = column;
+
+ _gtk_tree_view_accessible_update_focus_column (tree_view,
+ old_column,
+ column);
+}
+
+
static void
gtk_tree_view_queue_draw_path (GtkTreeView *tree_view,
GtkTreePath *path,
gtk_tree_view_draw_arrow (GtkTreeView *tree_view,
cairo_t *cr,
GtkRBTree *tree,
- GtkRBNode *node,
- /* in bin_window coordinates */
- gint x,
- gint y)
+ GtkRBNode *node)
{
GdkRectangle area;
- GtkStateType state;
+ GtkStateFlags state = 0;
+ GtkStyleContext *context;
GtkWidget *widget;
gint x_offset = 0;
gint x2;
gint vertical_separator;
- gint expander_size;
- GtkExpanderStyle expander_style;
+ GtkCellRendererState flags = 0;
widget = GTK_WIDGET (tree_view);
+ context = gtk_widget_get_style_context (widget);
gtk_widget_style_get (widget,
- "vertical-separator", &vertical_separator,
- NULL);
- expander_size = tree_view->priv->expander_size - EXPANDER_EXTRA_PADDING;
+ "vertical-separator", &vertical_separator,
+ NULL);
if (! GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PARENT))
return;
gtk_tree_view_get_arrow_xrange (tree_view, tree, &x_offset, &x2);
area.x = x_offset;
- area.y = CELL_FIRST_PIXEL (tree_view, tree, node, vertical_separator);
- area.width = expander_size + 2;
- area.height = MAX (CELL_HEIGHT (node, vertical_separator), (expander_size - vertical_separator));
+ area.y = gtk_tree_view_get_cell_area_y_offset (tree_view, tree, node,
+ vertical_separator);
+ area.width = x2 - x_offset;
+ area.height = gtk_tree_view_get_cell_area_height (tree_view, node,
+ vertical_separator);
- if (gtk_widget_get_state (widget) == GTK_STATE_INSENSITIVE)
- {
- state = GTK_STATE_INSENSITIVE;
- }
- else if (node == tree_view->priv->button_pressed_node)
- {
- if (x >= area.x && x <= (area.x + area.width) &&
- y >= area.y && y <= (area.y + area.height))
- state = GTK_STATE_ACTIVE;
- else
- state = GTK_STATE_NORMAL;
- }
- else
- {
- 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;
- }
+ if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
+ flags |= GTK_CELL_RENDERER_SELECTED;
- if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SEMI_EXPANDED))
- expander_style = GTK_EXPANDER_SEMI_EXPANDED;
- else if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SEMI_COLLAPSED))
- expander_style = GTK_EXPANDER_SEMI_COLLAPSED;
- else if (node->children != NULL)
- expander_style = GTK_EXPANDER_EXPANDED;
+ if (node == tree_view->priv->prelight_node &&
+ tree_view->priv->arrow_prelit)
+ flags |= GTK_CELL_RENDERER_PRELIT;
+
+ state = gtk_cell_renderer_get_state (NULL, widget, flags);
+
+ if (node->children != NULL)
+ state |= GTK_STATE_FLAG_ACTIVE;
else
- expander_style = GTK_EXPANDER_COLLAPSED;
+ state &= ~(GTK_STATE_FLAG_ACTIVE);
+
+ gtk_style_context_save (context);
- gtk_paint_expander (gtk_widget_get_style (widget),
- cr,
- state,
- widget,
- "treeview",
- area.x + area.width / 2,
- area.y + area.height / 2,
- expander_style);
+ gtk_style_context_set_state (context, state);
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_EXPANDER);
+
+ gtk_render_expander (context, cr,
+ area.x, area.y,
+ area.width, area.height);
+
+ gtk_style_context_restore (context);
}
static void
return;
cursor_path = NULL;
- if (tree_view->priv->cursor)
- cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
+ if (tree_view->priv->cursor_node)
+ cursor_path = _gtk_tree_path_new_from_rbtree (tree_view->priv->cursor_tree,
+ tree_view->priv->cursor_node);
if (cursor_path == NULL)
{
if (selected_rows)
{
cursor_path = gtk_tree_path_copy((const GtkTreePath *)(selected_rows->data));
- g_list_foreach (selected_rows, (GFunc)gtk_tree_path_free, NULL);
- g_list_free (selected_rows);
+ g_list_free_full (selected_rows, (GDestroyNotify) gtk_tree_path_free);
}
else
{
TRUE, NULL, NULL);
}
- gtk_tree_row_reference_free (tree_view->priv->cursor);
- tree_view->priv->cursor = NULL;
-
if (cursor_path)
{
- if (tree_view->priv->selection->type == GTK_SELECTION_MULTIPLE)
- gtk_tree_view_real_set_cursor (tree_view, cursor_path, FALSE, FALSE);
+ if (gtk_tree_selection_get_mode (tree_view->priv->selection) == GTK_SELECTION_MULTIPLE)
+ gtk_tree_view_real_set_cursor (tree_view, cursor_path, 0);
else
- gtk_tree_view_real_set_cursor (tree_view, cursor_path, TRUE, FALSE);
+ gtk_tree_view_real_set_cursor (tree_view, cursor_path, CLEAR_AND_SELECT);
}
}
if (cursor_path)
{
- GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_DRAW_KEYFOCUS);
+ tree_view->priv->draw_keyfocus = TRUE;
gtk_tree_view_queue_draw_path (tree_view, cursor_path, NULL);
gtk_tree_path_free (cursor_path);
{
if (gtk_tree_view_column_get_visible (GTK_TREE_VIEW_COLUMN (list->data)))
{
- tree_view->priv->focus_column = GTK_TREE_VIEW_COLUMN (list->data);
+ GtkCellArea *cell_area;
+
+ _gtk_tree_view_set_focus_column (tree_view, GTK_TREE_VIEW_COLUMN (list->data));
+
+ /* This happens when the treeview initially grabs focus and there
+ * is no column in focus, here we explicitly focus into the first cell */
+ cell_area = gtk_cell_layout_get_area (GTK_CELL_LAYOUT (tree_view->priv->focus_column));
+ if (!gtk_cell_area_get_focus_cell (cell_area))
+ {
+ gboolean rtl;
+
+ rtl = (gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_RTL);
+ gtk_cell_area_focus (cell_area,
+ rtl ? GTK_DIR_LEFT : GTK_DIR_RIGHT);
+ }
+
break;
}
}
gint count)
{
gint selection_count;
- GtkRBTree *cursor_tree = NULL;
- GtkRBNode *cursor_node = NULL;
GtkRBTree *new_cursor_tree = NULL;
GtkRBNode *new_cursor_node = NULL;
GtkTreePath *cursor_path = NULL;
gboolean grab_focus = TRUE;
gboolean selectable;
+ GtkDirectionType direction;
+ GtkCellArea *cell_area = NULL;
+ GtkCellRenderer *last_focus_cell = NULL;
+ GtkTreeIter iter;
if (! gtk_widget_has_focus (GTK_WIDGET (tree_view)))
return;
- cursor_path = NULL;
- if (!gtk_tree_row_reference_valid (tree_view->priv->cursor))
- /* FIXME: we lost the cursor; should we get the first? */
+ if (tree_view->priv->cursor_node == NULL)
return;
- cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
- _gtk_tree_view_find_node (tree_view, cursor_path,
- &cursor_tree, &cursor_node);
+ cursor_path = _gtk_tree_path_new_from_rbtree (tree_view->priv->cursor_tree,
+ tree_view->priv->cursor_node);
- if (cursor_tree == NULL)
- /* FIXME: we lost the cursor; should we get the first? */
- return;
+ direction = count < 0 ? GTK_DIR_UP : GTK_DIR_DOWN;
+
+ if (tree_view->priv->focus_column)
+ cell_area = gtk_cell_layout_get_area (GTK_CELL_LAYOUT (tree_view->priv->focus_column));
+
+ /* If focus stays in the area for this row, then just return for this round */
+ if (cell_area && (count == -1 || count == 1) &&
+ gtk_tree_model_get_iter (tree_view->priv->model, &iter, cursor_path))
+ {
+ gtk_tree_view_column_cell_set_cell_data (tree_view->priv->focus_column,
+ tree_view->priv->model,
+ &iter,
+ GTK_RBNODE_FLAG_SET (tree_view->priv->cursor_node, GTK_RBNODE_IS_PARENT),
+ tree_view->priv->cursor_node->children ? TRUE : FALSE);
+
+ /* Save the last cell that had focus, if we hit the end of the view we'll give
+ * focus back to it. */
+ last_focus_cell = gtk_cell_area_get_focus_cell (cell_area);
+
+ /* If focus stays in the area, no need to change the cursor row */
+ if (gtk_cell_area_focus (cell_area, direction))
+ return;
+ }
selection_count = gtk_tree_selection_count_selected_rows (tree_view->priv->selection);
selectable = _gtk_tree_selection_row_is_selectable (tree_view->priv->selection,
- cursor_node,
+ tree_view->priv->cursor_node,
cursor_path);
if (selection_count == 0
- && tree_view->priv->selection->type != GTK_SELECTION_NONE
- && !tree_view->priv->ctrl_pressed
+ && gtk_tree_selection_get_mode (tree_view->priv->selection) != GTK_SELECTION_NONE
+ && !tree_view->priv->modify_selection_pressed
&& selectable)
{
/* Don't move the cursor, but just select the current node */
- new_cursor_tree = cursor_tree;
- new_cursor_node = cursor_node;
+ new_cursor_tree = tree_view->priv->cursor_tree;
+ new_cursor_node = tree_view->priv->cursor_node;
}
else
{
if (count == -1)
- _gtk_rbtree_prev_full (cursor_tree, cursor_node,
+ _gtk_rbtree_prev_full (tree_view->priv->cursor_tree, tree_view->priv->cursor_node,
&new_cursor_tree, &new_cursor_node);
else
- _gtk_rbtree_next_full (cursor_tree, cursor_node,
+ _gtk_rbtree_next_full (tree_view->priv->cursor_tree, tree_view->priv->cursor_node,
&new_cursor_tree, &new_cursor_node);
}
if (new_cursor_node)
{
- cursor_path = _gtk_tree_view_find_path (tree_view,
- new_cursor_tree, new_cursor_node);
+ cursor_path = _gtk_tree_path_new_from_rbtree (new_cursor_tree, new_cursor_node);
search_first_focusable_path (tree_view, &cursor_path,
(count != -1),
* If the list has only one item and multi-selection is set then select
* the row (if not yet selected).
*/
- if (tree_view->priv->selection->type == GTK_SELECTION_MULTIPLE &&
+ if (gtk_tree_selection_get_mode (tree_view->priv->selection) == GTK_SELECTION_MULTIPLE &&
new_cursor_node == NULL)
{
if (count == -1)
- _gtk_rbtree_next_full (cursor_tree, cursor_node,
+ _gtk_rbtree_next_full (tree_view->priv->cursor_tree, tree_view->priv->cursor_node,
&new_cursor_tree, &new_cursor_node);
else
- _gtk_rbtree_prev_full (cursor_tree, cursor_node,
+ _gtk_rbtree_prev_full (tree_view->priv->cursor_tree, tree_view->priv->cursor_node,
&new_cursor_tree, &new_cursor_node);
if (new_cursor_node == NULL
- && !GTK_RBNODE_FLAG_SET (cursor_node, GTK_RBNODE_IS_SELECTED))
+ && !GTK_RBNODE_FLAG_SET (tree_view->priv->cursor_node, GTK_RBNODE_IS_SELECTED))
{
- new_cursor_node = cursor_node;
- new_cursor_tree = cursor_tree;
+ new_cursor_node = tree_view->priv->cursor_node;
+ new_cursor_tree = tree_view->priv->cursor_tree;
}
else
{
+ new_cursor_tree = NULL;
new_cursor_node = NULL;
}
}
if (new_cursor_node)
{
- cursor_path = _gtk_tree_view_find_path (tree_view, new_cursor_tree, new_cursor_node);
- gtk_tree_view_real_set_cursor (tree_view, cursor_path, TRUE, TRUE);
+ cursor_path = _gtk_tree_path_new_from_rbtree (new_cursor_tree, new_cursor_node);
+ gtk_tree_view_real_set_cursor (tree_view, cursor_path, CLEAR_AND_SELECT | CLAMP_NODE);
gtk_tree_path_free (cursor_path);
+
+ /* Give focus to the area in the new row */
+ if (cell_area)
+ gtk_cell_area_focus (cell_area, direction);
}
else
{
- gtk_tree_view_clamp_node_visible (tree_view, cursor_tree, cursor_node);
+ gtk_tree_view_clamp_node_visible (tree_view,
+ tree_view->priv->cursor_tree,
+ tree_view->priv->cursor_node);
- if (!tree_view->priv->shift_pressed)
+ if (!tree_view->priv->extend_selection_pressed)
{
if (! gtk_widget_keynav_failed (GTK_WIDGET (tree_view),
count < 0 ?
{
gtk_widget_error_bell (GTK_WIDGET (tree_view));
}
+
+ if (cell_area)
+ gtk_cell_area_set_focus_cell (cell_area, last_focus_cell);
}
if (grab_focus)
gtk_tree_view_move_cursor_page_up_down (GtkTreeView *tree_view,
gint count)
{
- GtkRBTree *cursor_tree = NULL;
- GtkRBNode *cursor_node = NULL;
GtkTreePath *old_cursor_path = NULL;
GtkTreePath *cursor_path = NULL;
GtkRBTree *start_cursor_tree = NULL;
GtkRBNode *start_cursor_node = NULL;
+ GtkRBTree *cursor_tree;
+ GtkRBNode *cursor_node;
gint y;
gint window_y;
gint vertical_separator;
if (!gtk_widget_has_focus (GTK_WIDGET (tree_view)))
return;
- if (gtk_tree_row_reference_valid (tree_view->priv->cursor))
- old_cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
- else
- /* This is sorta weird. Focus in should give us a cursor */
+ if (tree_view->priv->cursor_node == NULL)
return;
- gtk_widget_style_get (GTK_WIDGET (tree_view), "vertical-separator", &vertical_separator, NULL);
- _gtk_tree_view_find_node (tree_view, old_cursor_path,
- &cursor_tree, &cursor_node);
+ old_cursor_path = _gtk_tree_path_new_from_rbtree (tree_view->priv->cursor_tree,
+ tree_view->priv->cursor_node);
- if (cursor_tree == NULL)
- {
- /* FIXME: we lost the cursor. Should we try to get one? */
- gtk_tree_path_free (old_cursor_path);
- return;
- }
- g_return_if_fail (cursor_node != NULL);
+ gtk_widget_style_get (GTK_WIDGET (tree_view), "vertical-separator", &vertical_separator, NULL);
- y = _gtk_rbtree_node_find_offset (cursor_tree, cursor_node);
+ y = _gtk_rbtree_node_find_offset (tree_view->priv->cursor_tree, tree_view->priv->cursor_node);
window_y = RBTREE_Y_TO_TREE_WINDOW_Y (tree_view, y);
y += tree_view->priv->cursor_offset;
- y += count * (int)tree_view->priv->vadjustment->page_increment;
- y = CLAMP (y, (gint)tree_view->priv->vadjustment->lower, (gint)tree_view->priv->vadjustment->upper - vertical_separator);
+ y += count * (int)gtk_adjustment_get_page_increment (tree_view->priv->vadjustment);
+ y = CLAMP (y, (gint)gtk_adjustment_get_lower (tree_view->priv->vadjustment), (gint)gtk_adjustment_get_upper (tree_view->priv->vadjustment) - vertical_separator);
if (y >= tree_view->priv->height)
y = tree_view->priv->height - 1;
return;
}
- if (tree_view->priv->cursor_offset > BACKGROUND_HEIGHT (cursor_node))
+ if (tree_view->priv->cursor_offset
+ > gtk_tree_view_get_row_height (tree_view, cursor_node))
{
_gtk_rbtree_next_full (cursor_tree, cursor_node,
&cursor_tree, &cursor_node);
- tree_view->priv->cursor_offset -= BACKGROUND_HEIGHT (cursor_node);
+ tree_view->priv->cursor_offset -= gtk_tree_view_get_row_height (tree_view, cursor_node);
}
y -= tree_view->priv->cursor_offset;
- cursor_path = _gtk_tree_view_find_path (tree_view, cursor_tree, cursor_node);
+ cursor_path = _gtk_tree_path_new_from_rbtree (cursor_tree, cursor_node);
start_cursor_tree = cursor_tree;
start_cursor_node = cursor_node;
*/
cursor_tree = start_cursor_tree;
cursor_node = start_cursor_node;
- cursor_path = _gtk_tree_view_find_path (tree_view, cursor_tree, cursor_node);
+ cursor_path = _gtk_tree_path_new_from_rbtree (cursor_tree, cursor_node);
search_first_focusable_path (tree_view, &cursor_path,
(count == -1),
/* update y */
y = _gtk_rbtree_node_find_offset (cursor_tree, cursor_node);
- gtk_tree_view_real_set_cursor (tree_view, cursor_path, TRUE, FALSE);
+ gtk_tree_view_real_set_cursor (tree_view, cursor_path, CLEAR_AND_SELECT);
y -= window_y;
gtk_tree_view_scroll_to_point (tree_view, -1, y);
gtk_tree_view_move_cursor_left_right (GtkTreeView *tree_view,
gint count)
{
- GtkRBTree *cursor_tree = NULL;
- GtkRBNode *cursor_node = NULL;
GtkTreePath *cursor_path = NULL;
GtkTreeViewColumn *column;
GtkTreeIter iter;
GList *list;
gboolean found_column = FALSE;
gboolean rtl;
+ GtkDirectionType direction;
+ GtkCellArea *cell_area;
+ GtkCellRenderer *last_focus_cell = NULL;
+ GtkCellArea *last_focus_area = NULL;
rtl = (gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_RTL);
if (!gtk_widget_has_focus (GTK_WIDGET (tree_view)))
return;
- if (gtk_tree_row_reference_valid (tree_view->priv->cursor))
- cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
- else
+ if (tree_view->priv->cursor_node == NULL)
return;
- _gtk_tree_view_find_node (tree_view, cursor_path, &cursor_tree, &cursor_node);
- if (cursor_tree == NULL)
- return;
+ cursor_path = _gtk_tree_path_new_from_rbtree (tree_view->priv->cursor_tree,
+ tree_view->priv->cursor_node);
+
if (gtk_tree_model_get_iter (tree_view->priv->model, &iter, cursor_path) == FALSE)
{
gtk_tree_path_free (cursor_path);
list = rtl ? g_list_last (tree_view->priv->columns) : g_list_first (tree_view->priv->columns);
if (tree_view->priv->focus_column)
{
+ /* Save the cell/area we are moving focus from, if moving the cursor
+ * by one step hits the end we'll set focus back here */
+ last_focus_area = gtk_cell_layout_get_area (GTK_CELL_LAYOUT (tree_view->priv->focus_column));
+ last_focus_cell = gtk_cell_area_get_focus_cell (last_focus_area);
+
for (; list; list = (rtl ? list->prev : list->next))
{
if (list->data == tree_view->priv->focus_column)
}
}
+ direction = count > 0 ? GTK_DIR_RIGHT : GTK_DIR_LEFT;
+
while (list)
{
- gboolean left, right;
-
column = list->data;
if (gtk_tree_view_column_get_visible (column) == FALSE)
goto loop_end;
gtk_tree_view_column_cell_set_cell_data (column,
tree_view->priv->model,
&iter,
- GTK_RBNODE_FLAG_SET (cursor_node, GTK_RBNODE_IS_PARENT),
- cursor_node->children?TRUE:FALSE);
+ GTK_RBNODE_FLAG_SET (tree_view->priv->cursor_node, GTK_RBNODE_IS_PARENT),
+ tree_view->priv->cursor_node->children ? TRUE : FALSE);
- if (rtl)
- {
- right = list->prev ? TRUE : FALSE;
- left = list->next ? TRUE : FALSE;
- }
- else
- {
- left = list->prev ? TRUE : FALSE;
- right = list->next ? TRUE : FALSE;
- }
-
- if (_gtk_tree_view_column_cell_focus (column, count, left, right))
+ cell_area = gtk_cell_layout_get_area (GTK_CELL_LAYOUT (column));
+ if (gtk_cell_area_focus (cell_area, direction))
{
- tree_view->priv->focus_column = column;
+ _gtk_tree_view_set_focus_column (tree_view, column);
found_column = TRUE;
break;
}
+
loop_end:
if (count == 1)
list = rtl ? list->prev : list->next;
if (found_column)
{
- if (!gtk_tree_view_has_special_cell (tree_view))
+ if (!gtk_tree_view_has_can_focus_cell (tree_view))
_gtk_tree_view_queue_draw_node (tree_view,
- cursor_tree,
- cursor_node,
+ tree_view->priv->cursor_tree,
+ tree_view->priv->cursor_node,
NULL);
g_signal_emit (tree_view, tree_view_signals[CURSOR_CHANGED], 0);
gtk_widget_grab_focus (GTK_WIDGET (tree_view));
else
{
gtk_widget_error_bell (GTK_WIDGET (tree_view));
+
+ if (last_focus_area)
+ gtk_cell_area_set_focus_cell (last_focus_area, last_focus_cell);
}
gtk_tree_view_clamp_column_visible (tree_view,
gtk_tree_view_get_cursor (tree_view, &old_path, NULL);
cursor_tree = tree_view->priv->tree;
- cursor_node = cursor_tree->root;
if (count == -1)
{
- while (cursor_node && cursor_node->left != cursor_tree->nil)
- cursor_node = cursor_node->left;
+ cursor_node = _gtk_rbtree_first (cursor_tree);
/* Now go forward to find the first focusable row. */
- path = _gtk_tree_view_find_path (tree_view, cursor_tree, cursor_node);
+ path = _gtk_tree_path_new_from_rbtree (cursor_tree, cursor_node);
search_first_focusable_path (tree_view, &path,
TRUE, &cursor_tree, &cursor_node);
}
else
{
+ cursor_node = cursor_tree->root;
+
do
{
- while (cursor_node && cursor_node->right != cursor_tree->nil)
+ while (cursor_node && !_gtk_rbtree_is_nil (cursor_node->right))
cursor_node = cursor_node->right;
if (cursor_node->children == NULL)
break;
while (1);
/* Now go backwards to find last focusable row. */
- path = _gtk_tree_view_find_path (tree_view, cursor_tree, cursor_node);
+ path = _gtk_tree_path_new_from_rbtree (cursor_tree, cursor_node);
search_first_focusable_path (tree_view, &path,
FALSE, &cursor_tree, &cursor_node);
}
if (gtk_tree_path_compare (old_path, path))
{
- gtk_tree_view_real_set_cursor (tree_view, path, TRUE, TRUE);
+ gtk_tree_view_real_set_cursor (tree_view, path, CLEAR_AND_SELECT | CLAMP_NODE);
gtk_widget_grab_focus (GTK_WIDGET (tree_view));
}
else
if (!gtk_widget_has_focus (GTK_WIDGET (tree_view)))
return FALSE;
- if (tree_view->priv->selection->type != GTK_SELECTION_MULTIPLE)
+ if (gtk_tree_selection_get_mode (tree_view->priv->selection) != GTK_SELECTION_MULTIPLE)
return FALSE;
gtk_tree_selection_select_all (tree_view->priv->selection);
if (!gtk_widget_has_focus (GTK_WIDGET (tree_view)))
return FALSE;
- if (tree_view->priv->selection->type != GTK_SELECTION_MULTIPLE)
+ if (gtk_tree_selection_get_mode (tree_view->priv->selection) != GTK_SELECTION_MULTIPLE)
return FALSE;
gtk_tree_selection_unselect_all (tree_view->priv->selection);
if (!gtk_widget_has_focus (GTK_WIDGET (tree_view)))
return FALSE;
- if (tree_view->priv->cursor)
- cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
-
- if (cursor_path == NULL)
+ if (tree_view->priv->cursor_node == NULL)
return FALSE;
+ cursor_path = _gtk_tree_path_new_from_rbtree (tree_view->priv->cursor_tree,
+ tree_view->priv->cursor_node);
+
_gtk_tree_view_find_node (tree_view, cursor_path,
&cursor_tree, &cursor_node);
return FALSE;
}
- if (!tree_view->priv->shift_pressed && start_editing &&
+ if (!tree_view->priv->extend_selection_pressed && start_editing &&
tree_view->priv->focus_column)
{
- if (gtk_tree_view_start_editing (tree_view, cursor_path))
+ if (gtk_tree_view_start_editing (tree_view, cursor_path, FALSE))
{
gtk_tree_path_free (cursor_path);
return TRUE;
}
}
- if (tree_view->priv->ctrl_pressed)
+ if (tree_view->priv->modify_selection_pressed)
mode |= GTK_TREE_SELECT_MODE_TOGGLE;
- if (tree_view->priv->shift_pressed)
+ if (tree_view->priv->extend_selection_pressed)
mode |= GTK_TREE_SELECT_MODE_EXTEND;
_gtk_tree_selection_internal_select_node (tree_view->priv->selection,
gtk_widget_grab_focus (GTK_WIDGET (tree_view));
_gtk_tree_view_queue_draw_node (tree_view, cursor_tree, cursor_node, NULL);
- if (!tree_view->priv->shift_pressed)
+ if (!tree_view->priv->extend_selection_pressed)
gtk_tree_view_row_activated (tree_view, cursor_path,
tree_view->priv->focus_column);
{
GtkRBTree *new_tree = NULL;
GtkRBNode *new_node = NULL;
- GtkRBTree *cursor_tree = NULL;
- GtkRBNode *cursor_node = NULL;
GtkTreePath *cursor_path = NULL;
if (!gtk_widget_has_focus (GTK_WIDGET (tree_view)))
return FALSE;
- cursor_path = NULL;
- if (tree_view->priv->cursor)
- cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
-
- if (cursor_path == NULL)
+ if (tree_view->priv->cursor_node == NULL)
return FALSE;
- _gtk_tree_view_find_node (tree_view, cursor_path,
- &cursor_tree, &cursor_node);
- if (cursor_tree == NULL)
- {
- gtk_tree_path_free (cursor_path);
- return FALSE;
- }
+ cursor_path = _gtk_tree_path_new_from_rbtree (tree_view->priv->cursor_tree,
+ tree_view->priv->cursor_node);
_gtk_tree_selection_internal_select_node (tree_view->priv->selection,
- cursor_node,
- cursor_tree,
+ tree_view->priv->cursor_node,
+ tree_view->priv->cursor_tree,
cursor_path,
GTK_TREE_SELECT_MODE_TOGGLE,
FALSE);
*/
_gtk_tree_view_find_node (tree_view, cursor_path, &new_tree, &new_node);
- if (cursor_tree != new_tree || cursor_node != new_node)
+ if (tree_view->priv->cursor_node != new_node)
return FALSE;
- gtk_tree_view_clamp_node_visible (tree_view, cursor_tree, cursor_node);
+ gtk_tree_view_clamp_node_visible (tree_view,
+ tree_view->priv->cursor_tree,
+ tree_view->priv->cursor_node);
gtk_widget_grab_focus (GTK_WIDGET (tree_view));
gtk_tree_view_queue_draw_path (tree_view, cursor_path, NULL);
gboolean open_all)
{
GtkTreePath *cursor_path = NULL;
- GtkRBTree *tree;
- GtkRBNode *node;
if (!gtk_widget_has_focus (GTK_WIDGET (tree_view)))
return FALSE;
- cursor_path = NULL;
- if (tree_view->priv->cursor)
- cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
-
- if (cursor_path == NULL)
+ if (tree_view->priv->cursor_node == NULL)
return FALSE;
- if (_gtk_tree_view_find_node (tree_view, cursor_path, &tree, &node))
- return FALSE;
+ cursor_path = _gtk_tree_path_new_from_rbtree (tree_view->priv->cursor_tree,
+ tree_view->priv->cursor_node);
/* Don't handle the event if we aren't an expander */
- if (!((node->flags & GTK_RBNODE_IS_PARENT) == GTK_RBNODE_IS_PARENT))
+ if (!GTK_RBNODE_FLAG_SET (tree_view->priv->cursor_node, GTK_RBNODE_IS_PARENT))
return FALSE;
if (!logical
expand = !expand;
if (expand)
- gtk_tree_view_real_expand_row (tree_view, cursor_path, tree, node, open_all, TRUE);
+ gtk_tree_view_real_expand_row (tree_view,
+ cursor_path,
+ tree_view->priv->cursor_tree,
+ tree_view->priv->cursor_node,
+ open_all,
+ TRUE);
else
- gtk_tree_view_real_collapse_row (tree_view, cursor_path, tree, node, TRUE);
+ gtk_tree_view_real_collapse_row (tree_view,
+ cursor_path,
+ tree_view->priv->cursor_tree,
+ tree_view->priv->cursor_node,
+ TRUE);
gtk_tree_path_free (cursor_path);
static gboolean
gtk_tree_view_real_select_cursor_parent (GtkTreeView *tree_view)
{
- GtkRBTree *cursor_tree = NULL;
- GtkRBNode *cursor_node = NULL;
GtkTreePath *cursor_path = NULL;
GdkModifierType state;
if (!gtk_widget_has_focus (GTK_WIDGET (tree_view)))
goto out;
- cursor_path = NULL;
- if (tree_view->priv->cursor)
- cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
-
- if (cursor_path == NULL)
+ if (tree_view->priv->cursor_node == NULL)
goto out;
- _gtk_tree_view_find_node (tree_view, cursor_path,
- &cursor_tree, &cursor_node);
- if (cursor_tree == NULL)
- {
- gtk_tree_path_free (cursor_path);
- goto out;
- }
+ cursor_path = _gtk_tree_path_new_from_rbtree (tree_view->priv->cursor_tree,
+ tree_view->priv->cursor_node);
- if (cursor_tree->parent_node)
+ if (tree_view->priv->cursor_tree->parent_node)
{
gtk_tree_view_queue_draw_path (tree_view, cursor_path, NULL);
- cursor_node = cursor_tree->parent_node;
- cursor_tree = cursor_tree->parent_tree;
gtk_tree_path_up (cursor_path);
if (gtk_get_current_event_state (&state))
{
- if ((state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
- tree_view->priv->ctrl_pressed = TRUE;
+ GdkModifierType modify_mod_mask;
+
+ modify_mod_mask =
+ gtk_widget_get_modifier_mask (GTK_WIDGET (tree_view),
+ GDK_MODIFIER_INTENT_MODIFY_SELECTION);
+
+ if ((state & modify_mod_mask) == modify_mod_mask)
+ tree_view->priv->modify_selection_pressed = TRUE;
}
- gtk_tree_view_real_set_cursor (tree_view, cursor_path, TRUE, FALSE);
- gtk_tree_view_clamp_node_visible (tree_view, cursor_tree, cursor_node);
+ gtk_tree_view_real_set_cursor (tree_view, cursor_path, CLEAR_AND_SELECT | CLAMP_NODE);
+ gtk_tree_path_free (cursor_path);
gtk_widget_grab_focus (GTK_WIDGET (tree_view));
- gtk_tree_view_queue_draw_path (tree_view, cursor_path, NULL);
- gtk_tree_path_free (cursor_path);
- tree_view->priv->ctrl_pressed = FALSE;
+ tree_view->priv->modify_selection_pressed = FALSE;
return TRUE;
}
gdk_event_free (fevent);
}
+
+ g_list_free (devices);
}
static void
for (list = tree_view->priv->columns; list; list = list->next)
{
GtkTreeViewColumn *column;
+ GtkWidget *button;
column = list->data;
if (!gtk_tree_view_column_get_visible (column))
continue;
- if (gtk_widget_has_focus (column->button))
+ button = gtk_tree_view_column_get_button (column);
+ if (gtk_widget_has_focus (button))
{
found_focus = TRUE;
break;
TRUE);
}
-/* this function returns the new width of the column being resized given
- * the column and x position of the cursor; the x cursor position is passed
- * in as a pointer and automagicly corrected if it's beyond min/max limits
- */
-static gint
-gtk_tree_view_new_column_width (GtkTreeView *tree_view,
- gint i,
- gint *x)
-{
- GtkAllocation allocation;
- GtkTreeViewColumn *column;
- GtkRequisition button_req;
- gint max_width, min_width;
- gint width;
- gboolean rtl;
-
- /* first translate the x position from widget->window
- * to clist->clist_window
- */
- rtl = (gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_RTL);
- column = g_list_nth (tree_view->priv->columns, i)->data;
- gtk_widget_get_allocation (column->button, &allocation);
- width = rtl ? (allocation.x + allocation.width - *x) : (*x - allocation.x);
-
- /* Clamp down the value */
- min_width = gtk_tree_view_column_get_min_width (column);
- if (min_width == -1)
- {
- gtk_widget_get_preferred_size (column->button, &button_req, NULL);
- width = MAX (button_req.width, width);
- }
- else
- width = MAX (min_width, width);
-
- max_width = gtk_tree_view_column_get_max_width (column);
- if (max_width != -1)
- width = MIN (width, max_width);
-
- *x = rtl ? (allocation.x + allocation.width - width) : (allocation.x + width);
-
- return width;
-}
-
-
/* FIXME this adjust_allocation is a big cut-and-paste from
* GtkCList, needs to be some "official" way to do this
* factored out.
gint dy;
gdk_window_move (tree_view->priv->bin_window,
- - tree_view->priv->hadjustment->value,
- TREE_VIEW_HEADER_HEIGHT (tree_view));
+ - gtk_adjustment_get_value (tree_view->priv->hadjustment),
+ gtk_tree_view_get_effective_header_height (tree_view));
gdk_window_move (tree_view->priv->header_window,
- - tree_view->priv->hadjustment->value,
+ - gtk_adjustment_get_value (tree_view->priv->hadjustment),
0);
- dy = tree_view->priv->dy - (int) tree_view->priv->vadjustment->value;
+ dy = tree_view->priv->dy - (int) gtk_adjustment_get_value (tree_view->priv->vadjustment);
if (dy)
{
update_prelight (tree_view,
tree_view->priv->event_last_x,
tree_view->priv->event_last_y - dy);
- if (tree_view->priv->edited_column &&
- GTK_IS_WIDGET (tree_view->priv->edited_column->editable_widget))
+ if (tree_view->priv->edited_column)
{
GList *list;
- GtkWidget *widget;
GtkTreeViewChild *child = NULL;
+ GtkCellEditable *edit_widget;
+ GtkCellArea *area;
- widget = GTK_WIDGET (tree_view->priv->edited_column->editable_widget);
- adjust_allocation (widget, 0, dy);
-
- for (list = tree_view->priv->children; list; list = list->next)
- {
- child = (GtkTreeViewChild *)list->data;
- if (child->widget == widget)
- {
- child->y += dy;
- break;
- }
- }
+ area = gtk_cell_layout_get_area (GTK_CELL_LAYOUT (tree_view->priv->edited_column));
+ edit_widget = gtk_cell_area_get_edit_widget (area);
+ if (GTK_IS_WIDGET (edit_widget))
+ {
+ adjust_allocation (GTK_WIDGET (edit_widget), 0, dy);
+
+ for (list = tree_view->priv->children; list; list = list->next)
+ {
+ child = (GtkTreeViewChild *)list->data;
+ if (child->widget == GTK_WIDGET (edit_widget))
+ {
+ child->y += dy;
+ break;
+ }
+ }
+ }
}
}
gdk_window_scroll (tree_view->priv->bin_window, 0, dy);
- if (tree_view->priv->dy != (int) tree_view->priv->vadjustment->value)
+ if (tree_view->priv->dy != (int) gtk_adjustment_get_value (tree_view->priv->vadjustment))
{
/* update our dy and top_row */
- tree_view->priv->dy = (int) tree_view->priv->vadjustment->value;
+ tree_view->priv->dy = (int) gtk_adjustment_get_value (tree_view->priv->vadjustment);
if (!tree_view->priv->in_top_row_to_dy)
gtk_tree_view_dy_to_top_row (tree_view);
}
-
- gdk_window_process_updates (tree_view->priv->header_window, TRUE);
- gtk_tree_view_bin_process_updates (tree_view);
}
}
/**
* gtk_tree_view_set_model:
- * @tree_view: A #GtkTreeNode.
+ * @tree_view: A #GtkTreeView.
* @model: (allow-none): The model.
*
* Sets the model for a #GtkTreeView. If the @tree_view already has a model
tree_view->priv->scroll_to_path = NULL;
}
+ if (tree_view->priv->rubber_band_status)
+ gtk_tree_view_stop_rubber_band (tree_view);
+
if (tree_view->priv->model)
{
GList *tmplist = tree_view->priv->columns;
gtk_tree_view_unref_and_check_selection_tree (tree_view, tree_view->priv->tree);
gtk_tree_view_stop_editing (tree_view, TRUE);
- remove_expand_collapse_timeout (tree_view);
-
g_signal_handlers_disconnect_by_func (tree_view->priv->model,
gtk_tree_view_row_changed,
tree_view);
gtk_tree_row_reference_free (tree_view->priv->drag_dest_row);
tree_view->priv->drag_dest_row = NULL;
- gtk_tree_row_reference_free (tree_view->priv->cursor);
- tree_view->priv->cursor = NULL;
gtk_tree_row_reference_free (tree_view->priv->anchor);
tree_view->priv->anchor = NULL;
gtk_tree_row_reference_free (tree_view->priv->top_row);
flags = gtk_tree_model_get_flags (tree_view->priv->model);
if ((flags & GTK_TREE_MODEL_LIST_ONLY) == GTK_TREE_MODEL_LIST_ONLY)
- GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_IS_LIST);
+ tree_view->priv->is_list = TRUE;
else
- GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_IS_LIST);
+ tree_view->priv->is_list = FALSE;
path = gtk_tree_path_new_first ();
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_tree_view_accessible_add (tree_view, tree_view->priv->tree, NULL);
}
gtk_tree_path_free (path);
install_presize_handler (tree_view);
}
+ gtk_tree_view_real_set_cursor (tree_view, NULL, CURSOR_INVALID);
+
g_object_notify (G_OBJECT (tree_view), "model");
if (tree_view->priv->selection)
{
g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), NULL);
+ return gtk_tree_view_do_get_hadjustment (tree_view);
+}
+
+static GtkAdjustment *
+gtk_tree_view_do_get_hadjustment (GtkTreeView *tree_view)
+{
return tree_view->priv->hadjustment;
}
gtk_tree_view_set_hadjustment (GtkTreeView *tree_view,
GtkAdjustment *adjustment)
{
- GtkTreeViewPrivate *priv = tree_view->priv;
-
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
g_return_if_fail (adjustment == NULL || GTK_IS_ADJUSTMENT (adjustment));
+ gtk_tree_view_do_set_hadjustment (tree_view, adjustment);
+}
+
+static void
+gtk_tree_view_do_set_hadjustment (GtkTreeView *tree_view,
+ GtkAdjustment *adjustment)
+{
+ GtkTreeViewPrivate *priv = tree_view->priv;
+
if (adjustment && priv->hadjustment == adjustment)
return;
{
g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), NULL);
+ return gtk_tree_view_do_get_vadjustment (tree_view);
+}
+
+static GtkAdjustment *
+gtk_tree_view_do_get_vadjustment (GtkTreeView *tree_view)
+{
return tree_view->priv->vadjustment;
}
gtk_tree_view_set_vadjustment (GtkTreeView *tree_view,
GtkAdjustment *adjustment)
{
- GtkTreeViewPrivate *priv = tree_view->priv;
-
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
g_return_if_fail (adjustment == NULL || GTK_IS_ADJUSTMENT (adjustment));
+ gtk_tree_view_do_set_vadjustment (tree_view, adjustment);
+}
+
+static void
+gtk_tree_view_do_set_vadjustment (GtkTreeView *tree_view,
+ GtkAdjustment *adjustment)
+{
+ GtkTreeViewPrivate *priv = tree_view->priv;
+
if (adjustment && priv->vadjustment == adjustment)
return;
{
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);
+ return tree_view->priv->headers_visible;
}
/**
GList *list;
GtkTreeViewColumn *column;
GtkAllocation allocation;
+ GtkWidget *button;
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)
+ if (tree_view->priv->headers_visible == headers_visible)
return;
- if (headers_visible)
- GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE);
- else
- GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE);
+ tree_view->priv->headers_visible = headers_visible == TRUE;
if (gtk_widget_get_realized (GTK_WIDGET (tree_view)))
{
{
gtk_widget_get_allocation (GTK_WIDGET (tree_view), &allocation);
gdk_window_move_resize (tree_view->priv->bin_window,
- x, y + TREE_VIEW_HEADER_HEIGHT (tree_view),
- tree_view->priv->width, allocation.height - + TREE_VIEW_HEADER_HEIGHT (tree_view));
+ x, y + gtk_tree_view_get_effective_header_height (tree_view),
+ tree_view->priv->width, allocation.height - + gtk_tree_view_get_effective_header_height (tree_view));
if (gtk_widget_get_mapped (GTK_WIDGET (tree_view)))
gtk_tree_view_map_buttons (tree_view);
for (list = tree_view->priv->columns; list; list = list->next)
{
column = list->data;
- gtk_widget_unmap (column->button);
+ button = gtk_tree_view_column_get_button (column);
+
+ gtk_widget_hide (button);
+ gtk_widget_unmap (button);
}
gdk_window_hide (tree_view->priv->header_window);
}
}
gtk_widget_get_allocation (GTK_WIDGET (tree_view), &allocation);
- tree_view->priv->vadjustment->page_size = allocation.height - TREE_VIEW_HEADER_HEIGHT (tree_view);
- 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;
- gtk_adjustment_changed (tree_view->priv->vadjustment);
+ gtk_adjustment_configure (tree_view->priv->vadjustment,
+ gtk_adjustment_get_value (tree_view->priv->vadjustment),
+ 0,
+ tree_view->priv->height,
+ gtk_adjustment_get_step_increment (tree_view->priv->vadjustment),
+ (allocation.height - gtk_tree_view_get_effective_header_height (tree_view)) / 2,
+ allocation.height - gtk_tree_view_get_effective_header_height (tree_view));
gtk_widget_queue_resize (GTK_WIDGET (tree_view));
}
/**
- * gtk_tree_view_set_rules_hint
+ * gtk_tree_view_set_rules_hint:
* @tree_view: a #GtkTreeView
* @setting: %TRUE if the tree requires reading across rows
*
}
/**
- * gtk_tree_view_get_rules_hint
+ * gtk_tree_view_get_rules_hint:
* @tree_view: a #GtkTreeView
*
* Gets the setting set by gtk_tree_view_set_rules_hint().
return tree_view->priv->has_rules;
}
+
+/**
+ * gtk_tree_view_set_activate_on_single_click:
+ * @tree_view: a #GtkTreeView
+ * @single: %TRUE to emit row-activated on a single click
+ *
+ * Cause the #GtkTreeView::row-activated signal to be emitted
+ * on a single click instead of a double click.
+ *
+ * Since: 3.8
+ **/
+void
+gtk_tree_view_set_activate_on_single_click (GtkTreeView *tree_view,
+ gboolean single)
+{
+ g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+
+ single = single != FALSE;
+
+ if (tree_view->priv->activate_on_single_click == single)
+ return;
+
+ tree_view->priv->activate_on_single_click = single;
+ g_object_notify (G_OBJECT (tree_view), "activate-on-single-click");
+}
+
+/**
+ * gtk_tree_view_get_activate_on_single_click:
+ * @tree_view: a #GtkTreeView
+ *
+ * Gets the setting set by gtk_tree_view_set_activate_on_single_click().
+ *
+ * Return value: %TRUE if row-activated will be emitted on a single click
+ *
+ * Since: 3.8
+ **/
+gboolean
+gtk_tree_view_get_activate_on_single_click (GtkTreeView *tree_view)
+{
+ g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
+
+ return tree_view->priv->activate_on_single_click;
+}
+
/* Public Column functions
*/
{
g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), -1);
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (column), -1);
- g_return_val_if_fail (column->tree_view == NULL, -1);
+ g_return_val_if_fail (gtk_tree_view_column_get_tree_view (column) == NULL, -1);
return gtk_tree_view_insert_column (tree_view, column, -1);
}
+void
+_gtk_tree_view_reset_header_styles (GtkTreeView *tree_view)
+{
+ GList *columns;
+
+ for (columns = tree_view->priv->columns; columns; columns = columns->next)
+ {
+ GtkTreeViewColumn *column = columns->data;
+ GtkWidget *header_widget;
+
+ if (!gtk_tree_view_column_get_visible (column))
+ continue;
+
+ header_widget = gtk_tree_view_column_get_widget (column);
+
+ if (!header_widget)
+ header_widget = gtk_tree_view_column_get_button (column);
+
+ _gtk_widget_invalidate_style_context (header_widget, GTK_CSS_CHANGE_PARENT_REGION);
+ }
+}
+
/**
* gtk_tree_view_remove_column:
gtk_tree_view_remove_column (GtkTreeView *tree_view,
GtkTreeViewColumn *column)
{
+ guint position;
+
g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), -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);
+ g_return_val_if_fail (gtk_tree_view_column_get_tree_view (column) == GTK_WIDGET (tree_view), -1);
if (tree_view->priv->focus_column == column)
- tree_view->priv->focus_column = NULL;
+ _gtk_tree_view_set_focus_column (tree_view, NULL);
if (tree_view->priv->edited_column == column)
{
G_CALLBACK (column_sizing_notify),
tree_view);
- _gtk_tree_view_column_unset_tree_view (column);
+ position = g_list_index (tree_view->priv->columns, column);
tree_view->priv->columns = g_list_remove (tree_view->priv->columns, column);
tree_view->priv->n_columns--;
tmp_column = GTK_TREE_VIEW_COLUMN (list->data);
if (gtk_tree_view_column_get_visible (tmp_column))
- _gtk_tree_view_column_cell_set_dirty (tmp_column, TRUE);
+ _gtk_tree_view_column_cell_set_dirty (tmp_column, TRUE);
}
if (tree_view->priv->n_columns == 0 &&
gtk_widget_queue_resize (GTK_WIDGET (tree_view));
}
+ _gtk_tree_view_reset_header_styles (tree_view);
+ _gtk_tree_view_column_unset_tree_view (column);
+ _gtk_tree_view_accessible_remove_column (tree_view, column, position);
+
g_object_unref (column);
g_signal_emit (tree_view, tree_view_signals[COLUMNS_CHANGED], 0);
{
g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), -1);
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (column), -1);
- g_return_val_if_fail (column->tree_view == NULL, -1);
+ g_return_val_if_fail (gtk_tree_view_column_get_tree_view (column) == NULL, -1);
if (tree_view->priv->fixed_height_mode)
g_return_val_if_fail (gtk_tree_view_column_get_sizing (column)
== GTK_TREE_VIEW_COLUMN_FIXED, -1);
+ if (position < 0 || position > tree_view->priv->n_columns)
+ position = tree_view->priv->n_columns;
+
g_object_ref_sink (column);
if (tree_view->priv->n_columns == 0 &&
{
column = GTK_TREE_VIEW_COLUMN (list->data);
if (gtk_tree_view_column_get_visible (column))
- _gtk_tree_view_column_cell_set_dirty (column, TRUE);
+ _gtk_tree_view_column_cell_set_dirty (column, TRUE);
}
gtk_widget_queue_resize (GTK_WIDGET (tree_view));
}
+ _gtk_tree_view_reset_header_styles (tree_view);
+
+ _gtk_tree_view_accessible_add_column (tree_view, column, position);
+
g_signal_emit (tree_view, tree_view_signals[COLUMNS_CHANGED], 0);
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.
+ * @position: The position to insert the new column in
+ * @title: The title to set the header to
+ * @cell: The #GtkCellRenderer
+ * @...: 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
va_end (args);
- gtk_tree_view_insert_column (tree_view, column, position);
-
- return tree_view->priv->n_columns;
+ return gtk_tree_view_insert_column (tree_view, column, position);
}
/**
* @dnotify: destroy notifier for @data
*
* Convenience function that inserts a new column into the #GtkTreeView
- * with the given cell renderer and a #GtkCellDataFunc to set cell renderer
+ * with the given cell renderer and a #GtkTreeCellDataFunc to set cell renderer
* attributes (normally using data from the model). See also
* gtk_tree_view_column_set_cell_data_func(), gtk_tree_view_column_pack_start().
* If @tree_view has "fixed_height" mode enabled, then the new column will have its
gtk_tree_view_column_pack_start (column, cell, TRUE);
gtk_tree_view_column_set_cell_data_func (column, cell, func, data, dnotify);
- gtk_tree_view_insert_column (tree_view, column, position);
+ return gtk_tree_view_insert_column (tree_view, column, position);
+}
+
+/**
+ * gtk_tree_view_get_n_columns:
+ * @tree_view: a #GtkTreeView
+ *
+ * Queries the number of columns in the given @tree_view.
+ *
+ * Returns: The number of columns in the @tree_view
+ *
+ * Since: 3.4
+ **/
+guint
+gtk_tree_view_get_n_columns (GtkTreeView *tree_view)
+{
+ g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), 0);
return tree_view->priv->n_columns;
}
gtk_tree_view_size_allocate_columns (GTK_WIDGET (tree_view), NULL);
}
+ _gtk_tree_view_reset_header_styles (tree_view);
+
+ _gtk_tree_view_accessible_reorder_column (tree_view, column);
+
g_signal_emit (tree_view, tree_view_signals[COLUMNS_CHANGED], 0);
}
GtkTreeViewColumn *column)
{
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
- g_return_if_fail (column == NULL || GTK_IS_TREE_VIEW_COLUMN (column));
-
- if (tree_view->priv->expander_column != column)
- {
- GList *list;
-
- if (column)
- {
- /* Confirm that column is in tree_view */
- for (list = tree_view->priv->columns; list; list = list->next)
- if (list->data == column)
- break;
- g_return_if_fail (list != NULL);
- }
+ g_return_if_fail (column == NULL || GTK_IS_TREE_VIEW_COLUMN (column));
+ g_return_if_fail (column == NULL || gtk_tree_view_column_get_tree_view (column) == GTK_WIDGET (tree_view));
+ if (tree_view->priv->expander_column != column)
+ {
tree_view->priv->expander_column = column;
g_object_notify (G_OBJECT (tree_view), "expander-column");
}
GtkTreePath *path;
GtkTreeIter iter;
- path = _gtk_tree_view_find_path (tree_view, tree, node);
+ path = _gtk_tree_path_new_from_rbtree (tree, node);
gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
g_signal_emit (tree_view, tree_view_signals[ROW_EXPANDED], 0, &iter, path);
gtk_tree_path_free (path);
}
-/* Timeout to animate the expander during expands and collapses */
-static gboolean
-expand_collapse_timeout (gpointer data)
-{
- return do_expand_collapse (data);
-}
-
-static void
-add_expand_collapse_timeout (GtkTreeView *tree_view,
- GtkRBTree *tree,
- GtkRBNode *node,
- gboolean expand)
-{
- if (tree_view->priv->expand_collapse_timeout != 0)
- return;
-
- tree_view->priv->expand_collapse_timeout =
- gdk_threads_add_timeout (50, expand_collapse_timeout, tree_view);
- tree_view->priv->expanded_collapsed_tree = tree;
- tree_view->priv->expanded_collapsed_node = node;
-
- if (expand)
- GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_IS_SEMI_COLLAPSED);
- else
- GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_IS_SEMI_EXPANDED);
-}
-
-static void
-remove_expand_collapse_timeout (GtkTreeView *tree_view)
-{
- if (tree_view->priv->expand_collapse_timeout)
- {
- g_source_remove (tree_view->priv->expand_collapse_timeout);
- tree_view->priv->expand_collapse_timeout = 0;
- }
-
- if (tree_view->priv->expanded_collapsed_node != NULL)
- {
- GTK_RBNODE_UNSET_FLAG (tree_view->priv->expanded_collapsed_node, GTK_RBNODE_IS_SEMI_EXPANDED);
- GTK_RBNODE_UNSET_FLAG (tree_view->priv->expanded_collapsed_node, GTK_RBNODE_IS_SEMI_COLLAPSED);
-
- tree_view->priv->expanded_collapsed_node = NULL;
- }
-}
-
-static void
-cancel_arrow_animation (GtkTreeView *tree_view)
-{
- if (tree_view->priv->expand_collapse_timeout)
- {
- while (do_expand_collapse (tree_view));
-
- remove_expand_collapse_timeout (tree_view);
- }
-}
-
-static gboolean
-do_expand_collapse (GtkTreeView *tree_view)
-{
- GtkRBNode *node;
- GtkRBTree *tree;
- gboolean expanding;
- gboolean redraw;
-
- redraw = FALSE;
- expanding = TRUE;
-
- node = tree_view->priv->expanded_collapsed_node;
- tree = tree_view->priv->expanded_collapsed_tree;
-
- if (node->children == NULL)
- expanding = FALSE;
-
- if (expanding)
- {
- if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SEMI_COLLAPSED))
- {
- GTK_RBNODE_UNSET_FLAG (node, GTK_RBNODE_IS_SEMI_COLLAPSED);
- GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_IS_SEMI_EXPANDED);
-
- redraw = TRUE;
-
- }
- else if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SEMI_EXPANDED))
- {
- GTK_RBNODE_UNSET_FLAG (node, GTK_RBNODE_IS_SEMI_EXPANDED);
-
- redraw = TRUE;
- }
- }
- else
- {
- if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SEMI_EXPANDED))
- {
- GTK_RBNODE_UNSET_FLAG (node, GTK_RBNODE_IS_SEMI_EXPANDED);
- GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_IS_SEMI_COLLAPSED);
-
- redraw = TRUE;
- }
- else if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SEMI_COLLAPSED))
- {
- GTK_RBNODE_UNSET_FLAG (node, GTK_RBNODE_IS_SEMI_COLLAPSED);
-
- redraw = TRUE;
-
- }
- }
-
- if (redraw)
- {
- gtk_tree_view_queue_draw_arrow (tree_view, tree, node);
-
- return TRUE;
- }
-
- return FALSE;
-}
-
/**
* gtk_tree_view_collapse_all:
* @tree_view: A #GtkTreeView.
indices = gtk_tree_path_get_indices (path);
tree = tree_view->priv->tree;
- node = tree->root;
- while (node && node->left != tree->nil)
- node = node->left;
+ node = _gtk_rbtree_first (tree);
while (node)
{
gtk_tree_path_append_index (tmp_path, 0);
tree = node->children;
- node = tree->root;
- while (node->left != tree->nil)
- node = node->left;
+ node = _gtk_rbtree_first (tree);
/* try to expand the children */
do
{
gtk_tree_path_get_depth (path) + 1,
open_all);
- remove_expand_collapse_timeout (tree_view);
-
- if (animate)
- add_expand_collapse_timeout (tree_view, tree, node, TRUE);
+ _gtk_tree_view_accessible_add (tree_view, node->children, NULL);
+ _gtk_tree_view_accessible_add_state (tree_view,
+ tree, node,
+ GTK_CELL_RENDERER_EXPANDED);
install_presize_handler (tree_view);
gboolean collapse;
gint x, y;
GList *list;
- GdkWindow *child, *parent;
+ GdkWindow *child;
+ gboolean selection_changed, cursor_changed;
if (animate)
g_object_get (gtk_widget_get_settings (GTK_WIDGET (tree_view)),
if (node->children == NULL)
return FALSE;
-
gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
g_signal_emit (tree_view, tree_view_signals[TEST_COLLAPSE_ROW], 0, &iter, path, &collapse);
gtk_tree_path_free (child_path);
}
- if (gtk_tree_row_reference_valid (tree_view->priv->cursor))
+ if (tree_view->priv->cursor_node)
{
- GtkTreePath *cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
-
- if (gtk_tree_path_is_ancestor (path, cursor_path))
- {
- 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,
- path);
- }
- gtk_tree_path_free (cursor_path);
+ cursor_changed = (node->children == tree_view->priv->cursor_tree)
+ || _gtk_rbtree_contains (node->children, tree_view->priv->cursor_tree);
}
+ else
+ cursor_changed = FALSE;
if (gtk_tree_row_reference_valid (tree_view->priv->anchor))
{
gtk_tree_path_free (anchor_path);
}
+ selection_changed = gtk_tree_view_unref_and_check_selection_tree (tree_view, node->children);
+
/* Stop a pending double click */
tree_view->priv->last_button_x = -1;
tree_view->priv->last_button_y = -1;
- remove_expand_collapse_timeout (tree_view);
+ _gtk_tree_view_accessible_remove (tree_view, node->children, NULL);
+ _gtk_tree_view_accessible_remove_state (tree_view,
+ tree, node,
+ GTK_CELL_RENDERER_EXPANDED);
+
+ _gtk_rbtree_remove (node->children);
+
+ if (cursor_changed)
+ gtk_tree_view_real_set_cursor (tree_view, path, CLEAR_AND_SELECT | CURSOR_INVALID);
+ if (selection_changed)
+ g_signal_emit_by_name (tree_view->priv->selection, "changed");
- if (gtk_tree_view_unref_and_check_selection_tree (tree_view, node->children))
- {
- _gtk_rbtree_remove (node->children);
- g_signal_emit_by_name (tree_view->priv->selection, "changed");
- }
- else
- _gtk_rbtree_remove (node->children);
-
- if (animate)
- add_expand_collapse_timeout (tree_view, tree, node, FALSE);
-
if (gtk_widget_get_mapped (GTK_WIDGET (tree_view)))
{
gtk_widget_queue_resize (GTK_WIDGET (tree_view));
}
g_signal_emit (tree_view, tree_view_signals[ROW_COLLAPSED], 0, &iter, path);
-
+
if (gtk_widget_get_mapped (GTK_WIDGET (tree_view)))
{
/* now that we've collapsed all rows, we want to try to set the prelight
* again. To do this, we fake a motion event and send it to ourselves. */
- child = tree_view->priv->bin_window;
- parent = gdk_window_get_parent (child);
-
- if (gdk_window_get_pointer (parent, &x, &y, NULL) == child)
+ child = gdk_window_get_device_position (gdk_window_get_parent (tree_view->priv->bin_window),
+ gdk_device_manager_get_client_pointer (
+ gdk_display_get_device_manager (
+ gtk_widget_get_display (GTK_WIDGET (tree_view)))),
+ &x, &y, NULL);
+ if (child == tree_view->priv->bin_window)
{
GdkEventMotion event;
gint child_x, child_y;
if (tree == NULL || tree->root == NULL)
return;
- node = tree->root;
-
- while (node && node->left != tree->nil)
- node = node->left;
+ node = _gtk_rbtree_first (tree);
while (node)
{
* @reorderable: %TRUE, if the tree can be reordered.
*
* This function is a convenience function to allow you to reorder
- * models that support the #GtkDragSourceIface and the
- * #GtkDragDestIface. Both #GtkTreeStore and #GtkListStore support
+ * models that support the #GtkTreeDragSourceIface and the
+ * #GtkTreeDragDestIface. Both #GtkTreeStore and #GtkListStore support
* these. If @reorderable is %TRUE, then the user can reorder the
* model by dragging and dropping rows. The developer can listen to
* these changes by connecting to the model's row_inserted and
static void
gtk_tree_view_real_set_cursor (GtkTreeView *tree_view,
GtkTreePath *path,
- gboolean clear_and_select,
- gboolean clamp_node)
+ SetCursorFlags flags)
{
- GtkRBTree *tree = NULL;
- GtkRBNode *node = NULL;
-
- if (gtk_tree_row_reference_valid (tree_view->priv->cursor))
+ if (!(flags & CURSOR_INVALID) && tree_view->priv->cursor_node)
{
- GtkTreePath *cursor_path;
- cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
- gtk_tree_view_queue_draw_path (tree_view, cursor_path, NULL);
- gtk_tree_path_free (cursor_path);
+ _gtk_tree_view_accessible_remove_state (tree_view,
+ tree_view->priv->cursor_tree,
+ tree_view->priv->cursor_node,
+ GTK_CELL_RENDERER_FOCUSED);
+ _gtk_tree_view_queue_draw_node (tree_view,
+ tree_view->priv->cursor_tree,
+ tree_view->priv->cursor_node,
+ NULL);
}
- gtk_tree_row_reference_free (tree_view->priv->cursor);
- tree_view->priv->cursor = NULL;
-
/* One cannot set the cursor on a separator. Also, if
* _gtk_tree_view_find_node returns TRUE, it ran out of tree
* before finding the tree and node belonging to path. The
* path maps to a non-existing path and we will silently bail out.
* We unset tree and node to avoid further processing.
*/
- if (!row_is_separator (tree_view, NULL, path)
- && _gtk_tree_view_find_node (tree_view, path, &tree, &node) == FALSE)
- {
- tree_view->priv->cursor =
- gtk_tree_row_reference_new_proxy (G_OBJECT (tree_view),
- tree_view->priv->model,
- path);
- }
- else
+ if (path == NULL ||
+ row_is_separator (tree_view, NULL, path)
+ || _gtk_tree_view_find_node (tree_view,
+ path,
+ &tree_view->priv->cursor_tree,
+ &tree_view->priv->cursor_node))
{
- tree = NULL;
- node = NULL;
+ tree_view->priv->cursor_tree = NULL;
+ tree_view->priv->cursor_node = NULL;
}
- if (tree != NULL)
+ if (tree_view->priv->cursor_node != NULL)
{
GtkRBTree *new_tree = NULL;
GtkRBNode *new_node = NULL;
- if (clear_and_select && !tree_view->priv->ctrl_pressed)
+ if ((flags & CLEAR_AND_SELECT) && !tree_view->priv->modify_selection_pressed)
{
GtkTreeSelectMode mode = 0;
- if (tree_view->priv->ctrl_pressed)
- mode |= GTK_TREE_SELECT_MODE_TOGGLE;
- if (tree_view->priv->shift_pressed)
+ if (tree_view->priv->extend_selection_pressed)
mode |= GTK_TREE_SELECT_MODE_EXTEND;
_gtk_tree_selection_internal_select_node (tree_view->priv->selection,
- node, tree, path, mode,
+ tree_view->priv->cursor_node,
+ tree_view->priv->cursor_tree,
+ path,
+ mode,
FALSE);
}
*/
_gtk_tree_view_find_node (tree_view, path, &new_tree, &new_node);
- if (tree != new_tree || node != new_node)
+ if (tree_view->priv->cursor_node != new_node)
return;
- if (clamp_node)
+ if (flags & CLAMP_NODE)
{
- gtk_tree_view_clamp_node_visible (tree_view, tree, node);
- _gtk_tree_view_queue_draw_node (tree_view, tree, node, NULL);
+ gtk_tree_view_clamp_node_visible (tree_view,
+ tree_view->priv->cursor_tree,
+ tree_view->priv->cursor_node);
+ _gtk_tree_view_queue_draw_node (tree_view,
+ tree_view->priv->cursor_tree,
+ tree_view->priv->cursor_node,
+ NULL);
}
+
+ _gtk_tree_view_accessible_add_state (tree_view,
+ tree_view->priv->cursor_tree,
+ tree_view->priv->cursor_node,
+ GTK_CELL_RENDERER_FOCUSED);
}
- g_signal_emit (tree_view, tree_view_signals[CURSOR_CHANGED], 0);
+ if (!gtk_widget_in_destruction (GTK_WIDGET (tree_view)))
+ g_signal_emit (tree_view, tree_view_signals[CURSOR_CHANGED], 0);
}
/**
* gtk_tree_view_get_cursor:
* @tree_view: A #GtkTreeView
- * @path: (out) (allow-none): A pointer to be filled with the current cursor path, or %NULL
- * @focus_column: (out) (allow-none): A pointer to be filled with the current focus column, or %NULL
+ * @path: (out) (transfer full) (allow-none): A pointer to be filled with the current cursor path, or %NULL
+ * @focus_column: (out) (transfer none) (allow-none): A pointer to be filled with the current focus column, or %NULL
*
* Fills in @path and @focus_column with the current path and focus column. If
* the cursor isn't currently set, then *@path will be %NULL. If no column
if (path)
{
- if (gtk_tree_row_reference_valid (tree_view->priv->cursor))
- *path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
+ if (tree_view->priv->cursor_node)
+ *path = _gtk_tree_path_new_from_rbtree (tree_view->priv->cursor_tree,
+ tree_view->priv->cursor_node);
else
*path = NULL;
}
/* cancel the current editing, if it exists */
if (tree_view->priv->edited_column &&
- tree_view->priv->edited_column->editable_widget)
+ gtk_cell_area_get_edit_widget
+ (gtk_cell_layout_get_area (GTK_CELL_LAYOUT (tree_view->priv->edited_column))))
gtk_tree_view_stop_editing (tree_view, TRUE);
- gtk_tree_view_real_set_cursor (tree_view, path, TRUE, TRUE);
+ gtk_tree_view_real_set_cursor (tree_view, path, CLEAR_AND_SELECT | CLAMP_NODE);
if (focus_column &&
gtk_tree_view_column_get_visible (focus_column))
break;
}
g_return_if_fail (column_in_tree);
- tree_view->priv->focus_column = focus_column;
+ _gtk_tree_view_set_focus_column (tree_view, focus_column);
if (focus_cell)
gtk_tree_view_column_focus_cell (focus_column, focus_cell);
if (start_editing)
- gtk_tree_view_start_editing (tree_view, path);
+ gtk_tree_view_start_editing (tree_view, path, TRUE);
}
}
* @x: The x position to be identified (relative to bin_window).
* @y: The y position to be identified (relative to bin_window).
* @path: (out) (allow-none): A pointer to a #GtkTreePath pointer to be filled in, or %NULL
- * @column: (out) (allow-none): A pointer to a #GtkTreeViewColumn pointer to be filled in, or %NULL
+ * @column: (out) (transfer none) (allow-none): A pointer to a #GtkTreeViewColumn pointer to be filled in, or %NULL
* @cell_x: (out) (allow-none): A pointer where the X coordinate relative to the cell can be placed, or %NULL
* @cell_y: (out) (allow-none): A pointer where the Y coordinate relative to the cell can be placed, or %NULL
*
if (tree_view->priv->tree == NULL)
return FALSE;
- if (x > tree_view->priv->hadjustment->upper)
+ if (x > gtk_adjustment_get_upper (tree_view->priv->hadjustment))
return FALSE;
if (x < 0 || y < 0)
*cell_y = y_offset;
if (path)
- *path = _gtk_tree_view_find_path (tree_view, tree, node);
+ *path = _gtk_tree_path_new_from_rbtree (tree, node);
return TRUE;
}
+static inline gint
+gtk_tree_view_get_cell_area_height (GtkTreeView *tree_view,
+ GtkRBNode *node,
+ gint vertical_separator)
+{
+ int expander_size = gtk_tree_view_get_expander_size (tree_view);
+ int height;
+
+ /* The "cell" areas are the cell_area passed in to gtk_cell_renderer_render(),
+ * i.e. just the cells, no spacing.
+ *
+ * The cell area height is at least expander_size - vertical_separator.
+ * For regular nodes, the height is then at least expander_size. We should
+ * be able to enforce the expander_size minimum here, because this
+ * function will not be called for irregular (e.g. separator) rows.
+ */
+ height = gtk_tree_view_get_row_height (tree_view, node);
+ if (height < expander_size)
+ height = expander_size;
+
+ return height - vertical_separator;
+}
+
+static inline gint
+gtk_tree_view_get_cell_area_y_offset (GtkTreeView *tree_view,
+ GtkRBTree *tree,
+ GtkRBNode *node,
+ gint vertical_separator)
+{
+ int offset;
+
+ offset = gtk_tree_view_get_row_y_offset (tree_view, tree, node);
+ offset += vertical_separator / 2;
+
+ return offset;
+}
+
/**
* gtk_tree_view_get_cell_area:
* @tree_view: a #GtkTreeView
* @path: (allow-none): a #GtkTreePath for the row, or %NULL to get only horizontal coordinates
* @column: (allow-none): a #GtkTreeViewColumn for the column, or %NULL to get only vertical coordinates
- * @rect: rectangle to fill with cell rect
+ * @rect: (out): rectangle to fill with cell rect
*
* Fills the bounding rectangle in bin_window coordinates for the cell at the
* row specified by @path and the column specified by @column. If @path is
GtkTreeViewColumn *column,
GdkRectangle *rect)
{
- GtkAllocation allocation;
GtkRBTree *tree = NULL;
GtkRBNode *node = NULL;
gint vertical_separator;
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);
- g_return_if_fail (!column || column->tree_view == (GtkWidget *) tree_view);
+ g_return_if_fail (!column || gtk_tree_view_column_get_tree_view (column) == (GtkWidget *) tree_view);
g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (tree_view)));
gtk_widget_style_get (GTK_WIDGET (tree_view),
if (column)
{
- gtk_widget_get_allocation (column->button, &allocation);
- rect->x = allocation.x + horizontal_separator/2;
- rect->width = allocation.width - horizontal_separator;
+ rect->x = gtk_tree_view_column_get_x_offset (column) + horizontal_separator/2;
+ rect->width = gtk_tree_view_column_get_width (column) - horizontal_separator;
}
if (path)
if ((!ret && tree == NULL) || ret)
return;
- rect->y = CELL_FIRST_PIXEL (tree_view, tree, node, vertical_separator);
- rect->height = MAX (CELL_HEIGHT (node, vertical_separator), tree_view->priv->expander_size - vertical_separator);
+ if (row_is_separator (tree_view, NULL, path))
+ {
+ /* There isn't really a "cell area" for separator, so we
+ * return the y, height values for background area instead.
+ */
+ rect->y = gtk_tree_view_get_row_y_offset (tree_view, tree, node);
+ rect->height = gtk_tree_view_get_row_height (tree_view, node);
+ }
+ else
+ {
+ rect->y = gtk_tree_view_get_cell_area_y_offset (tree_view, tree, node,
+ vertical_separator);
+ rect->height = gtk_tree_view_get_cell_area_height (tree_view, node,
+ vertical_separator);
+ }
if (column &&
gtk_tree_view_is_expander_column (tree_view, column))
rect->x += (depth - 1) * tree_view->priv->level_indentation;
rect->width -= (depth - 1) * tree_view->priv->level_indentation;
- if (TREE_VIEW_DRAW_EXPANDERS (tree_view))
+ if (gtk_tree_view_draw_expanders (tree_view))
{
+ int expander_size = gtk_tree_view_get_expander_size (tree_view);
if (!rtl)
- rect->x += depth * tree_view->priv->expander_size;
- rect->width -= depth * tree_view->priv->expander_size;
+ rect->x += depth * expander_size;
+ rect->width -= depth * expander_size;
}
rect->width = MAX (rect->width, 0);
}
}
+static inline gint
+gtk_tree_view_get_row_height (GtkTreeView *tree_view,
+ GtkRBNode *node)
+{
+ int expander_size = gtk_tree_view_get_expander_size (tree_view);
+ int height;
+
+ /* The "background" areas of all rows/cells add up to cover the entire tree.
+ * The background includes all inter-row and inter-cell spacing.
+ *
+ * If the row pointed at by node does not have a height set, we default
+ * to expander_size, which is the minimum height for regular nodes.
+ * Non-regular nodes (e.g. separators) can have a height set smaller
+ * than expander_size and should not be overruled here.
+ */
+ height = GTK_RBNODE_GET_HEIGHT (node);
+ if (height <= 0)
+ height = expander_size;
+
+ return height;
+}
+
+static inline gint
+gtk_tree_view_get_row_y_offset (GtkTreeView *tree_view,
+ GtkRBTree *tree,
+ GtkRBNode *node)
+{
+ int offset;
+
+ offset = _gtk_rbtree_node_find_offset (tree, node);
+
+ return RBTREE_Y_TO_TREE_WINDOW_Y (tree_view, offset);
+}
+
/**
* gtk_tree_view_get_background_area:
* @tree_view: a #GtkTreeView
* @path: (allow-none): a #GtkTreePath for the row, or %NULL to get only horizontal coordinates
* @column: (allow-none): a #GtkTreeViewColumn for the column, or %NULL to get only vertical coordiantes
- * @rect: rectangle to fill with cell background rect
+ * @rect: (out): rectangle to fill with cell background rect
*
* Fills the bounding rectangle in bin_window coordinates for the cell at the
* row specified by @path and the column specified by @column. If @path is
tree == NULL)
return;
- rect->y = BACKGROUND_FIRST_PIXEL (tree_view, tree, node);
-
- rect->height = ROW_HEIGHT (tree_view, BACKGROUND_HEIGHT (node));
+ rect->y = gtk_tree_view_get_row_y_offset (tree_view, tree, node);
+ rect->height = gtk_tree_view_get_row_height (tree_view, node);
}
if (column)
/**
* gtk_tree_view_get_visible_rect:
* @tree_view: a #GtkTreeView
- * @visible_rect: rectangle to fill
+ * @visible_rect: (out): rectangle to fill
*
* Fills @visible_rect with the currently-visible region of the
* buffer, in tree coordinates. Convert to bin_window coordinates with
if (visible_rect)
{
gtk_widget_get_allocation (widget, &allocation);
- visible_rect->x = tree_view->priv->hadjustment->value;
- visible_rect->y = tree_view->priv->vadjustment->value;
+ visible_rect->x = gtk_adjustment_get_value (tree_view->priv->hadjustment);
+ visible_rect->y = gtk_adjustment_get_value (tree_view->priv->vadjustment);
visible_rect->width = allocation.width;
- visible_rect->height = allocation.height - TREE_VIEW_HEADER_HEIGHT (tree_view);
+ visible_rect->height = allocation.height - gtk_tree_view_get_effective_header_height (tree_view);
}
}
* @tree_view: a #GtkTreeView
* @wx: X coordinate relative to the widget
* @wy: Y coordinate relative to the widget
- * @tx: return location for tree X coordinate
- * @ty: return location for tree Y coordinate
+ * @tx: (out): return location for tree X coordinate
+ * @ty: (out): return location for tree Y coordinate
*
* Converts widget coordinates to coordinates for the
* tree (the full scrollable area of the tree).
* @tree_view: a #GtkTreeView
* @tx: X coordinate relative to the tree
* @ty: Y coordinate relative to the tree
- * @wx: return location for widget X coordinate
- * @wy: return location for widget Y coordinate
+ * @wx: (out): return location for widget X coordinate
+ * @wy: (out): return location for widget Y coordinate
*
* Converts tree coordinates (coordinates in full scrollable area of the tree)
* to widget coordinates.
* @tree_view: a #GtkTreeView
* @wx: X coordinate relative to the widget
* @wy: Y coordinate relative to the widget
- * @bx: return location for bin_window X coordinate
- * @by: return location for bin_window Y coordinate
+ * @bx: (out): return location for bin_window X coordinate
+ * @by: (out): return location for bin_window Y coordinate
*
* Converts widget coordinates to coordinates for the bin_window
* (see gtk_tree_view_get_bin_window()).
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
if (bx)
- *bx = wx + tree_view->priv->hadjustment->value;
+ *bx = wx + gtk_adjustment_get_value (tree_view->priv->hadjustment);
if (by)
- *by = wy - TREE_VIEW_HEADER_HEIGHT (tree_view);
+ *by = wy - gtk_tree_view_get_effective_header_height (tree_view);
}
/**
* @tree_view: a #GtkTreeView
* @bx: bin_window X coordinate
* @by: bin_window Y coordinate
- * @wx: return location for widget X coordinate
- * @wy: return location for widget Y coordinate
+ * @wx: (out): return location for widget X coordinate
+ * @wy: (out): return location for widget Y coordinate
*
* Converts bin_window coordinates (see gtk_tree_view_get_bin_window())
* to widget relative coordinates.
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
if (wx)
- *wx = bx - tree_view->priv->hadjustment->value;
+ *wx = bx - gtk_adjustment_get_value (tree_view->priv->hadjustment);
if (wy)
- *wy = by + TREE_VIEW_HEADER_HEIGHT (tree_view);
+ *wy = by + gtk_tree_view_get_effective_header_height (tree_view);
}
/**
* @tree_view: a #GtkTreeView
* @tx: tree X coordinate
* @ty: tree Y coordinate
- * @bx: return location for X coordinate relative to bin_window
- * @by: return location for Y coordinate relative to bin_window
+ * @bx: (out): return location for X coordinate relative to bin_window
+ * @by: (out): return location for Y coordinate relative to bin_window
*
* Converts tree coordinates (coordinates in full scrollable area of the tree)
* to bin_window coordinates.
* @tree_view: a #GtkTreeView
* @bx: X coordinate relative to bin_window
* @by: Y coordinate relative to bin_window
- * @tx: return location for tree X coordinate
- * @ty: return location for tree Y coordinate
+ * @tx: (out): return location for tree X coordinate
+ * @ty: (out): return location for tree Y coordinate
*
* Converts bin_window coordinates to coordinates for the
* tree (the full scrollable area of the tree).
/**
* gtk_tree_view_get_visible_range:
* @tree_view: A #GtkTreeView
- * @start_path: (allow-none): Return location for start of region, or %NULL.
- * @end_path: (allow-none): Return location for end of region, or %NULL.
+ * @start_path: (out) (allow-none): Return location for start of region,
+ * or %NULL.
+ * @end_path: (out) (allow-none): Return location for end of region, or %NULL.
*
* Sets @start_path and @end_path to be the first and last visible path.
* Note that there may be invisible paths in between.
TREE_WINDOW_Y_TO_RBTREE_Y (tree_view, 0),
&tree, &node);
if (node)
- *start_path = _gtk_tree_view_find_path (tree_view, tree, node);
+ *start_path = _gtk_tree_path_new_from_rbtree (tree, node);
else
retval = FALSE;
}
{
gint y;
- if (tree_view->priv->height < tree_view->priv->vadjustment->page_size)
+ if (tree_view->priv->height < gtk_adjustment_get_page_size (tree_view->priv->vadjustment))
y = tree_view->priv->height - 1;
else
- y = TREE_WINDOW_Y_TO_RBTREE_Y (tree_view, tree_view->priv->vadjustment->page_size) - 1;
+ y = TREE_WINDOW_Y_TO_RBTREE_Y (tree_view, gtk_adjustment_get_page_size (tree_view->priv->vadjustment)) - 1;
_gtk_rbtree_find_offset (tree_view->priv->tree, y, &tree, &node);
if (node)
- *end_path = _gtk_tree_view_find_path (tree_view, tree, node);
+ *end_path = _gtk_tree_path_new_from_rbtree (tree, node);
else
retval = FALSE;
}
return retval;
}
+/**
+ * gtk_tree_view_is_blank_at_pos:
+ * @tree_view: A #GtkTreeView
+ * @x: The x position to be identified (relative to bin_window)
+ * @y: The y position to be identified (relative to bin_window)
+ * @path: (out) (allow-none): A pointer to a #GtkTreePath pointer to be filled in, or %NULL
+ * @column: (out) (allow-none): A pointer to a #GtkTreeViewColumn pointer to be filled in, or %NULL
+ * @cell_x: (out) (allow-none): A pointer where the X coordinate relative to the cell can be placed, or %NULL
+ * @cell_y: (out) (allow-none): A pointer where the Y coordinate relative to the cell can be placed, or %NULL
+ *
+ * Determine whether the point (@x, @y) in @tree_view is blank, that is no
+ * cell content nor an expander arrow is drawn at the location. If so, the
+ * location can be considered as the background. You might wish to take
+ * special action on clicks on the background, such as clearing a current
+ * selection, having a custom context menu or starting rubber banding.
+ *
+ * The @x and @y coordinate that are provided must be relative to bin_window
+ * coordinates. That is, @x and @y must come from an event on @tree_view
+ * where <literal>event->window == gtk_tree_view_get_bin_window (<!-- -->)</literal>.
+ *
+ * For converting widget coordinates (eg. the ones you get from
+ * GtkWidget::query-tooltip), please see
+ * gtk_tree_view_convert_widget_to_bin_window_coords().
+ *
+ * The @path, @column, @cell_x and @cell_y arguments will be filled in
+ * likewise as for gtk_tree_view_get_path_at_pos(). Please see
+ * gtk_tree_view_get_path_at_pos() for more information.
+ *
+ * Return value: %TRUE if the area at the given coordinates is blank,
+ * %FALSE otherwise.
+ *
+ * Since: 3.0
+ */
+gboolean
+gtk_tree_view_is_blank_at_pos (GtkTreeView *tree_view,
+ gint x,
+ gint y,
+ GtkTreePath **path,
+ GtkTreeViewColumn **column,
+ gint *cell_x,
+ gint *cell_y)
+{
+ GtkRBTree *tree;
+ GtkRBNode *node;
+ GtkTreeIter iter;
+ GtkTreePath *real_path;
+ GtkTreeViewColumn *real_column;
+ GdkRectangle cell_area, background_area;
+
+ g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
+
+ if (!gtk_tree_view_get_path_at_pos (tree_view, x, y,
+ &real_path, &real_column,
+ cell_x, cell_y))
+ /* If there's no path here, it is blank */
+ return TRUE;
+
+ if (path)
+ *path = real_path;
+
+ if (column)
+ *column = real_column;
+
+ gtk_tree_model_get_iter (tree_view->priv->model, &iter, real_path);
+ _gtk_tree_view_find_node (tree_view, real_path, &tree, &node);
+
+ /* Check if there's an expander arrow at (x, y) */
+ if (real_column == tree_view->priv->expander_column
+ && gtk_tree_view_draw_expanders (tree_view))
+ {
+ gboolean over_arrow;
+
+ over_arrow = coords_are_over_arrow (tree_view, tree, node, x, y);
+
+ if (over_arrow)
+ {
+ if (!path)
+ gtk_tree_path_free (real_path);
+ return FALSE;
+ }
+ }
+
+ /* Otherwise, have the column see if there's a cell at (x, y) */
+ gtk_tree_view_column_cell_set_cell_data (real_column,
+ tree_view->priv->model,
+ &iter,
+ GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PARENT),
+ node->children ? TRUE : FALSE);
+
+ gtk_tree_view_get_background_area (tree_view, real_path, real_column,
+ &background_area);
+ gtk_tree_view_get_cell_area (tree_view, real_path, real_column,
+ &cell_area);
+
+ if (!path)
+ gtk_tree_path_free (real_path);
+
+ return _gtk_tree_view_column_is_blank_at_pos (real_column,
+ &cell_area,
+ &background_area,
+ x, y);
+}
+
static void
unset_reorderable (GtkTreeView *tree_view)
{
* gtk_tree_view_enable_model_drag_source:
* @tree_view: a #GtkTreeView
* @start_button_mask: Mask of allowed buttons to start drag
- * @targets: (array): the table of targets that the drag will support
+ * @targets: (array length=n_targets): the table of targets that the drag will support
* @n_targets: the number of items in @targets
* @actions: the bitmask of possible actions for a drag from this
* widget
/**
* gtk_tree_view_enable_model_drag_dest:
* @tree_view: a #GtkTreeView
- * @targets: (array): the table of targets that the drag will support
+ * @targets: (array length=n_targets): the table of targets that
+ * the drag will support
* @n_targets: the number of items in @targets
* @actions: the bitmask of possible actions for a drag from this
* widget
/**
* gtk_tree_view_set_drag_dest_row:
* @tree_view: a #GtkTreeView
- * @path: (allow-none): The path of the row to highlight, or %NULL.
+ * @path: (allow-none): The path of the row to highlight, or %NULL
* @pos: Specifies whether to drop before, after or into the row
- *
+ *
* Sets the row that is highlighted for feedback.
- **/
+ * If @path is %NULL, an existing highlight is removed.
+ */
void
gtk_tree_view_set_drag_dest_row (GtkTreeView *tree_view,
GtkTreePath *path,
GtkTreeIter iter;
GtkRBTree *tree;
GtkRBNode *node;
- GtkStyle *style;
+ GtkStyleContext *context;
gint cell_offset;
GList *list;
GdkRectangle background_area;
cairo_surface_t *surface;
gint bin_window_width;
gboolean is_separator = FALSE;
- gboolean rtl;
+ gboolean rtl, allow_rules;
cairo_t *cr;
g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), NULL);
path))
return NULL;
- style = gtk_widget_get_style (widget);
+ context = gtk_widget_get_style_context (widget);
+
+ gtk_style_context_save (context);
+ gtk_style_context_add_region (context, GTK_STYLE_REGION_COLUMN, 0);
+
+ gtk_widget_style_get (widget,
+ "allow-rules", &allow_rules,
+ NULL);
+
+ if (allow_rules && tree_view->priv->has_rules)
+ {
+ GtkRegionFlags row_flags;
+
+ if ((_gtk_rbtree_node_get_index (tree, node) % 2))
+ row_flags = GTK_REGION_ODD;
+ else
+ row_flags = GTK_REGION_EVEN;
+
+ gtk_style_context_add_region (context, GTK_STYLE_REGION_ROW, row_flags);
+ }
is_separator = row_is_separator (tree_view, &iter, NULL);
cell_offset = x;
background_area.y = y;
- background_area.height = ROW_HEIGHT (tree_view, BACKGROUND_HEIGHT (node));
+ background_area.height = gtk_tree_view_get_row_height (tree_view, node);
bin_window_width = gdk_window_get_width (tree_view->priv->bin_window);
background_area.height + 2);
cr = cairo_create (surface);
- gdk_cairo_set_source_color (cr, &style->base [gtk_widget_get_state (widget)]);
- cairo_paint (cr);
+
+ gtk_render_background (context, cr, 0, 0,
+ bin_window_width + 2,
+ background_area.height + 2);
rtl = gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_RTL;
cell_area.x += (depth - 1) * tree_view->priv->level_indentation;
cell_area.width -= (depth - 1) * tree_view->priv->level_indentation;
- if (TREE_VIEW_DRAW_EXPANDERS(tree_view))
+ if (gtk_tree_view_draw_expanders (tree_view))
{
+ int expander_size = gtk_tree_view_get_expander_size (tree_view);
if (!rtl)
- cell_area.x += depth * tree_view->priv->expander_size;
- cell_area.width -= depth * tree_view->priv->expander_size;
+ cell_area.x += depth * expander_size;
+ cell_area.width -= depth * expander_size;
}
}
if (gtk_tree_view_column_cell_is_visible (column))
{
if (is_separator)
- gtk_paint_hline (style,
- cr,
- GTK_STATE_NORMAL,
- widget,
- NULL,
- cell_area.x,
- cell_area.x + cell_area.width,
- cell_area.y + cell_area.height / 2);
+ {
+ gtk_style_context_save (context);
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_SEPARATOR);
+
+ gtk_render_line (context, cr,
+ cell_area.x,
+ cell_area.y + cell_area.height / 2,
+ cell_area.x + cell_area.width,
+ cell_area.y + cell_area.height / 2);
+
+ gtk_style_context_restore (context);
+ }
else
- _gtk_tree_view_column_cell_render (column,
- cr,
- &background_area,
- &cell_area,
- 0);
+ {
+ _gtk_tree_view_column_cell_render (column,
+ cr,
+ &background_area,
+ &cell_area,
+ 0, FALSE);
+ }
}
cell_offset += gtk_tree_view_column_get_width (column);
}
cairo_surface_set_device_offset (surface, 2, 2);
+ gtk_style_context_restore (context);
+
return surface;
}
* This function should almost never be used. It is meant for private use by
* ATK for determining the number of visible children that are removed when the
* user collapses a row, or a row is deleted.
+ *
+ * Deprecated: 3.4: Accessibility does not need the function anymore.
**/
void
gtk_tree_view_set_destroy_count_func (GtkTreeView *tree_view,
}
/**
- * gtk_tree_view_get_search_equal_func:
+ * gtk_tree_view_get_search_equal_func: (skip)
* @tree_view: A #GtkTreeView
*
* Returns the compare function currently in use.
}
/**
- * gtk_tree_view_get_search_position_func:
+ * gtk_tree_view_get_search_position_func: (skip)
* @tree_view: A #GtkTreeView
*
* Returns the positioning function currently in use.
GdkRectangle monitor;
monitor_num = gdk_screen_get_monitor_at_window (screen, tree_window);
- gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+ gdk_screen_get_monitor_workarea (screen, monitor_num, &monitor);
gtk_widget_realize (search_dialog);
GtkTreeView *tree_view)
{
GtkTreePath *path;
- GtkRBNode *node;
- GtkRBTree *tree;
gtk_tree_view_search_dialog_hide (tree_view->priv->search_window,
tree_view,
/* If we have a row selected and it's the cursor row, we activate
* the row XXX */
- if (gtk_tree_row_reference_valid (tree_view->priv->cursor))
+ if (tree_view->priv->cursor_node &&
+ GTK_RBNODE_FLAG_SET (tree_view->priv->cursor_node, GTK_RBNODE_IS_SELECTED))
{
- path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
-
- _gtk_tree_view_find_node (tree_view, path, &tree, &node);
+ path = _gtk_tree_path_new_from_rbtree (tree_view->priv->cursor_tree,
+ tree_view->priv->cursor_node);
- if (node && GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
- gtk_tree_view_row_activated (tree_view, path, tree_view->priv->focus_column);
+ gtk_tree_view_row_activated (tree_view, path, tree_view->priv->focus_column);
gtk_tree_path_free (path);
}
GdkEventKey *event,
GtkTreeView *tree_view)
{
- gboolean retval = FALSE;
+ GdkModifierType default_accel;
+ gboolean retval = FALSE;
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
return TRUE;
}
+ default_accel = gtk_widget_get_modifier_mask (widget,
+ GDK_MODIFIER_INTENT_PRIMARY_ACCELERATOR);
+
/* select previous matching iter */
if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_KP_Up)
{
retval = TRUE;
}
- if (((event->state & (GTK_DEFAULT_ACCEL_MOD_MASK | GDK_SHIFT_MASK)) == (GTK_DEFAULT_ACCEL_MOD_MASK | GDK_SHIFT_MASK))
+ if (((event->state & (default_accel | GDK_SHIFT_MASK)) == (default_accel | GDK_SHIFT_MASK))
&& (event->keyval == GDK_KEY_g || event->keyval == GDK_KEY_G))
{
if (!gtk_tree_view_search_move (widget, tree_view, TRUE))
retval = TRUE;
}
- if (((event->state & (GTK_DEFAULT_ACCEL_MOD_MASK | GDK_SHIFT_MASK)) == GTK_DEFAULT_ACCEL_MOD_MASK)
+ if (((event->state & (default_accel | GDK_SHIFT_MASK)) == default_accel)
&& (event->keyval == GDK_KEY_g || event->keyval == GDK_KEY_G))
{
if (!gtk_tree_view_search_move (widget, tree_view, FALSE))
gchar *normalized_key;
gchar *case_normalized_string = NULL;
gchar *case_normalized_key = NULL;
- GValue value = {0,};
- GValue transformed = {0,};
+ GValue value = G_VALUE_INIT;
+ GValue transformed = G_VALUE_INIT;
gtk_tree_model_get_value (model, iter, column, &value);
gtk_tree_view_scroll_to_cell (tree_view, path, NULL,
TRUE, 0.5, 0.0);
gtk_tree_selection_select_iter (selection, iter);
- gtk_tree_view_real_set_cursor (tree_view, path, FALSE, TRUE);
+ gtk_tree_view_real_set_cursor (tree_view, path, CLAMP_NODE);
if (path)
gtk_tree_path_free (path);
GtkTreeIter tmp;
tree = node->children;
- node = tree->root;
-
- while (node->left != tree->nil)
- node = node->left;
+ node = _gtk_rbtree_first (tree);
tmp = *iter;
has_child = gtk_tree_model_iter_children (model, iter, &tmp);
tree_view->priv->selected_iter = 1;
}
-static void
-gtk_tree_view_remove_widget (GtkCellEditable *cell_editable,
- GtkTreeView *tree_view)
+void
+_gtk_tree_view_remove_editable (GtkTreeView *tree_view,
+ GtkTreeViewColumn *column,
+ GtkCellEditable *cell_editable)
{
if (tree_view->priv->edited_column == NULL)
return;
- _gtk_tree_view_column_stop_editing (tree_view->priv->edited_column);
+ g_return_if_fail (column == tree_view->priv->edited_column);
+
tree_view->priv->edited_column = NULL;
if (gtk_widget_has_focus (GTK_WIDGET (cell_editable)))
gtk_widget_grab_focus (GTK_WIDGET (tree_view));
- g_signal_handlers_disconnect_by_func (cell_editable,
- gtk_tree_view_remove_widget,
- tree_view);
-
gtk_container_remove (GTK_CONTAINER (tree_view),
- GTK_WIDGET (cell_editable));
+ GTK_WIDGET (cell_editable));
/* FIXME should only redraw a single node */
gtk_widget_queue_draw (GTK_WIDGET (tree_view));
static gboolean
gtk_tree_view_start_editing (GtkTreeView *tree_view,
- GtkTreePath *cursor_path)
+ GtkTreePath *cursor_path,
+ gboolean edit_only)
{
GtkTreeIter iter;
- GdkRectangle background_area;
GdkRectangle cell_area;
- GtkCellEditable *editable_widget = NULL;
- gchar *path_string;
+ GtkTreeViewColumn *focus_column;
guint flags = 0; /* can be 0, as the flags are primarily for rendering */
gint retval = FALSE;
GtkRBTree *cursor_tree;
GtkRBNode *cursor_node;
g_assert (tree_view->priv->focus_column);
+ focus_column = tree_view->priv->focus_column;
if (!gtk_widget_get_realized (GTK_WIDGET (tree_view)))
return FALSE;
cursor_node == NULL)
return FALSE;
- path_string = gtk_tree_path_to_string (cursor_path);
gtk_tree_model_get_iter (tree_view->priv->model, &iter, cursor_path);
validate_row (tree_view, cursor_tree, cursor_node, &iter, cursor_path);
- gtk_tree_view_column_cell_set_cell_data (tree_view->priv->focus_column,
- tree_view->priv->model,
- &iter,
- GTK_RBNODE_FLAG_SET (cursor_node, GTK_RBNODE_IS_PARENT),
- cursor_node->children?TRUE:FALSE);
- gtk_tree_view_get_background_area (tree_view,
- cursor_path,
- tree_view->priv->focus_column,
- &background_area);
+ gtk_tree_view_column_cell_set_cell_data (focus_column,
+ tree_view->priv->model,
+ &iter,
+ GTK_RBNODE_FLAG_SET (cursor_node, GTK_RBNODE_IS_PARENT),
+ cursor_node->children ? TRUE : FALSE);
gtk_tree_view_get_cell_area (tree_view,
- cursor_path,
- tree_view->priv->focus_column,
- &cell_area);
-
- if (_gtk_tree_view_column_cell_event (tree_view->priv->focus_column,
- &editable_widget,
- NULL,
- path_string,
- &background_area,
- &cell_area,
- flags))
- {
- retval = TRUE;
- if (editable_widget != NULL)
- {
- gint left, right;
- GdkRectangle area;
- GtkCellRenderer *cell;
-
- area = cell_area;
- cell = _gtk_tree_view_column_get_edited_cell (tree_view->priv->focus_column);
-
- _gtk_tree_view_column_get_neighbor_sizes (tree_view->priv->focus_column, cell, &left, &right);
-
- area.x += left;
- area.width -= right + left;
+ cursor_path,
+ focus_column,
+ &cell_area);
- gtk_tree_view_real_start_editing (tree_view,
- tree_view->priv->focus_column,
- cursor_path,
- editable_widget,
- &area,
- NULL,
- flags);
- }
+ if (gtk_cell_area_activate (gtk_cell_layout_get_area (GTK_CELL_LAYOUT (focus_column)),
+ _gtk_tree_view_column_get_context (focus_column),
+ GTK_WIDGET (tree_view),
+ &cell_area,
+ flags, edit_only))
+ retval = TRUE;
- }
- g_free (path_string);
return retval;
}
-static void
-gtk_tree_view_real_start_editing (GtkTreeView *tree_view,
- GtkTreeViewColumn *column,
- GtkTreePath *path,
- GtkCellEditable *cell_editable,
- GdkRectangle *cell_area,
- GdkEvent *event,
- guint flags)
+void
+_gtk_tree_view_add_editable (GtkTreeView *tree_view,
+ GtkTreeViewColumn *column,
+ GtkTreePath *path,
+ GtkCellEditable *cell_editable,
+ GdkRectangle *cell_area)
{
- gint pre_val = tree_view->priv->vadjustment->value;
+ gint pre_val = gtk_adjustment_get_value (tree_view->priv->vadjustment);
GtkRequisition requisition;
tree_view->priv->edited_column = column;
- _gtk_tree_view_column_start_editing (column, GTK_CELL_EDITABLE (cell_editable));
- gtk_tree_view_real_set_cursor (tree_view, path, FALSE, TRUE);
- cell_area->y += pre_val - (int)tree_view->priv->vadjustment->value;
+ gtk_tree_view_real_set_cursor (tree_view, path, CLAMP_NODE);
+ cell_area->y += pre_val - (int)gtk_adjustment_get_value (tree_view->priv->vadjustment);
gtk_widget_get_preferred_size (GTK_WIDGET (cell_editable),
&requisition, NULL);
- GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_DRAW_KEYFOCUS);
+ tree_view->priv->draw_keyfocus = TRUE;
if (requisition.height < cell_area->height)
{
cell_area->x, cell_area->y,
cell_area->width, cell_area->height);
}
-
- gtk_cell_editable_start_editing (GTK_CELL_EDITABLE (cell_editable),
- (GdkEvent *)event);
-
- gtk_widget_grab_focus (GTK_WIDGET (cell_editable));
- g_signal_connect (cell_editable, "remove-widget",
- G_CALLBACK (gtk_tree_view_remove_widget), tree_view);
}
static void
gboolean cancel_editing)
{
GtkTreeViewColumn *column;
- GtkCellRenderer *cell;
if (tree_view->priv->edited_column == NULL)
return;
*/
column = tree_view->priv->edited_column;
+ gtk_cell_area_stop_editing (gtk_cell_layout_get_area (GTK_CELL_LAYOUT (column)), cancel_editing);
tree_view->priv->edited_column = NULL;
-
- cell = _gtk_tree_view_column_get_edited_cell (column);
- gtk_cell_renderer_stop_editing (cell, cancel_editing);
-
- if (!cancel_editing)
- gtk_cell_editable_editing_done (column->editable_widget);
-
- tree_view->priv->edited_column = column;
-
- gtk_cell_editable_remove_widget (column->editable_widget);
}
* @tree_view: a #GtkTreeView
* @hover: %TRUE to enable hover selection mode
*
- * Enables of disables the hover selection mode of @tree_view.
+ * Enables or disables the hover selection mode of @tree_view.
* Hover selection makes the selected row follow the pointer.
* Currently, this works only for the selection modes
* %GTK_SELECTION_SINGLE and %GTK_SELECTION_BROWSE.
* @tree_view: a #GtkTreeView
* @expand: %TRUE to enable hover selection mode
*
- * Enables of disables the hover expansion mode of @tree_view.
+ * Enables or disables the hover expansion mode of @tree_view.
* Hover expansion makes rows expand or collapse if the pointer
* moves over them.
*
}
/**
- * gtk_tree_view_get_row_separator_func:
+ * gtk_tree_view_get_row_separator_func: (skip)
* @tree_view: a #GtkTreeView
*
* Returns the current row separator function.
}
static void
-gtk_tree_view_state_changed (GtkWidget *widget,
- GtkStateType previous_state)
+gtk_tree_view_state_flags_changed (GtkWidget *widget,
+ GtkStateFlags previous_state)
{
- GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
-
if (gtk_widget_get_realized (widget))
- {
- gdk_window_set_background (tree_view->priv->bin_window,
- >k_widget_get_style (widget)->base[gtk_widget_get_state (widget)]);
- }
+ gtk_tree_view_ensure_background (GTK_TREE_VIEW (widget));
gtk_widget_queue_draw (widget);
}
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
enabled = enabled != FALSE;
- was_enabled = GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_SHOW_EXPANDERS);
+ was_enabled = tree_view->priv->show_expanders;
- if (enabled)
- GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_SHOW_EXPANDERS);
- else
- GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_SHOW_EXPANDERS);
+ tree_view->priv->show_expanders = enabled == TRUE;
if (enabled != was_enabled)
gtk_widget_queue_draw (GTK_WIDGET (tree_view));
{
g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
- return GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_SHOW_EXPANDERS);
+ return tree_view->priv->show_expanders;
}
/**
else
{
rect.y = 0;
- rect.height = tree_view->priv->vadjustment->page_size;
+ rect.height = gtk_adjustment_get_page_size (tree_view->priv->vadjustment);
}
gtk_tooltip_set_tip_area (tooltip, &rect);
/**
* gtk_tree_view_get_tooltip_context:
* @tree_view: a #GtkTreeView
- * @x: the x coordinate (relative to widget coordinates)
- * @y: the y coordinate (relative to widget coordinates)
+ * @x: (inout): the x coordinate (relative to widget coordinates)
+ * @y: (inout): the y coordinate (relative to widget coordinates)
* @keyboard_tip: whether this is a keyboard tooltip or not
- * @model: (out) (allow-none): a pointer to receive a #GtkTreeModel or %NULL
+ * @model: (out) (allow-none) (transfer none): a pointer to receive a
+ * #GtkTreeModel or %NULL
* @path: (out) (allow-none): a pointer to receive a #GtkTreePath or %NULL
* @iter: (out) (allow-none): a pointer to receive a #GtkTreeIter or %NULL
*
GtkTooltip *tooltip,
gpointer data)
{
- GValue value = { 0, };
- GValue transformed = { 0, };
+ GValue value = G_VALUE_INIT;
+ GValue transformed = G_VALUE_INIT;
GtkTreeIter iter;
GtkTreePath *path;
GtkTreeModel *model;
* for you. @column should be set to the column in @tree_view's model
* containing the tooltip texts, or -1 to disable this feature.
*
- * When enabled, #GtkWidget::has-tooltip will be set to %TRUE and
+ * When enabled, #GtkWidget:has-tooltip will be set to %TRUE and
* @tree_view will connect a #GtkWidget::query-tooltip signal handler.
*
* Note that the signal handler sets the text with gtk_tooltip_set_markup(),
projects / ~andy / gtk / blobdiff