[gtk+/wip/matthiasc/font-variations: 3/13] font chooser: Don't reset features too eagerly

[Matthias Clasen <matthiasc src gnome org>]

commit 756a1a1be94f6dd1dd1eb1efb072ed1b67772039
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Dec 28 12:13:07 2017 -0500

    font chooser: Don't reset features too eagerly
    
    We shouldn't reset the font features when changing the size.

 gtk/gtkfontchooserwidget.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c
index ba68131..6c0f363 100644
--- a/gtk/gtkfontchooserwidget.c
+++ b/gtk/gtkfontchooserwidget.c
@@ -2694,13 +2694,14 @@ gtk_font_chooser_widget_merge_font_desc (GtkFontChooserWidget       *fontchooser
         }
 
       gtk_font_chooser_widget_update_marks (fontchooser);
-    }
 
-  gtk_font_chooser_widget_update_preview_attributes (fontchooser);
 #if defined(HAVE_HARFBUZZ) && defined(HAVE_PANGOFT)
-  gtk_font_chooser_widget_update_font_features (fontchooser);
-  gtk_font_chooser_widget_update_font_variations (fontchooser);
+      gtk_font_chooser_widget_update_font_features (fontchooser);
+      gtk_font_chooser_widget_update_font_variations (fontchooser);
 #endif
+    }
+
+  gtk_font_chooser_widget_update_preview_attributes (fontchooser);
 
   g_object_notify (G_OBJECT (fontchooser), "font");
   g_object_notify (G_OBJECT (fontchooser), "font-desc");