e-window: use a css file for widget styling

Replace local styling (used for the tab close button and embed's status
frame) by a global css sheet loaded at window construction.
This allows tweaking style properties without rebuilding.

The css file is installed in $(pkgdatadir)/epiphany.css.

Signed-off-by: Diego Escalante Urrelo <descalante@igalia.com>

Bug #644805

2 files changed, 23 insertions, 18 deletions

diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index 3d2e365bc..d5cc41372 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -581,7 +581,6 @@ build_tab_label (EphyNotebook *nb, EphyEmbed *embed)
 {
 	GtkWidget *hbox, *label, *close_button, *image, *spinner, *icon;
 	EphyWebView *view;
-	GtkCssProvider *provider;
 
 	/* set hbox spacing and label padding (see below) so that there's an
 	 * equal amount of space around the label */
@@ -615,23 +614,6 @@ build_tab_label (EphyNotebook *nb, EphyEmbed *embed)
 
 	gtk_widget_set_name (close_button, "ephy-tab-close-button");
 
-	provider = gtk_css_provider_new ();
-	gtk_css_provider_load_from_data (provider,
-					 "#ephy-tab-close-button {"
-					 " -GtkButton-default-border: 0;"
-					 " -GtkButton-default-outside-border: 0;"
-					 " -GtkButton-inner-border: 0;"
-					 " -GtkWidget-focus-padding: 0;"
-					 " -GtkWidget-focus-line-width: 0;"
-					 " margin: 0;"
-					 " padding: 0; }",
-					 -1, NULL);
-
-	gtk_style_context_add_provider (gtk_widget_get_style_context (close_button),
-					GTK_STYLE_PROVIDER (provider),
-					GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-	g_object_unref (provider);
-
 	image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
 	gtk_widget_set_tooltip_text (close_button, _("Close tab"));
 	g_signal_connect (close_button, "clicked",
diff --git a/src/ephy-window.c b/src/ephy-window.c
index f5ee4b2a9..f8cedf9be 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -3683,6 +3683,8 @@ ephy_window_constructor (GType type,
 	guint settings_connection;
 	GSList *proxies;
 	GtkWidget *proxy;
+	GtkCssProvider *css_provider;
+	GFile *css_file;
 
 	object = G_OBJECT_CLASS (ephy_window_parent_class)->constructor
 		(type, n_construct_properties, construct_params);
@@ -3779,6 +3781,27 @@ ephy_window_constructor (GType type,
 }
 #endif
 
+	/* Attach the CSS provider to the window */
+	css_file = g_file_new_for_path (ephy_file ("epiphany.css"));
+	css_provider = gtk_css_provider_new ();
+	gtk_css_provider_load_from_file (css_provider,
+	                                 css_file,
+	                                 &error);
+	if (error == NULL)
+	{
+		gtk_style_context_add_provider_for_screen (gtk_widget_get_screen (GTK_WIDGET (window)),
+		                                           GTK_STYLE_PROVIDER (css_provider),
+		                                           GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+	}
+	else
+	{
+		g_warning ("Could not attach css style: %s", error->message);
+		g_error_free (error);
+	}
+
+	g_object_unref (css_provider);
+	g_object_unref (css_file);
+
 	/* Initialize the menus */
 	priv->tabs_menu = ephy_tabs_menu_new (window);
 	priv->enc_menu = ephy_encoding_menu_new (window);