#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
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);
- expander_size += EXPANDER_EXTRA_PADDING;
- return expander_size;
+ return expander_size + (horizontal_separator / 2);
}
static gboolean
tree_view->priv->cur_reorder->left_column);
}
tree_view->priv->drag_column = NULL;
+ gtk_widget_unregister_window (widget, tree_view->priv->drag_window);
gdk_window_destroy (tree_view->priv->drag_window);
tree_view->priv->drag_window = NULL;
GList *list;
GtkTreeViewColumn *tmp_column = NULL;
gint total_width;
- gint expander_size;
+ 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));
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 (tmp_column &&
gtk_tree_view_column_get_visible (tmp_column))
/* +1 because x2 isn't included in the range. */
- *x2 = *x1 + expander_size + 1;
+ *x2 = *x1 + expander_render_size + 1;
else
*x2 = *x1;
}
gint x_offset = 0;
gint x2;
gint vertical_separator;
- gint expander_size;
GtkCellRendererState flags = 0;
widget = GTK_WIDGET (tree_view);
gtk_widget_style_get (widget,
"vertical-separator", &vertical_separator,
NULL);
- expander_size = gtk_tree_view_get_expander_size (tree_view) - EXPANDER_EXTRA_PADDING;
if (! GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PARENT))
return;
area.x = x_offset;
area.y = gtk_tree_view_get_cell_area_y_offset (tree_view, tree, node,
vertical_separator);
- area.width = expander_size;
+ area.width = x2 - x_offset;
area.height = gtk_tree_view_get_cell_area_height (tree_view, node,
vertical_separator);
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);
}
_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);