From ca7f81e2e9adf325effa11fc55aace4a087ab61b Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Wed, 7 Sep 2011 14:55:16 -0400
Subject: [PATCH] icon-container: use the "rubberband" style class for the
 selection item

Instead of using a custom style property.
---
 data/nautilus.css                             |  4 --
 libnautilus-private/nautilus-icon-container.c | 37 +++++--------------
 2 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/data/nautilus.css b/data/nautilus.css
index 2456661e4..5c3418189 100644
--- a/data/nautilus.css
+++ b/data/nautilus.css
@@ -1,9 +1,5 @@
 @define-color cluebar_color #729fcf;
 
-* {
-    -NautilusIconContainer-selection-box-rgba: @selected_bg_color;
-}
-
 NautilusTrashBar.info,
 NautilusXContentBar.info,
 NautilusSearchBar.info,
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index f9ee2f5c2..bff309a58 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -2610,10 +2610,10 @@ start_rubberbanding (NautilusIconContainer *container,
 	AtkObject *accessible;
 	NautilusIconContainerDetails *details;
 	NautilusIconRubberbandInfo *band_info;
-	GdkRGBA *fill_color_gdk, outline, color;
+	GdkRGBA bg_color, border_color;
 	GList *p;
 	NautilusIcon *icon;
-	GtkStyleContext *style;
+	GtkStyleContext *context;
 
 	details = container->details;
 	band_info = &details->rubberband_info;
@@ -2630,23 +2630,14 @@ start_rubberbanding (NautilusIconContainer *container,
 		(EEL_CANVAS (container), event->x, event->y,
 		 &band_info->start_x, &band_info->start_y);
 
-	style = gtk_widget_get_style_context (GTK_WIDGET (container));
-	gtk_style_context_get_style (style,
-				     "selection_box_rgba", &fill_color_gdk,
-				     NULL);
+	context = gtk_widget_get_style_context (GTK_WIDGET (container));
+	gtk_style_context_save (context);
+	gtk_style_context_add_class (context, GTK_STYLE_CLASS_RUBBERBAND);
 
-	if (!fill_color_gdk) {
-		gtk_style_context_get_background_color (style, GTK_STATE_FLAG_SELECTED,
-							&color);
-		fill_color_gdk = gdk_rgba_copy (&color);
-	}
+	gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &bg_color);
+	gtk_style_context_get_border_color (context, GTK_STATE_FLAG_NORMAL, &border_color);
 
-	if (fill_color_gdk->alpha == 1) {
-		fill_color_gdk->alpha = 0.25;
-	}
-
-	outline = *fill_color_gdk;
-	eel_make_color_inactive (&outline);
+	gtk_style_context_restore (context);
 
 	band_info->selection_rectangle = eel_canvas_item_new
 		(eel_canvas_root
@@ -2656,13 +2647,11 @@ start_rubberbanding (NautilusIconContainer *container,
 		 "y1", band_info->start_y,
 		 "x2", band_info->start_x,
 		 "y2", band_info->start_y,
-		 "fill_color_rgba", fill_color_gdk,
-		 "outline_color_rgba", &outline,
+		 "fill_color_rgba", &bg_color,
+		 "outline_color_rgba", &border_color,
 		 "width_pixels", 1,
 		 NULL);
 
-	gdk_rgba_free (fill_color_gdk);
-
 	accessible = atk_gobject_accessible_for_object
 		(G_OBJECT (band_info->selection_rectangle));
 	atk_object_set_name (accessible, "selection");
@@ -6061,12 +6050,6 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
 
 	class->start_interactive_search = nautilus_icon_container_start_interactive_search;
 
-	gtk_widget_class_install_style_property (widget_class,
-						 g_param_spec_boxed ("selection_box_rgba",
-								     "Selection Box RGBA",
-								     "Color of the selection box",
-								     GDK_TYPE_RGBA,
-								     G_PARAM_READABLE));
 	gtk_widget_class_install_style_property (widget_class,
 						 g_param_spec_boolean ("activate_prelight_icon_label",
 								     "Activate Prelight Icon Label",