Call all window subclasses "window"

And add style classes to differentiate them

4 files changed, 7 insertions, 10 deletions

diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index 2741c84f39..2e560bd339 100644
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -630,8 +630,6 @@ gtk_assistant_class_init (GtkAssistantClass *class)
   gtk_widget_class_bind_template_callback (widget_class, on_assistant_back);
   gtk_widget_class_bind_template_callback (widget_class, on_assistant_cancel);
   gtk_widget_class_bind_template_callback (widget_class, on_assistant_last);
-
-  gtk_widget_class_set_css_name (widget_class, I_("assistant"));
 }
 
 static gint
@@ -1140,6 +1138,8 @@ assistant_remove_page (GtkAssistant *assistant,
 static void
 gtk_assistant_init (GtkAssistant *assistant)
 {
+  gtk_widget_add_css_class (GTK_WIDGET (assistant), "assistant");
+
   assistant->pages = NULL;
   assistant->current_page = NULL;
   assistant->visited_pages = NULL;
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index f5c401311a..45dc729757 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -555,8 +555,6 @@ gtk_dialog_class_init (GtkDialogClass *class)
   gtk_widget_class_bind_template_child_internal_private (widget_class, GtkDialog, action_area);
   gtk_widget_class_bind_template_child_internal_private (widget_class, GtkDialog, content_area);
   gtk_widget_class_bind_template_child_private (widget_class, GtkDialog, action_box);
-
-  gtk_widget_class_set_css_name (widget_class, I_("dialog"));
 }
 
 static void
@@ -564,7 +562,7 @@ gtk_dialog_init (GtkDialog *dialog)
 {
   GtkDialogPrivate *priv = gtk_dialog_get_instance_private (dialog);
 
-  priv = gtk_dialog_get_instance_private (dialog);
+  gtk_widget_add_css_class (GTK_WIDGET (dialog), "dialog");
 
   priv->use_header_bar = -1;
   priv->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index 0d8636a016..b3c9278146 100644
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
@@ -253,8 +253,6 @@ gtk_message_dialog_class_init (GtkMessageDialogClass *class)
   gtk_widget_class_bind_template_child_private (widget_class, GtkMessageDialog, label);
   gtk_widget_class_bind_template_child_private (widget_class, GtkMessageDialog, secondary_label);
   gtk_widget_class_bind_template_child_internal_private (widget_class, GtkMessageDialog, message_area);
-
-  gtk_widget_class_set_css_name (widget_class, I_("messagedialog"));
 }
 
 static void
@@ -271,6 +269,8 @@ gtk_message_dialog_init (GtkMessageDialog *dialog)
   priv->has_secondary_text = FALSE;
   priv->message_type = GTK_MESSAGE_OTHER;
 
+  gtk_widget_add_css_class (GTK_WIDGET (dialog), "message");
+
   gtk_widget_init_template (GTK_WIDGET (dialog));
   action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
   gtk_widget_set_halign (action_area, GTK_ALIGN_FILL);
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 8358407477..7d3a98fd4c 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -180,7 +180,7 @@ label {
   text-shadow: none;
 }
 
-assistant {
+window.assistant {
   .sidebar {
     background-color: $base_color;
     border-top: 1px solid $borders_color;
@@ -3474,7 +3474,7 @@ calendar {
 /***********
  * Dialogs *
  ***********/
-messagedialog { // Message Dialog styling
+window.dialog.message { // Message Dialog styling
   .titlebar {
     min-height: 20px;
     background-image: none;
@@ -4030,7 +4030,6 @@ colorchooser .popover.osd { border-radius: 5px; }
 /**********************
  * Window Decorations *
  *********************/
-decoration,
 window {
   border-radius: $window_radius $window_radius 0 0;
   // lamefun trick to get rounded borders regardless of CSD use