[gtk+/composite-templates] Always make primary headings bold in message dialogs
- From: Juan Pablo Ugarte <jpu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/composite-templates] Always make primary headings bold in message dialogs
- Date: Fri, 14 Sep 2012 21:22:52 +0000 (UTC)
commit 17a28fa5e877dfe9ccac92934799504f48bee8e5
Author: William Jon McCann <jmccann redhat com>
Date: Wed Aug 29 17:19:49 2012 -0400
Always make primary headings bold in message dialogs
Unless they have markup. But only use big text if there is
secondary text.
https://bugzilla.gnome.org/show_bug.cgi?id=683001
gtk/gtkmessagedialog.c | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index dc19269..284c018 100644
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
@@ -333,7 +333,7 @@ setup_primary_label_font (GtkMessageDialog *dialog)
{
GtkMessageDialogPrivate *priv = dialog->priv;
- if (priv->has_secondary_text && !priv->has_primary_markup)
+ if (!priv->has_primary_markup)
{
PangoAttrList *attributes;
PangoAttribute *attr;
@@ -343,8 +343,11 @@ setup_primary_label_font (GtkMessageDialog *dialog)
attr = pango_attr_weight_new (PANGO_WEIGHT_BOLD);
pango_attr_list_insert (attributes, attr);
- attr = pango_attr_scale_new (PANGO_SCALE_LARGE);
- pango_attr_list_insert (attributes, attr);
+ if (priv->has_secondary_text)
+ {
+ attr = pango_attr_scale_new (PANGO_SCALE_LARGE);
+ pango_attr_list_insert (attributes, attr);
+ }
gtk_label_set_attributes (GTK_LABEL (priv->label), attributes);
pango_attr_list_unref (attributes);
@@ -781,9 +784,6 @@ gtk_message_dialog_set_markup (GtkMessageDialog *message_dialog,
* Sets the secondary text of the message dialog to be @message_format
* (with printf()-style).
*
- * Note that setting a secondary text makes the primary text become
- * bold, unless you have provided explicit markup.
- *
* Since: 2.6
*/
void
@@ -832,9 +832,6 @@ gtk_message_dialog_format_secondary_text (GtkMessageDialog *message_dialog,
* printf()-style), which is marked up with the
* <link linkend="PangoMarkupFormat">Pango text markup language</link>.
*
- * Note that setting a secondary text makes the primary text become
- * bold, unless you have provided explicit markup.
- *
* Due to an oversight, this function does not escape special XML characters
* like gtk_message_dialog_new_with_markup() does. Thus, if the arguments
* may contain special XML characters, you should use g_markup_printf_escaped()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]