Remove GtkTreeView::row-ending-details

This was a style property to let theme engines 'opt-in' to more
    correct behaviour while maintaining compatibility with existing
    themes. GTK+ 3 engines are expected to handle the more correct
    behaviour.
This commit is contained in:
Matthias Clasen 2010-09-01 20:58:39 -04:00
parent 399580f9e1
commit 095fb1afe4

View File

@ -831,13 +831,6 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
GDK_TYPE_COLOR, GDK_TYPE_COLOR,
GTK_PARAM_READABLE)); GTK_PARAM_READABLE));
gtk_widget_class_install_style_property (widget_class,
g_param_spec_boolean ("row-ending-details",
P_("Row Ending details"),
P_("Enable extended row background theming"),
FALSE,
GTK_PARAM_READABLE));
gtk_widget_class_install_style_property (widget_class, gtk_widget_class_install_style_property (widget_class,
g_param_spec_int ("grid-line-width", g_param_spec_int ("grid-line-width",
P_("Grid line width"), P_("Grid line width"),
@ -4337,7 +4330,6 @@ gtk_tree_view_bin_expose (GtkWidget *widget,
gint pointer_x, pointer_y; gint pointer_x, pointer_y;
gint grid_line_width; gint grid_line_width;
gboolean got_pointer = FALSE; gboolean got_pointer = FALSE;
gboolean row_ending_details;
gboolean draw_vgrid_lines, draw_hgrid_lines; gboolean draw_vgrid_lines, draw_hgrid_lines;
rtl = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL); rtl = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);
@ -4347,7 +4339,6 @@ gtk_tree_view_bin_expose (GtkWidget *widget,
"vertical-separator", &vertical_separator, "vertical-separator", &vertical_separator,
"allow-rules", &allow_rules, "allow-rules", &allow_rules,
"focus-line-width", &focus_line_width, "focus-line-width", &focus_line_width,
"row-ending-details", &row_ending_details,
NULL); NULL);
if (tree_view->priv->tree == NULL) if (tree_view->priv->tree == NULL)
@ -4501,6 +4492,7 @@ gtk_tree_view_bin_expose (GtkWidget *widget,
{ {
GtkTreeViewColumn *column = list->data; GtkTreeViewColumn *column = list->data;
const gchar *detail = NULL; const gchar *detail = NULL;
gchar new_detail[128];
GtkStateType state; GtkStateType state;
if (!column->visible) if (!column->visible)
@ -4619,10 +4611,6 @@ gtk_tree_view_bin_expose (GtkWidget *widget,
state = GTK_STATE_NORMAL; state = GTK_STATE_NORMAL;
/* Draw background */ /* Draw background */
if (row_ending_details)
{
char new_detail[128];
is_first = (rtl ? !list->next : !list->prev); is_first = (rtl ? !list->next : !list->prev);
is_last = (rtl ? !list->prev : !list->next); is_last = (rtl ? !list->prev : !list->next);
@ -4636,7 +4624,7 @@ gtk_tree_view_bin_expose (GtkWidget *widget,
else if (is_last) else if (is_last)
g_snprintf (new_detail, 127, "%s_end", detail); g_snprintf (new_detail, 127, "%s_end", detail);
else else
g_snprintf (new_detail, 128, "%s_middle", detail); g_snprintf (new_detail, 127, "%s_middle", detail);
gtk_paint_flat_box (widget->style, gtk_paint_flat_box (widget->style,
event->window, event->window,
@ -4649,21 +4637,6 @@ gtk_tree_view_bin_expose (GtkWidget *widget,
background_area.y, background_area.y,
background_area.width, background_area.width,
background_area.height); background_area.height);
}
else
{
gtk_paint_flat_box (widget->style,
event->window,
state,
GTK_SHADOW_NONE,
&event->area,
widget,
detail,
background_area.x,
background_area.y,
background_area.width,
background_area.height);
}
if (gtk_tree_view_is_expander_column (tree_view, column)) if (gtk_tree_view_is_expander_column (tree_view, column))
{ {
@ -4875,7 +4848,6 @@ gtk_tree_view_bin_expose (GtkWidget *widget,
gdk_drawable_get_size (tree_view->priv->bin_window, gdk_drawable_get_size (tree_view->priv->bin_window,
&width, NULL); &width, NULL);
if (row_ending_details)
gtk_paint_focus (widget->style, gtk_paint_focus (widget->style,
tree_view->priv->bin_window, tree_view->priv->bin_window,
gtk_widget_get_state (widget), gtk_widget_get_state (widget),
@ -4888,17 +4860,6 @@ gtk_tree_view_bin_expose (GtkWidget *widget,
- focus_line_width / 2, - focus_line_width / 2,
width, ROW_HEIGHT (tree_view, BACKGROUND_HEIGHT (node)) width, ROW_HEIGHT (tree_view, BACKGROUND_HEIGHT (node))
- focus_line_width + 1); - focus_line_width + 1);
else
gtk_paint_focus (widget->style,
tree_view->priv->bin_window,
gtk_widget_get_state (widget),
&event->area,
widget,
"treeview-drop-indicator",
0, BACKGROUND_FIRST_PIXEL (tree_view, tree, node)
- focus_line_width / 2,
width, ROW_HEIGHT (tree_view, BACKGROUND_HEIGHT (node))
- focus_line_width + 1);
break; break;
} }
@ -4942,7 +4903,6 @@ gtk_tree_view_bin_expose (GtkWidget *widget,
tmp_height = ROW_HEIGHT (tree_view, BACKGROUND_HEIGHT (node)); tmp_height = ROW_HEIGHT (tree_view, BACKGROUND_HEIGHT (node));
} }
if (row_ending_details)
gtk_paint_focus (widget->style, gtk_paint_focus (widget->style,
tree_view->priv->bin_window, tree_view->priv->bin_window,
focus_rect_state, focus_rect_state,
@ -4953,15 +4913,6 @@ gtk_tree_view_bin_expose (GtkWidget *widget,
: (is_last ? "treeview-right" : "treeview-middle" )), : (is_last ? "treeview-right" : "treeview-middle" )),
0, tmp_y, 0, tmp_y,
width, tmp_height); width, tmp_height);
else
gtk_paint_focus (widget->style,
tree_view->priv->bin_window,
focus_rect_state,
&event->area,
widget,
"treeview",
0, tmp_y,
width, tmp_height);
} }
y_offset += max_height; y_offset += max_height;