[gnome-themes-standard] treeview: don't override rendering the column header border

[Cosimo Cecchi <cosimoc src gnome org>]

commit a0c3ed246fb3a04b58f6470c464053e632d775a0
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon May 16 21:07:36 2011 -0400

    treeview: don't override rendering the column header border
    
    This has the side effect of making it more similar to mockups.

 src/adwaita_engine.c                   |   53 ++-----------------------------
 themes/Adwaita/gtk-3.0/gtk-widgets.css |   26 +++++++++------
 2 files changed, 19 insertions(+), 60 deletions(-)
---
diff --git a/src/adwaita_engine.c b/src/adwaita_engine.c
index 08e6c9b..adff156 100644
--- a/src/adwaita_engine.c
+++ b/src/adwaita_engine.c
@@ -664,62 +664,17 @@ adwaita_engine_render_frame (GtkThemingEngine *engine,
                              gdouble           width,
                              gdouble           height)
 {
-  const GtkWidgetPath *path;
-  GtkRegionFlags flags = 0;
-  gint len;
-  GtkStateFlags state;        
-
-  state = gtk_theming_engine_get_state (engine);
-
   if (gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_MENUITEM) &&
       gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_MENUBAR))
     {
       render_menubar_active_frame (engine, cr, x, y, width, height);
       return;
     }
-        
-  path = gtk_theming_engine_get_path (engine);
-  len = gtk_widget_path_length (path);
-
-  cairo_save (cr);
 
-  if (gtk_widget_path_iter_has_region (path, len - 2,
-                                       GTK_STYLE_REGION_COLUMN_HEADER,
-                                       &flags))
-    {
-      GdkRGBA color;
-
-      if ((flags & GTK_REGION_LAST) != 0)
-        goto out;
-
-      /* Column header */
-      if (gtk_theming_engine_get_direction (engine) == GTK_TEXT_DIR_RTL)
-        {
-          cairo_move_to (cr, x + 0.5, y + 2);
-          cairo_line_to (cr, x + 0.5, y + height - 4);
-        }
-      else
-        {
-          cairo_move_to (cr, x + width - 0.5, y + 2);
-          cairo_line_to (cr, x + width - 0.5, y + height - 4);
-        }
-
-      gtk_theming_engine_get_border_color (engine, state, &color);
-
-      cairo_set_line_width (cr, 1);
-      gdk_cairo_set_source_rgba (cr, &color);
-      cairo_stroke (cr);
-    }
-  else
-    {
-      adwaita_trim_allocation_for_scale (engine,
-                                         &x, &y,
-                                         &width, &height);
-      render_frame_default (engine, cr, x, y, width, height);
-    }
-
-out:
-  cairo_restore (cr);
+  adwaita_trim_allocation_for_scale (engine,
+                                     &x, &y,
+                                     &width, &height);
+  render_frame_default (engine, cr, x, y, width, height);
 }
 
 static void
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 7e88918..95ff671 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -1000,7 +1000,7 @@ GtkIconView.view.cell:selected:focused {
 
 GtkTreeView {
     -GtkTreeView-vertical-separator: 0;
-    -GtkTreeView-expander-size: 9;
+    -GtkTreeView-expander-size: 11;
 
     -GtkWidget-focus-line-width: 1;
     -adwaita-focus-border-radius: 0;
@@ -1017,8 +1017,18 @@ column-header {
 }
 
 column-header .button {
-    border-width: 0;
+    border-width: 0 1 1 0;
     border-radius: 0;
+    border-style: solid;
+
+    -adwaita-border-gradient: -gtk-gradient(linear,
+                                            left top, left bottom,
+                                            from(@button_border),
+                                            to(shade (@button_border, 1.23)));
+}
+
+column-header:nth-child(last) .button {
+    border-width: 0 0 1 0;
 }
 
 row:hover {
@@ -1030,16 +1040,10 @@ row:insensitive {
 }
 
 row:selected:focused {
-    border-width: 0;
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (@progressbar_border),
-                                     color-stop (0.02, @progressbar_border),
-                                     color-stop (0.03, @theme_selected_bg_color),
-                                     color-stop (0.97, @theme_selected_bg_color),
-                                     color-stop (0.98, @progressbar_border),
-                                     to (@progressbar_border));
+    border-width: 1 0;
+    border-color: @progressbar_border;
     background-color: @theme_selected_bg_color;
+    border-style: solid;
 }
 
 row:selected {