[gtk+] tree view: Fix column drag highlight

[Matthias Clasen <matthiasc src gnome org>]

commit e2c54098da5b42d37e71d3e9c6889aa065860cba
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Sep 7 22:25:23 2014 -0400

    tree view: Fix column drag highlight
    
    This is a bandaid fix that makes the origin case work again
    by switching RGBA window. The arrow case is still unreliable.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=732916

 gtk/gtktreeview.c |   39 ++++++++++++++++++++++++---------------
 1 files changed, 24 insertions(+), 15 deletions(-)
---
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 2c9093c..17c53be 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -3950,26 +3950,12 @@ gtk_tree_view_motion_draw_column_motion_arrow (GtkTreeView *tree_view)
           gtk_widget_get_allocation (button, &drag_allocation);
          width = attributes.width = drag_allocation.width;
          height = attributes.height = drag_allocation.height;
-         attributes.visual = gtk_widget_get_visual (GTK_WIDGET (tree_view));
+         attributes.visual = gdk_screen_get_rgba_visual (gtk_widget_get_screen (widget));
          attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK;
          attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
          tree_view->priv->drag_highlight_window = gdk_window_new (tree_view->priv->header_window, 
&attributes, attributes_mask);
          gtk_widget_register_window (GTK_WIDGET (tree_view), tree_view->priv->drag_highlight_window);
 
-         mask_image = cairo_image_surface_create (CAIRO_FORMAT_A1, width, height);
-          cr = cairo_create (mask_image);
-
-          cairo_rectangle (cr, 1, 1, width - 2, height - 2);
-          cairo_stroke (cr);
-          cairo_destroy (cr);
-
-          mask_region = gdk_cairo_region_create_from_surface (mask_image);
-         gdk_window_shape_combine_region (tree_view->priv->drag_highlight_window,
-                                          mask_region, 0, 0);
-
-          cairo_region_destroy (mask_region);
-          cairo_surface_destroy (mask_image);
-
          tree_view->priv->drag_column_window_state = DRAG_COLUMN_WINDOW_STATE_ORIGINAL;
        }
     }
@@ -5603,6 +5589,29 @@ gtk_tree_view_draw (GtkWidget *widget,
                             &view_rect, &canvas_rect,
                             draw_bin, widget);
     }
+  else if (tree_view->priv->drag_highlight_window &&
+           gtk_cairo_should_draw_window (cr, tree_view->priv->drag_highlight_window))
+    {
+      cairo_save (cr);
+      gtk_cairo_transform_to_window (cr, GTK_WIDGET (tree_view), tree_view->priv->drag_highlight_window);
+      if (tree_view->priv->drag_column_window_state == DRAG_COLUMN_WINDOW_STATE_ORIGINAL)
+        {
+          cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.0);
+          cairo_paint (cr);
+          cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
+          cairo_rectangle (cr,
+                           1, 1,
+                           gdk_window_get_width (tree_view->priv->drag_highlight_window) - 2,
+                           gdk_window_get_height (tree_view->priv->drag_highlight_window) - 2);
+          cairo_stroke (cr);
+        }
+      else
+        {
+          cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
+          cairo_paint (cr);
+        }
+      cairo_restore (cr);
+    }
   else
     {
       gtk_render_background (context, cr,