[gtk/pango2] fontchooser: Small fixes
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/pango2] fontchooser: Small fixes
- Date: Wed, 6 Jul 2022 17:46:05 +0000 (UTC)
commit a69d39d9454687fd89c986dd16a3be39aa6c4ba0
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Jul 5 14:21:16 2022 -0400
fontchooser: Small fixes
Make initial property values match.
gtk/gtkfontbutton.c | 6 +++++-
gtk/gtkfontchooserwidget.c | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index c4c4cd258c..a389420a06 100644
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -383,6 +383,9 @@ gtk_font_button_take_font_desc (GtkFontButton *font_button,
else
font_button->font_size = pango2_font_description_get_size (font_button->font_desc) / PANGO2_SCALE;
+ font_button->font_features = g_strdup ("");
+ font_button->palette = g_strdup (PANGO2_COLOR_PALETTE_DEFAULT);
+
gtk_font_button_update_font_data (font_button);
gtk_font_button_update_font_info (font_button);
@@ -392,6 +395,8 @@ gtk_font_button_take_font_desc (GtkFontButton *font_button,
g_object_notify (G_OBJECT (font_button), "font");
g_object_notify (G_OBJECT (font_button), "font-desc");
+ g_object_notify (G_OBJECT (font_button), "font-features");
+ g_object_notify (G_OBJECT (font_button), "palette");
g_object_thaw_notify (object);
}
@@ -1099,7 +1104,6 @@ gtk_font_button_label_use_font (GtkFontButton *font_button)
if ((font_button->level & GTK_FONT_CHOOSER_LEVEL_PALETTE) != 0 && font_button->palette != NULL)
{
pango2_attr_list_insert (attrs, pango2_attr_palette_new (font_button->palette));
- g_print ("using palette %s\n", font_button->palette);
}
pango2_attr_list_insert (attrs, pango2_attr_font_desc_new (desc));
diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c
index fcdbd169a9..603459d005 100644
--- a/gtk/gtkfontchooserwidget.c
+++ b/gtk/gtkfontchooserwidget.c
@@ -1233,6 +1233,7 @@ gtk_font_chooser_widget_init (GtkFontChooserWidget *self)
GTK_FONT_CHOOSER_LEVEL_STYLE |
GTK_FONT_CHOOSER_LEVEL_SIZE;
self->language = pango2_language_get_default ();
+ self->palette = g_strdup (PANGO2_COLOR_PALETTE_DEFAULT);
/* Set default preview text */
gtk_editable_set_text (GTK_EDITABLE (self->preview), self->preview_text);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]