2000-10-05 01:04:57 +00:00
|
|
|
/* gtktreeprivate.h
|
|
|
|
|
* Copyright (C) 2000 Red Hat, Inc., Jonathan Blandford <jrb@redhat.com>
|
|
|
|
|
*
|
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
|
* modify it under the terms of the GNU Library General Public
|
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
|
* 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.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#ifndef __GTK_TREE_PRIVATE_H__
|
|
|
|
|
#define __GTK_TREE_PRIVATE_H__
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
|
|
extern "C" {
|
|
|
|
|
#endif /* __cplusplus */
|
|
|
|
|
|
|
|
|
|
#include <gtk/gtktreeview.h>
|
|
|
|
|
#include <gtk/gtktreeselection.h>
|
|
|
|
|
#include <gtk/gtkrbtree.h>
|
|
|
|
|
|
2001-03-02 00:49:32 +00:00
|
|
|
|
2001-04-23 23:03:53 +00:00
|
|
|
|
2001-03-02 00:49:32 +00:00
|
|
|
#define TREE_VIEW_DRAG_WIDTH 6
|
|
|
|
|
|
Port to GObject, can go back in gdk-pixbuf after setting up a
2000-12-16 Havoc Pennington <hp@pobox.com>
* gtk/gdk-pixbuf-loader.h, gtk/gdk-pixbuf-loader.c:
Port to GObject, can go back in gdk-pixbuf after setting up
a gdk-pixbuf-marshal.h header over there.
* gtk/gtktreeview.c: s/SEPERATOR/SEPARATOR/g;
(gtk_tree_view_class_init): specify GTK_TYPE_ADJUSTMENT for signal
args
(gtk_tree_view_init): don't unset GTK_NO_WINDOW, it shouldn't be
set
(gtk_tree_view_realize_buttons): don't gtk_widget_show() buttons
here, do it when we create the buttons later
(gtk_tree_view_realize_buttons): add some g_return_if_fail
(gtk_tree_view_map): paranoia checks that column->button is shown
and unmapped
(gtk_tree_view_size_request): only request visible children.
Move header size calculation in here, for cleanliness, and
to maintain invariants for child widgets if we eventually
let users set different children inside the buttons
(gtk_tree_view_map_buttons): factor out code to map buttons,
since it was being called several times
(gtk_tree_view_size_allocate_buttons): move_resize the drag
windows instead of just moving them; their height may change
if we allow random widgets in there, or the theme changes.
(gtk_tree_view_size_allocate): move button size allocation
above emitting the scroll signals, to ensure a sane state when we
hit user code
(gtk_tree_view_button_release): remove queue_resize after
tree_view_set_size(), set_size() will handle any resize queuing
that's needed
(gtk_tree_view_focus_in): just queue a draw, don't fool with
draw_focus goo
(gtk_tree_view_focus): use gtk_get_current_event() and
gdk_event_get_state()
(gtk_tree_view_deleted): don't queue_resize() after calling set_size()
(gtk_tree_view_build_tree): fix a "if (foo); {}" bug - i.e. remove
semicolon
(gtk_tree_view_create_button): show the button here
(gtk_tree_view_button_clicked): actually emit the clicked signal
on the column
(_gtk_tree_view_set_size): return right away if the size is
unchanged, as a cheesy optimization
(gtk_tree_view_setup_model): rename set_model_realized to
setup_model to match the flag that indicates whether we've
called it
(gtk_tree_view_get_hadjustment): create adjustment if it doesn't
exist, because set_scroll_adjustment does that and it shouldn't
matter what order you call these in
(gtk_tree_view_get_vadjustment): ditto
(gtk_tree_view_set_headers_visible): canonicalize the bool,
for paranoia
(gtk_tree_view_set_headers_visible): call
gtk_tree_view_map_buttons() instead of using cut-and-paste code
(gtk_tree_view_append_column): clarify whether the return value
is the count of columns before or after, and do the increment
separately from the return statement so you can tell from the code.
(gtk_tree_view_remove_column): ditto
(gtk_tree_view_insert_column): ditto
(gtk_tree_view_get_column): remove g_return_if_fail for columns
outside the existing range, the docs say that outside-range
columns are allowed, so we handle them as documented. (Presumably
this allows a nice loop with column != NULL as test.)
(gtk_tree_view_move_to): document what 0.0, 0.5, 1.0 alignments
mean (left/right/center etc.).
(gtk_tree_view_collapse_all): only queue a draw if we're mapped
(gtk_tree_view_expand_row): add docs
(gtk_tree_view_collapse_row): add docs
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_clicked): new
function to emit the clicked signal on a column
* gdk/gdkevents.c (gdk_event_get_state): new function, to get the
state of an event
(gdk_event_get_time): don't treat GDK_SCROLL
as a button event, remove default case from switch so gcc
will whine if we don't explicitly handle all event types
* gtk/gtktreeselection.h: added some FIXME
* gtk/gtktreeprivate.h (struct _GtkTreeViewPrivate): rename
"columns" to "n_columns" and "column" to "columns" for clarity
2000-12-17 23:50:00 +00:00
|
|
|
typedef enum
|
|
|
|
|
{
|
2000-10-05 01:04:57 +00:00
|
|
|
GTK_TREE_VIEW_IS_LIST = 1 << 0,
|
|
|
|
|
GTK_TREE_VIEW_SHOW_EXPANDERS = 1 << 1,
|
|
|
|
|
GTK_TREE_VIEW_IN_COLUMN_RESIZE = 1 << 2,
|
|
|
|
|
GTK_TREE_VIEW_ARROW_PRELIT = 1 << 3,
|
|
|
|
|
GTK_TREE_VIEW_HEADERS_VISIBLE = 1 << 4,
|
|
|
|
|
GTK_TREE_VIEW_DRAW_KEYFOCUS = 1 << 5,
|
2001-04-23 23:03:53 +00:00
|
|
|
GTK_TREE_VIEW_MODEL_SETUP = 1 << 6,
|
|
|
|
|
GTK_TREE_VIEW_IN_COLUMN_DRAG = 1 << 7,
|
2000-10-05 01:04:57 +00:00
|
|
|
} GtkTreeViewFlags;
|
|
|
|
|
|
2001-05-09 13:18:46 +00:00
|
|
|
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,
|
|
|
|
|
|
|
|
|
|
};
|
2000-10-05 01:04:57 +00:00
|
|
|
#define GTK_TREE_VIEW_SET_FLAG(tree_view, flag) G_STMT_START{ (tree_view->priv->flags|=flag); }G_STMT_END
|
|
|
|
|
#define GTK_TREE_VIEW_UNSET_FLAG(tree_view, flag) G_STMT_START{ (tree_view->priv->flags&=~(flag)); }G_STMT_END
|
|
|
|
|
#define GTK_TREE_VIEW_FLAG_SET(tree_view, flag) ((tree_view->priv->flags&flag)==flag)
|
|
|
|
|
#define TREE_VIEW_HEADER_HEIGHT(tree_view) (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE)?tree_view->priv->header_height:0)
|
2001-01-04 23:36:19 +00:00
|
|
|
#define TREE_VIEW_COLUMN_WIDTH(column) (CLAMP (column->width, (column->min_width!=-1)?column->min_width:column->width, (column->max_width!=-1)?column->max_width:column->width))
|
2000-10-05 01:04:57 +00:00
|
|
|
#define TREE_VIEW_DRAW_EXPANDERS(tree_view) (!GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_IS_LIST)&>K_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_SHOW_EXPANDERS))
|
|
|
|
|
|
2001-04-23 23:03:53 +00:00
|
|
|
/* 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*TREE_VIEW_HEADER_HEIGHT(tree_view))
|
|
|
|
|
|
Add heavily modified patch from Kristian Rietveld to handle interactive
Fri Aug 17 19:30:14 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeprivate.h:
* gtk/gtktreeview.c: (gtk_tree_view_class_init),
(gtk_tree_view_init), (gtk_tree_view_set_property),
(gtk_tree_view_get_property), (gtk_tree_view_destroy),
(gtk_tree_view_key_press), (gtk_tree_view_leave_notify),
(gtk_tree_view_focus_out), (gtk_tree_view_set_model),
(gtk_tree_view_set_destroy_count_func),
(gtk_tree_view_set_enable_search),
(gtk_tree_view_get_enable_search),
(gtk_tree_view_get_search_column),
(gtk_tree_view_set_search_column),
(gtk_tree_view_get_search_equal_func),
(gtk_tree_view_set_search_equal_func),
(gtk_tree_view_search_dialog_destroy),
(gtk_tree_view_search_position_func),
(gtk_tree_view_interactive_search),
(gtk_tree_view_search_delete_event),
(gtk_tree_view_search_button_press_event),
(gtk_tree_view_search_key_press_event),
(gtk_tree_view_search_move), (gtk_tree_view_search_equal_func),
(gtk_tree_view_search_iter), (gtk_tree_view_search_init):
* gtk/gtktreeview.h:
Add heavily modified patch from Kristian Rietveld to handle
interactive searching.
2001-08-17 23:35:52 +00:00
|
|
|
typedef void (*GtkTreeViewSearchDialogPositionFunc) (GtkTreeView *tree_view,
|
|
|
|
|
GtkWidget *search_dialog);
|
|
|
|
|
|
2001-04-23 23:03:53 +00:00
|
|
|
typedef struct _GtkTreeViewColumnReorder GtkTreeViewColumnReorder;
|
|
|
|
|
struct _GtkTreeViewColumnReorder
|
|
|
|
|
{
|
|
|
|
|
gint left_align;
|
|
|
|
|
gint right_align;
|
|
|
|
|
GtkTreeViewColumn *left_column;
|
|
|
|
|
GtkTreeViewColumn *right_column;
|
|
|
|
|
};
|
|
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
struct _GtkTreeViewPrivate
|
|
|
|
|
{
|
|
|
|
|
GtkTreeModel *model;
|
|
|
|
|
|
|
|
|
|
guint flags;
|
|
|
|
|
/* tree information */
|
|
|
|
|
GtkRBTree *tree;
|
|
|
|
|
|
|
|
|
|
gint tab_offset;
|
|
|
|
|
GtkRBNode *button_pressed_node;
|
|
|
|
|
GtkRBTree *button_pressed_tree;
|
|
|
|
|
|
|
|
|
|
GList *children;
|
|
|
|
|
gint width;
|
|
|
|
|
gint height;
|
|
|
|
|
|
|
|
|
|
GtkAdjustment *hadjustment;
|
|
|
|
|
GtkAdjustment *vadjustment;
|
|
|
|
|
|
|
|
|
|
GdkWindow *bin_window;
|
|
|
|
|
GdkWindow *header_window;
|
2001-04-12 16:11:54 +00:00
|
|
|
GdkWindow *drag_window;
|
2001-04-26 23:17:36 +00:00
|
|
|
GdkWindow *drag_highlight_window;
|
2001-04-12 16:11:54 +00:00
|
|
|
GtkTreeViewColumn *drag_column;
|
2001-04-26 23:17:36 +00:00
|
|
|
gint drag_column_x;
|
2000-10-05 01:04:57 +00:00
|
|
|
|
2001-06-29 03:11:01 +00:00
|
|
|
GtkTreeViewColumn *expander_column;
|
2001-03-08 22:38:59 +00:00
|
|
|
|
|
|
|
|
/* Focus code */
|
2001-03-23 00:35:19 +00:00
|
|
|
GtkTreeViewColumn *focus_column;
|
|
|
|
|
GtkTreeViewColumn *scroll_column;
|
2001-03-08 22:38:59 +00:00
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
/* Selection stuff */
|
2001-01-27 00:50:38 +00:00
|
|
|
GtkTreeRowReference *anchor;
|
|
|
|
|
GtkTreeRowReference *cursor;
|
2000-10-05 01:04:57 +00:00
|
|
|
|
|
|
|
|
/* Column Resizing */
|
|
|
|
|
GdkCursor *cursor_drag;
|
|
|
|
|
GdkGC *xor_gc;
|
|
|
|
|
gint drag_pos;
|
|
|
|
|
gint x_drag;
|
|
|
|
|
|
|
|
|
|
/* Prelight information */
|
|
|
|
|
GtkRBNode *prelight_node;
|
|
|
|
|
GtkRBTree *prelight_tree;
|
|
|
|
|
|
2001-07-22 20:09:00 +00:00
|
|
|
/* The node that's currently being collapsed or expanded */
|
|
|
|
|
GtkRBNode *expanded_collapsed_node;
|
|
|
|
|
GtkRBTree *expanded_collapsed_tree;
|
|
|
|
|
guint expand_collapse_timeout;
|
|
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
/* Selection information */
|
|
|
|
|
GtkTreeSelection *selection;
|
|
|
|
|
|
|
|
|
|
/* Header information */
|
Port to GObject, can go back in gdk-pixbuf after setting up a
2000-12-16 Havoc Pennington <hp@pobox.com>
* gtk/gdk-pixbuf-loader.h, gtk/gdk-pixbuf-loader.c:
Port to GObject, can go back in gdk-pixbuf after setting up
a gdk-pixbuf-marshal.h header over there.
* gtk/gtktreeview.c: s/SEPERATOR/SEPARATOR/g;
(gtk_tree_view_class_init): specify GTK_TYPE_ADJUSTMENT for signal
args
(gtk_tree_view_init): don't unset GTK_NO_WINDOW, it shouldn't be
set
(gtk_tree_view_realize_buttons): don't gtk_widget_show() buttons
here, do it when we create the buttons later
(gtk_tree_view_realize_buttons): add some g_return_if_fail
(gtk_tree_view_map): paranoia checks that column->button is shown
and unmapped
(gtk_tree_view_size_request): only request visible children.
Move header size calculation in here, for cleanliness, and
to maintain invariants for child widgets if we eventually
let users set different children inside the buttons
(gtk_tree_view_map_buttons): factor out code to map buttons,
since it was being called several times
(gtk_tree_view_size_allocate_buttons): move_resize the drag
windows instead of just moving them; their height may change
if we allow random widgets in there, or the theme changes.
(gtk_tree_view_size_allocate): move button size allocation
above emitting the scroll signals, to ensure a sane state when we
hit user code
(gtk_tree_view_button_release): remove queue_resize after
tree_view_set_size(), set_size() will handle any resize queuing
that's needed
(gtk_tree_view_focus_in): just queue a draw, don't fool with
draw_focus goo
(gtk_tree_view_focus): use gtk_get_current_event() and
gdk_event_get_state()
(gtk_tree_view_deleted): don't queue_resize() after calling set_size()
(gtk_tree_view_build_tree): fix a "if (foo); {}" bug - i.e. remove
semicolon
(gtk_tree_view_create_button): show the button here
(gtk_tree_view_button_clicked): actually emit the clicked signal
on the column
(_gtk_tree_view_set_size): return right away if the size is
unchanged, as a cheesy optimization
(gtk_tree_view_setup_model): rename set_model_realized to
setup_model to match the flag that indicates whether we've
called it
(gtk_tree_view_get_hadjustment): create adjustment if it doesn't
exist, because set_scroll_adjustment does that and it shouldn't
matter what order you call these in
(gtk_tree_view_get_vadjustment): ditto
(gtk_tree_view_set_headers_visible): canonicalize the bool,
for paranoia
(gtk_tree_view_set_headers_visible): call
gtk_tree_view_map_buttons() instead of using cut-and-paste code
(gtk_tree_view_append_column): clarify whether the return value
is the count of columns before or after, and do the increment
separately from the return statement so you can tell from the code.
(gtk_tree_view_remove_column): ditto
(gtk_tree_view_insert_column): ditto
(gtk_tree_view_get_column): remove g_return_if_fail for columns
outside the existing range, the docs say that outside-range
columns are allowed, so we handle them as documented. (Presumably
this allows a nice loop with column != NULL as test.)
(gtk_tree_view_move_to): document what 0.0, 0.5, 1.0 alignments
mean (left/right/center etc.).
(gtk_tree_view_collapse_all): only queue a draw if we're mapped
(gtk_tree_view_expand_row): add docs
(gtk_tree_view_collapse_row): add docs
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_clicked): new
function to emit the clicked signal on a column
* gdk/gdkevents.c (gdk_event_get_state): new function, to get the
state of an event
(gdk_event_get_time): don't treat GDK_SCROLL
as a button event, remove default case from switch so gcc
will whine if we don't explicitly handle all event types
* gtk/gtktreeselection.h: added some FIXME
* gtk/gtktreeprivate.h (struct _GtkTreeViewPrivate): rename
"columns" to "n_columns" and "column" to "columns" for clarity
2000-12-17 23:50:00 +00:00
|
|
|
gint n_columns;
|
|
|
|
|
GList *columns;
|
2000-10-05 01:04:57 +00:00
|
|
|
gint header_height;
|
2001-04-23 23:03:53 +00:00
|
|
|
|
2001-05-25 15:43:53 +00:00
|
|
|
GtkTreeViewColumnDropFunc column_drop_func;
|
2001-05-09 22:23:12 +00:00
|
|
|
gpointer column_drop_func_data;
|
|
|
|
|
GtkDestroyNotify column_drop_func_data_destroy;
|
2001-04-12 16:11:54 +00:00
|
|
|
GList *column_drag_info;
|
2001-04-23 23:03:53 +00:00
|
|
|
GtkTreeViewColumnReorder *cur_reorder;
|
2001-01-19 22:39:19 +00:00
|
|
|
|
2001-06-26 17:01:53 +00:00
|
|
|
/* ATK Hack */
|
|
|
|
|
GtkTreeDestroyCountFunc destroy_count_func;
|
|
|
|
|
gpointer destroy_count_data;
|
|
|
|
|
GtkDestroyNotify destroy_count_destroy;
|
|
|
|
|
|
2001-01-19 22:39:19 +00:00
|
|
|
/* Scroll timeout (e.g. during dnd) */
|
|
|
|
|
guint scroll_timeout;
|
2001-03-08 22:38:59 +00:00
|
|
|
|
2001-01-19 22:39:19 +00:00
|
|
|
/* Row drag-and-drop */
|
2001-01-27 00:50:38 +00:00
|
|
|
GtkTreeRowReference *drag_dest_row;
|
2001-01-19 22:39:19 +00:00
|
|
|
GtkTreeViewDropPosition drag_dest_pos;
|
|
|
|
|
guint open_dest_timeout;
|
2001-03-08 22:38:59 +00:00
|
|
|
|
2001-01-19 22:39:19 +00:00
|
|
|
gint pressed_button;
|
|
|
|
|
gint press_start_x;
|
|
|
|
|
gint press_start_y;
|
2001-01-21 18:45:20 +00:00
|
|
|
|
|
|
|
|
/* Scroll-to functionality when unrealized */
|
|
|
|
|
GtkTreePath *scroll_to_path;
|
|
|
|
|
GtkTreeViewColumn *scroll_to_column;
|
|
|
|
|
gfloat scroll_to_row_align;
|
|
|
|
|
gfloat scroll_to_col_align;
|
2001-08-24 20:09:26 +00:00
|
|
|
guint scroll_to_use_align : 1;
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
|
2001-05-16 00:23:30 +00:00
|
|
|
guint reorderable : 1;
|
2001-05-09 13:18:46 +00:00
|
|
|
guint header_has_focus : 1;
|
|
|
|
|
guint drag_column_window_state : 3;
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
/* hint to display rows in alternating colors */
|
|
|
|
|
guint has_rules : 1;
|
2001-06-08 22:59:37 +00:00
|
|
|
|
Add heavily modified patch from Kristian Rietveld to handle interactive
Fri Aug 17 19:30:14 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeprivate.h:
* gtk/gtktreeview.c: (gtk_tree_view_class_init),
(gtk_tree_view_init), (gtk_tree_view_set_property),
(gtk_tree_view_get_property), (gtk_tree_view_destroy),
(gtk_tree_view_key_press), (gtk_tree_view_leave_notify),
(gtk_tree_view_focus_out), (gtk_tree_view_set_model),
(gtk_tree_view_set_destroy_count_func),
(gtk_tree_view_set_enable_search),
(gtk_tree_view_get_enable_search),
(gtk_tree_view_get_search_column),
(gtk_tree_view_set_search_column),
(gtk_tree_view_get_search_equal_func),
(gtk_tree_view_set_search_equal_func),
(gtk_tree_view_search_dialog_destroy),
(gtk_tree_view_search_position_func),
(gtk_tree_view_interactive_search),
(gtk_tree_view_search_delete_event),
(gtk_tree_view_search_button_press_event),
(gtk_tree_view_search_key_press_event),
(gtk_tree_view_search_move), (gtk_tree_view_search_equal_func),
(gtk_tree_view_search_iter), (gtk_tree_view_search_init):
* gtk/gtktreeview.h:
Add heavily modified patch from Kristian Rietveld to handle
interactive searching.
2001-08-17 23:35:52 +00:00
|
|
|
/* interactive search */
|
|
|
|
|
guint enable_search : 1;
|
|
|
|
|
gint search_column;
|
|
|
|
|
GtkTreeViewSearchDialogPositionFunc search_dialog_position_func;
|
|
|
|
|
GtkTreeViewSearchEqualFunc search_equal_func;
|
|
|
|
|
gpointer search_user_data;
|
|
|
|
|
GtkDestroyNotify search_destroy;
|
2000-10-05 01:04:57 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#ifdef __GNUC__
|
|
|
|
|
|
|
|
|
|
#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 (%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", \
|
|
|
|
|
__FILE__, \
|
|
|
|
|
__LINE__, \
|
|
|
|
|
__PRETTY_FUNCTION__, \
|
|
|
|
|
#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 (%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", \
|
|
|
|
|
__FILE__, \
|
|
|
|
|
__LINE__, \
|
|
|
|
|
__PRETTY_FUNCTION__, \
|
|
|
|
|
#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
|
|
|
|
|
|
2001-06-12 18:12:08 +00:00
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
/* functions that shouldn't be exported */
|
|
|
|
|
void _gtk_tree_selection_internal_select_node (GtkTreeSelection *selection,
|
|
|
|
|
GtkRBNode *node,
|
|
|
|
|
GtkRBTree *tree,
|
|
|
|
|
GtkTreePath *path,
|
|
|
|
|
GdkModifierType state);
|
|
|
|
|
gboolean _gtk_tree_view_find_node (GtkTreeView *tree_view,
|
|
|
|
|
GtkTreePath *path,
|
|
|
|
|
GtkRBTree **tree,
|
|
|
|
|
GtkRBNode **node);
|
|
|
|
|
GtkTreePath *_gtk_tree_view_find_path (GtkTreeView *tree_view,
|
|
|
|
|
GtkRBTree *tree,
|
|
|
|
|
GtkRBNode *node);
|
2001-02-23 23:00:52 +00:00
|
|
|
void _gtk_tree_view_update_size (GtkTreeView *tree_view);
|
2000-10-05 01:04:57 +00:00
|
|
|
|
|
|
|
|
|
2001-03-02 00:49:32 +00:00
|
|
|
void _gtk_tree_view_column_realize_button (GtkTreeViewColumn *column);
|
|
|
|
|
void _gtk_tree_view_column_unrealize_button (GtkTreeViewColumn *column);
|
|
|
|
|
void _gtk_tree_view_column_set_tree_view (GtkTreeViewColumn *column,
|
|
|
|
|
GtkTreeView *tree_view);
|
|
|
|
|
void _gtk_tree_view_column_unset_tree_view (GtkTreeViewColumn *column);
|
2001-05-16 00:23:30 +00:00
|
|
|
void _gtk_tree_view_column_set_width (GtkTreeViewColumn *column,
|
|
|
|
|
gint width);
|
2001-04-12 16:11:54 +00:00
|
|
|
void _gtk_tree_view_column_start_drag (GtkTreeView *tree_view,
|
|
|
|
|
GtkTreeViewColumn *column);
|
2001-09-18 16:15:10 +00:00
|
|
|
gboolean _gtk_tree_view_column_cell_event (GtkTreeViewColumn *tree_column,
|
|
|
|
|
GtkCellEditable **editable_widget,
|
|
|
|
|
GdkEvent *event,
|
|
|
|
|
gchar *path_string,
|
|
|
|
|
GdkRectangle *background_area,
|
|
|
|
|
GdkRectangle *cell_area,
|
|
|
|
|
guint flags);
|
2001-02-28 00:35:25 +00:00
|
|
|
|
Adapt to GtkTreeSelection changes
2001-01-01 Havoc Pennington <hp@redhat.com>
* gtk/gtktreeview.c: Adapt to GtkTreeSelection changes
* gtk/gtktreeselection.c (_gtk_tree_selection_set_tree_view):
don't fill in tree_view->priv->selection, kind of an unexpected
side effect
* gtk/gtkcellrenderertext.c: Remove definition of _ and include
gtkintl.h
* gtk/gtkcellrenderer.c: Remove definition of _ and include
gtkintl.h
(gtk_cell_renderer_get_property): remove calls to g_value_init
* gtk/gtkcellrendererpixbuf.c: Remove definition of _ and include
gtkintl.h
* gtk/gtkcellrenderertextpixbuf.c: Remove definition of _ macro
and include gtkintl.h
(gtk_cell_renderer_text_pixbuf_class_init): remove spaces from
property names
* gtk/gtktreeselection.c (_gtk_tree_selection_new): rename, return
GtkTreeSelection
(_gtk_tree_selection_new_from_with_view): rename, return
GtkTreeSelection
(_gtk_tree_selection_set_tree_view): rename with uscore
(gtk_tree_selection_get_selected): fill in the "model" out param
first, so it gets filled in even if we return at the top of the
function
(gtk_tree_selection_real_select_all): add a comment and an else{}
to clarify this a bit
(gtk_tree_selection_real_unselect_all): add the same else{}
* gtk/gtktreeselection.h: Rename new, new_with_tree_view, and
set_tree_view to have underscore prefixes, move them to the
private header, fix return type of new_with_tree_view
(struct _GtkTreeSelection): mark struct
fields private
* gtk/gtktreemodel.c (gtk_tree_model_get_flags): return
GtkTreeModelFlags, not a guint
(gtk_tree_path_prev): return gboolean not gint
(gtk_tree_path_up): return gboolean not gint
* gtk/gtktreemodel.h (struct _GtkTreeModelIface): make get_flags
return GtkTreeModelFlags, not a guint
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_finalize): check
that child model is non-null before unrefing it
(g_value_int_compare_func): make this a qsort compare func, not
a boolean predicate
* gtk/gtktreemodelsort.h: rename gtk_tree_model_set_sort_column,
(add -umn to the end), and mark it unimplemented
(gtk_tree_model_sort_resort): remove, this wasn't implemented, and
I don't see what it's for - doesn't the model always sort itself?
(gtk_tree_model_sort_set_compare): this had the wrong signature
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_attributes):
Fix the docs to say that it destructively replaces existing
attributes (previously said that it added attributes).
(gtk_tree_view_column_set_visible): canonicalize bool before
equality testing. Also, check for realization before
hiding/showing the tree_column->window; if this window could exist
before realization, then it's busted and needs fixing, we can't
create GDK resources pre-realization. Also, remove
superfluous queue_resize(), since set_size() does that for us.
(gtk_tree_view_column_set_col_type): check realization before
using tree_column->window
* gtk/gtktreedatalist.c: fix filename in copyright notice
2001-01-01 19:01:54 +00:00
|
|
|
GtkTreeSelection* _gtk_tree_selection_new (void);
|
|
|
|
|
GtkTreeSelection* _gtk_tree_selection_new_with_tree_view (GtkTreeView *tree_view);
|
|
|
|
|
void _gtk_tree_selection_set_tree_view (GtkTreeSelection *selection,
|
|
|
|
|
GtkTreeView *tree_view);
|
2000-10-05 01:04:57 +00:00
|
|
|
|
2001-02-28 21:37:50 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
#ifdef __cplusplus
|
|
|
|
|
}
|
|
|
|
|
#endif /* __cplusplus */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#endif /* __GTK_TREE_PRIVATE_H__ */
|
|
|
|
|
|
