diff options
| author | Michael Catanzaro <mcatanzaro@gnome.org> | 2020-12-29 11:12:59 -0600 |
|---|---|---|
| committer | Michael Catanzaro <mcatanzaro@gnome.org> | 2020-12-29 11:15:14 -0600 |
| commit | 23361200104ca3b0f6b4a10835a329322e138bd1 (patch) | |
| tree | db22a54200c086e1b4fdd089f9582b3e0d687517 | |
| parent | f7e30169492298e1b566f17d09e3cb561e7b86fc (diff) | |
| download | gtk+-23361200104ca3b0f6b4a10835a329322e138bd1.tar.gz | |
message dialog: use title style only if there is secondary text
If there is no secondary text, then the primary text is just a message,
not a title, and should not use title style.
This partially reverts 1e3ec7c1f993ec8cab4c6608b968e78f9028d662. The
message dialog nown looks like it used to in GTK 3. However, it's still
styled only using a style class rather than using pango markup, as in
GTK 3.
Fixes #3509
| -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> |