callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treeview: Update drop target highlighting

Browse Source 
Stop using the .dnd style class, and instead use the
:drop(active) pseudo state, together with .before and .after
classes.

https://bugzilla.gnome.org/show_bug.cgi?id=763808
This commit is contained in:
Matthias Clasen 2016-03-20 19:31:23 -04:00
parent a5a51e325d
commit 12c5ca5c01
1 changed files with 10 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gtk/gtktreeview.c
View File

@ -4965,8 +4965,6 @@ gtk_tree_view_bin_draw (GtkWidget *widget,
GdkRectangle cell_area; GdkRectangle cell_area;
GdkRectangle clip; GdkRectangle clip;
guint flags; guint flags;
gint highlight_x;
gint expander_cell_width;
gint bin_window_width; gint bin_window_width;
gint bin_window_height; gint bin_window_height;
GtkTreePath *drag_dest_path; GtkTreePath *drag_dest_path;
@ -5093,8 +5091,6 @@ gtk_tree_view_bin_draw (GtkWidget *widget,
max_height = gtk_tree_view_get_row_height (tree_view, node); max_height = gtk_tree_view_get_row_height (tree_view, node);
cell_offset = 0; cell_offset = 0;
highlight_x = 0; /* should match x coord of first cell */
expander_cell_width = 0;
background_area.y = y_offset + clip.y; background_area.y = y_offset + clip.y;
background_area.height = max_height; background_area.height = max_height;
@ -5255,13 +5251,6 @@ gtk_tree_view_bin_draw (GtkWidget *widget,
cell_area.width -= depth * expander_size; cell_area.width -= depth * expander_size;
} }
/* If we have an expander column, the highlight underline
* starts with that column, so that it indicates which
* level of the tree we're dropping at.
*/
highlight_x = cell_area.x;
expander_cell_width = cell_area.width;
if (is_separator) if (is_separator)
{ {
gtk_style_context_save (context); gtk_style_context_save (context);
@ -5415,48 +5404,34 @@ gtk_tree_view_bin_draw (GtkWidget *widget,
{ {
/* Draw indicator for the drop /* Draw indicator for the drop
*/ */
gint highlight_y = -1;
GtkRBTree *drag_tree = NULL; GtkRBTree *drag_tree = NULL;
GtkRBNode *drag_node = NULL; GtkRBNode *drag_node = NULL;
gtk_style_context_save (context); gtk_style_context_save (context);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_DND); gtk_style_context_set_state (context, gtk_style_context_get_state (context) | GTK_STATE_FLAG_DROP_ACTIVE);
switch (tree_view->priv->drag_dest_pos) switch (tree_view->priv->drag_dest_pos)
{ {
case GTK_TREE_VIEW_DROP_BEFORE: case GTK_TREE_VIEW_DROP_BEFORE:
highlight_y = background_area.y - 1; gtk_style_context_add_class (context, "before");
if (highlight_y < 0)
highlight_y = 0;
break; break;
case GTK_TREE_VIEW_DROP_AFTER: case GTK_TREE_VIEW_DROP_AFTER:
highlight_y = background_area.y + background_area.height - 1; gtk_style_context_add_class (context, "after");
break; break;
case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE: case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE:
case GTK_TREE_VIEW_DROP_INTO_OR_AFTER: case GTK_TREE_VIEW_DROP_INTO_OR_AFTER:
_gtk_tree_view_find_node (tree_view, drag_dest_path, &drag_tree, &drag_node); gtk_style_context_add_class (context, "into");
if (drag_tree == NULL)
break; break;
}
_gtk_tree_view_find_node (tree_view, drag_dest_path, &drag_tree, &drag_node);
if (drag_tree != NULL)
gtk_render_frame (context, cr, gtk_render_frame (context, cr,
0, gtk_tree_view_get_row_y_offset (tree_view, drag_tree, drag_node), 0, gtk_tree_view_get_row_y_offset (tree_view, drag_tree, drag_node),
gdk_window_get_width (tree_view->priv->bin_window), gdk_window_get_width (tree_view->priv->bin_window),
gtk_tree_view_get_row_height (tree_view, drag_node)); gtk_tree_view_get_row_height (tree_view, drag_node));
break;
}
if (highlight_y >= 0)
{
gtk_tree_view_draw_line (tree_view, cr,
GTK_TREE_VIEW_FOREGROUND_LINE,
rtl ? highlight_x + expander_cell_width : highlight_x,
highlight_y,
rtl ? 0 : bin_window_width,
highlight_y);
}
gtk_style_context_restore (context); gtk_style_context_restore (context);
} }