Commit 0276505b authored by Christian Persch's avatar Christian Persch

widget: Remove antialias arg from vte_terminal_set_font_full_internal

https://bugzilla.gnome.org/show_bug.cgi?id=561366
parent 12aa33c8
......@@ -133,8 +133,7 @@ static void remove_update_timeout (VteTerminal *terminal);
static void reset_update_regions (VteTerminal *terminal);
static void vte_terminal_set_cursor_blinks_internal(VteTerminal *terminal, gboolean blink);
static void vte_terminal_set_font_full_internal(VteTerminal *terminal,
const PangoFontDescription *font_desc,
VteTerminalAntiAlias antialias);
const PangoFontDescription *font_desc);
static void _vte_check_cursor_blink(VteTerminal *terminal);
static gboolean process_timeout (gpointer data);
......@@ -4613,9 +4612,7 @@ vte_terminal_style_updated (GtkWidget *widget)
if (style_updated)
style_updated (widget);
vte_terminal_set_font_full_internal(terminal, terminal->pvt->fontdesc,
terminal->pvt->fontantialias);
vte_terminal_set_font_full_internal(terminal, terminal->pvt->fontdesc);
vte_terminal_set_inner_border(terminal);
gtk_widget_style_get(widget, "cursor-aspect-ratio", &aspect, NULL);
......@@ -7413,8 +7410,7 @@ vte_terminal_ensure_font (VteTerminal *terminal)
/* Load default fonts, if no fonts have been loaded. */
if (!terminal->pvt->has_fonts) {
vte_terminal_set_font_full_internal(terminal,
terminal->pvt->fontdesc,
terminal->pvt->fontantialias);
terminal->pvt->fontdesc);
}
if (terminal->pvt->fontdirty) {
gint width, height, ascent;
......@@ -7452,13 +7448,12 @@ vte_terminal_set_font_full(VteTerminal *terminal,
const PangoFontDescription *font_desc,
VteTerminalAntiAlias antialias)
{
vte_terminal_set_font_full_internal(terminal, font_desc, antialias);
vte_terminal_set_font_full_internal(terminal, font_desc);
}
static void
vte_terminal_set_font_full_internal(VteTerminal *terminal,
const PangoFontDescription *font_desc,
VteTerminalAntiAlias antialias)
const PangoFontDescription *font_desc)
{
GObject *object;
GtkStyle *style;
......@@ -7506,7 +7501,6 @@ vte_terminal_set_font_full_internal(VteTerminal *terminal,
pango_font_description_free(terminal->pvt->fontdesc);
}
pvt->fontdesc = desc;
pvt->fontantialias = antialias;
pvt->fontdirty = TRUE;
pvt->has_fonts = TRUE;
......@@ -7537,8 +7531,7 @@ vte_terminal_set_font(VteTerminal *terminal,
const PangoFontDescription *font_desc)
{
g_return_if_fail(VTE_IS_TERMINAL(terminal));
vte_terminal_set_font_full_internal(terminal, font_desc,
VTE_ANTI_ALIAS_USE_DEFAULT);
vte_terminal_set_font_full_internal(terminal, font_desc);
}
static void
......@@ -7551,7 +7544,7 @@ vte_terminal_set_font_from_string_full_internal(VteTerminal *terminal,
if (name)
font_desc = pango_font_description_from_string(name);
vte_terminal_set_font_full_internal(terminal, font_desc, antialias);
vte_terminal_set_font_full_internal(terminal, font_desc);
pango_font_description_free(font_desc);
}
......@@ -10979,7 +10972,7 @@ vte_terminal_set_property (GObject *object,
vte_terminal_set_encoding (terminal, g_value_get_string (value));
break;
case PROP_FONT_DESC:
vte_terminal_set_font_full_internal (terminal, g_value_get_boxed (value), pvt->fontantialias);
vte_terminal_set_font_full_internal (terminal, g_value_get_boxed (value));
break;
case PROP_MOUSE_POINTER_AUTOHIDE:
vte_terminal_set_mouse_autohide (terminal, g_value_get_boolean (value));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment