From e003213784b58d632b34071ae58d7f84aea78a55 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sat, 6 Mar 2010 22:54:12 +0100 Subject: [PATCH] app: move code for font entry and "size" label together --- app/widgets/gimptextstyleeditor.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/widgets/gimptextstyleeditor.c b/app/widgets/gimptextstyleeditor.c index 2aecc2c57a..424105eff0 100644 --- a/app/widgets/gimptextstyleeditor.c +++ b/app/widgets/gimptextstyleeditor.c @@ -800,6 +800,8 @@ gimp_text_style_editor_update_idle (GimpTextStyleEditor *editor) gimp_text_style_editor_set_font (editor, font_tag); + gtk_label_set_text (GTK_LABEL (editor->size_label), "---"); + if (baseline_differs) gtk_entry_set_text (GTK_ENTRY (editor->baseline_spinbutton), ""); else @@ -809,8 +811,6 @@ gimp_text_style_editor_update_idle (GimpTextStyleEditor *editor) gtk_entry_set_text (GTK_ENTRY (editor->kerning_spinbutton), ""); else gimp_text_style_editor_set_kerning (editor, kerning); - - gtk_label_set_text (GTK_LABEL (editor->size_label), "---"); } else { @@ -845,6 +845,10 @@ gimp_text_style_editor_update_idle (GimpTextStyleEditor *editor) if (! list) gimp_text_style_editor_set_font (editor, NULL); + str = g_strdup_printf ("%0.2f", editor->resolution_y); + gtk_label_set_text (GTK_LABEL (editor->size_label), str); + g_free (str); + for (list = editor->toggles; list; list = g_list_next (list)) { GtkToggleButton *toggle = list->data; @@ -863,10 +867,6 @@ gimp_text_style_editor_update_idle (GimpTextStyleEditor *editor) gimp_text_buffer_get_iter_kerning (editor->buffer, &cursor, &value); gimp_text_style_editor_set_kerning (editor, value); - str = g_strdup_printf ("%0.2f", editor->resolution_y); - gtk_label_set_text (GTK_LABEL (editor->size_label), str); - g_free (str); - g_slist_free (tags); g_slist_free (tags_on); g_slist_free (tags_off);