mirror of https://github.com/GNOME/gimp.git
app: move code for font entry and "size" label together
This commit is contained in:
parent
1010b497c2
commit
e003213784
|
@ -800,6 +800,8 @@ gimp_text_style_editor_update_idle (GimpTextStyleEditor *editor)
|
||||||
|
|
||||||
gimp_text_style_editor_set_font (editor, font_tag);
|
gimp_text_style_editor_set_font (editor, font_tag);
|
||||||
|
|
||||||
|
gtk_label_set_text (GTK_LABEL (editor->size_label), "---");
|
||||||
|
|
||||||
if (baseline_differs)
|
if (baseline_differs)
|
||||||
gtk_entry_set_text (GTK_ENTRY (editor->baseline_spinbutton), "");
|
gtk_entry_set_text (GTK_ENTRY (editor->baseline_spinbutton), "");
|
||||||
else
|
else
|
||||||
|
@ -809,8 +811,6 @@ gimp_text_style_editor_update_idle (GimpTextStyleEditor *editor)
|
||||||
gtk_entry_set_text (GTK_ENTRY (editor->kerning_spinbutton), "");
|
gtk_entry_set_text (GTK_ENTRY (editor->kerning_spinbutton), "");
|
||||||
else
|
else
|
||||||
gimp_text_style_editor_set_kerning (editor, kerning);
|
gimp_text_style_editor_set_kerning (editor, kerning);
|
||||||
|
|
||||||
gtk_label_set_text (GTK_LABEL (editor->size_label), "---");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -845,6 +845,10 @@ gimp_text_style_editor_update_idle (GimpTextStyleEditor *editor)
|
||||||
if (! list)
|
if (! list)
|
||||||
gimp_text_style_editor_set_font (editor, NULL);
|
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))
|
for (list = editor->toggles; list; list = g_list_next (list))
|
||||||
{
|
{
|
||||||
GtkToggleButton *toggle = list->data;
|
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_buffer_get_iter_kerning (editor->buffer, &cursor, &value);
|
||||||
gimp_text_style_editor_set_kerning (editor, 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);
|
||||||
g_slist_free (tags_on);
|
g_slist_free (tags_on);
|
||||||
g_slist_free (tags_off);
|
g_slist_free (tags_off);
|
||||||
|
|
Loading…
Reference in New Issue