diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-12-29 17:47:01 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-12-29 17:47:01 +0000 |
| commit | 5fe433418d271acf06afc1538c3289b9e2ad4478 (patch) | |
| tree | fb06a781f8573ebf6927090100ade11a26b30278 | |
| parent | 02ba9bc1dac1e1fee449932498d9c8b2843c138d (diff) | |
| parent | 23361200104ca3b0f6b4a10835a329322e138bd1 (diff) | |
| download | gtk+-5fe433418d271acf06afc1538c3289b9e2ad4478.tar.gz | |
Merge branch 'mcatanzaro/#3509' into 'master'
message dialog: use title style only if there is secondary text
Closes #3509
See merge request GNOME/gtk!3015
| -rw-r--r-- | gtk/gtkmessagedialog.c | 6 | ||||
| -rw-r--r-- | gtk/ui/gtkmessagedialog.ui | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c index c28f275b3a..171554d8cc 100644 --- a/gtk/gtkmessagedialog.c +++ b/gtk/gtkmessagedialog.c @@ -383,11 +383,13 @@ gtk_message_dialog_set_property (GObject *object, if (txt) { priv->has_secondary_text = TRUE; + gtk_widget_add_css_class (priv->label, "title"); gtk_widget_show (priv->secondary_label); } else { priv->has_secondary_text = FALSE; + gtk_widget_remove_css_class (priv->label, "title"); gtk_widget_hide (priv->secondary_label); } } @@ -621,6 +623,7 @@ gtk_message_dialog_format_secondary_text (GtkMessageDialog *message_dialog, if (message_format) { priv->has_secondary_text = TRUE; + gtk_widget_add_css_class (priv->label, "title"); va_start (args, message_format); msg = g_strdup_vprintf (message_format, args); @@ -634,6 +637,7 @@ gtk_message_dialog_format_secondary_text (GtkMessageDialog *message_dialog, else { priv->has_secondary_text = FALSE; + gtk_widget_remove_css_class (priv->label, "title"); gtk_widget_hide (priv->secondary_label); } } @@ -677,6 +681,7 @@ gtk_message_dialog_format_secondary_markup (GtkMessageDialog *message_dialog, if (message_format) { priv->has_secondary_text = TRUE; + gtk_widget_add_css_class (priv->label, "title"); va_start (args, message_format); msg = g_strdup_vprintf (message_format, args); @@ -690,6 +695,7 @@ gtk_message_dialog_format_secondary_markup (GtkMessageDialog *message_dialog, else { priv->has_secondary_text = FALSE; + gtk_widget_remove_css_class (priv->label, "title"); gtk_widget_hide (priv->secondary_label); } } diff --git a/gtk/ui/gtkmessagedialog.ui b/gtk/ui/gtkmessagedialog.ui index c7e29be04d..42c6528b4a 100644 --- a/gtk/ui/gtkmessagedialog.ui +++ b/gtk/ui/gtkmessagedialog.ui @@ -28,9 +28,6 @@ <property name="valign">start</property> <property name="wrap">1</property> <property name="max-width-chars">60</property> - <style> - <class name="title"/> - </style> </object> </child> <child> |