From ff24dfb2e792125de2a31b82855db820e56b2d36 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 1 Jan 2022 15:35:31 -0500 Subject: [PATCH] Revert "fontchooserwidget: Revise handling of named instances" This reverts commit 2dc56a6e9ba9ec6fb430e9181968fea08367f9ff. This wasn't ready yet. --- gtk/gtkfontchooserwidget.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c index 674349f418..27608eb16f 100644 --- a/gtk/gtkfontchooserwidget.c +++ b/gtk/gtkfontchooserwidget.c @@ -1522,6 +1522,13 @@ should_show_axis (hb_ot_var_axis_info_t *ax) return TRUE; } +static gboolean +is_named_instance (hb_font_t *font) +{ + /* FIXME */ + return FALSE; +} + static struct { guint32 tag; const char *name; @@ -1591,7 +1598,7 @@ add_axis (GtkFontChooserWidget *fontchooser, adjustment_changed (axis->adjustment, axis); g_signal_connect (axis->adjustment, "value-changed", G_CALLBACK (adjustment_changed), axis); - if (!should_show_axis (ax)) + if (is_named_instance (hb_font) || !should_show_axis (ax)) { gtk_widget_hide (axis->label); gtk_widget_hide (axis->scale);