AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-13 14:00:09 +00:00
Code Issues Projects Releases Wiki Activity

Call all window subclasses "window"

Browse Source 
And add style classes to differentiate them
This commit is contained in:
Timm Bäder 2020-05-20 09:07:24 +02:00
parent 388733fe77
commit 5ebabd7cf6
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkassistant.c
View File

@ -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_back);
gtk_widget_class_bind_template_callback (widget_class, on_assistant_cancel); 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_bind_template_callback (widget_class, on_assistant_last);
gtk_widget_class_set_css_name (widget_class, I_("assistant"));
} }
static gint static gint
@ -1140,6 +1138,8 @@ assistant_remove_page (GtkAssistant *assistant,
static void static void
gtk_assistant_init (GtkAssistant *assistant) gtk_assistant_init (GtkAssistant *assistant)
{ {
gtk_widget_add_css_class (GTK_WIDGET (assistant), "assistant");
assistant->pages = NULL; assistant->pages = NULL;
assistant->current_page = NULL; assistant->current_page = NULL;
assistant->visited_pages = NULL; assistant->visited_pages = NULL;

4
gtk/gtkdialog.c
View File

@ -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, action_area);
gtk_widget_class_bind_template_child_internal_private (widget_class, GtkDialog, content_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_bind_template_child_private (widget_class, GtkDialog, action_box);
gtk_widget_class_set_css_name (widget_class, I_("dialog"));
} }
static void static void
@ -564,7 +562,7 @@ gtk_dialog_init (GtkDialog *dialog)
{ {
GtkDialogPrivate *priv = gtk_dialog_get_instance_private (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->use_header_bar = -1;
priv->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); priv->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);

4
gtk/gtkmessagedialog.c
View File

@ -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, label);
gtk_widget_class_bind_template_child_private (widget_class, GtkMessageDialog, secondary_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_bind_template_child_internal_private (widget_class, GtkMessageDialog, message_area);
gtk_widget_class_set_css_name (widget_class, I_("messagedialog"));
} }
static void static void
@ -271,6 +269,8 @@ gtk_message_dialog_init (GtkMessageDialog *dialog)
priv->has_secondary_text = FALSE; priv->has_secondary_text = FALSE;
priv->message_type = GTK_MESSAGE_OTHER; priv->message_type = GTK_MESSAGE_OTHER;
gtk_widget_add_css_class (GTK_WIDGET (dialog), "message");
gtk_widget_init_template (GTK_WIDGET (dialog)); gtk_widget_init_template (GTK_WIDGET (dialog));
action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog)); action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
gtk_widget_set_halign (action_area, GTK_ALIGN_FILL); gtk_widget_set_halign (action_area, GTK_ALIGN_FILL);

5
gtk/theme/Adwaita/_common.scss
View File

@ -180,7 +180,7 @@ label {
text-shadow: none; text-shadow: none;
} }
assistant { window.assistant {
.sidebar { .sidebar {
background-color: $base_color; background-color: $base_color;
border-top: 1px solid $borders_color; border-top: 1px solid $borders_color;
@ -3474,7 +3474,7 @@ calendar {
/*********** /***********
* Dialogs * * Dialogs *
***********/ ***********/
messagedialog { // Message Dialog styling window.dialog.message { // Message Dialog styling
.titlebar { .titlebar {
min-height: 20px; min-height: 20px;
background-image: none; background-image: none;
@ -4030,7 +4030,6 @@ colorchooser .popover.osd { border-radius: 5px; }
/********************** /**********************
* Window Decorations * * Window Decorations *
*********************/ *********************/
decoration,
window { window {
border-radius: $window_radius $window_radius 0 0; border-radius: $window_radius $window_radius 0 0;
// lamefun trick to get rounded borders regardless of CSD use // lamefun trick to get rounded borders regardless of CSD use