Merge lp:~3v1n0/unity/force-quit-dialog-gtk-3.20-selectors into lp:unity

[Marco Trevisan (Treviño)]

DecorationsForceQuitDialog: make CSS selectors work with gtk 3.20

[Iain Lane (laney)]

This looks good, thanks!

review: Approve

=== modified file 'decorations/DecorationsForceQuitDialog.cpp'
--- decorations/DecorationsForceQuitDialog.cpp	2016-03-22 15:29:31 +0000
+++ decorations/DecorationsForceQuitDialog.cpp	2016-08-06 16:23:25 +0000
@@ -279,7 +279,7 @@
   int decoration_radius = std::max({radius.top, radius.left, radius.right, radius.bottom});
 
   gtk_css_provider_load_from_data(style, (R"(
-  SheetStyleDialog {
+  SheetStyleDialog, sheet-style-dialog {
     background-color: #f7f6f5;
     color: #4a4a4a;
     border-radius: )"+std::to_string(decoration_radius)+R"(px;
@@ -291,7 +291,7 @@
                            std::to_string(int(color.alpha))+'.'+std::to_string(int(color.alpha*10000.0))+')'+R"(;
   }
 
-  SheetStyleDialog:backdrop {
+  SheetStyleDialog:backdrop, sheet-style-dialog:backdrop {
     background-color: shade(#f7f6f5, 1.2);
     color: shade(#4a4a4a, 1.5);
     border-radius: )"+std::to_string(decoration_radius)+R"(px;
@@ -327,10 +327,7 @@
 
   auto* title = gtk_label_new(_("This window is not responding"));
   glib::Object<GtkCssProvider> title_style(gtk_css_provider_new());
-  gtk_css_provider_load_from_data(title_style, (R"(
-  GtkLabel {
-    font-size: 17px;
-  })"), -1, nullptr);
+  gtk_css_provider_load_from_data(title_style, (R"(* { font-size: 17px; })"), -1, nullptr);
   style_ctx = gtk_widget_get_style_context(title);
   gtk_style_context_add_provider(style_ctx, glib::object_cast<GtkStyleProvider>(title_style), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
   gtk_style_context_add_class(style_ctx, "unity-force-quit");
@@ -377,6 +374,10 @@
     gtk_render_background(gtk_widget_get_style_context(self), cr, 0, 0, a.width, a.height);
     return GTK_WIDGET_CLASS(sheet_style_dialog_parent_class)->draw(self, cr);
   };
+
+#if GTK_CHECK_VERSION(3, 20, 0)
+  gtk_widget_class_set_css_name(GTK_WIDGET_CLASS(klass), "sheet-style-dialog");
+#endif
 }
 
 // Close button