diff options
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/pango-context.c | 9 | ||||
| -rw-r--r-- | pango/pango-gravity.c | 18 |
2 files changed, 12 insertions, 15 deletions
diff --git a/pango/pango-context.c b/pango/pango-context.c index ac59f3d8..4f15dd61 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -1031,6 +1031,11 @@ itemize_state_init (ItemizeState *state, state->embedding_end = text + start_index; update_embedding_end (state); + state->gravity = PANGO_GRAVITY_AUTO; + state->centered_baseline = PANGO_GRAVITY_IS_VERTICAL (state->context->resolved_gravity); + state->gravity_hint = state->context->gravity_hint; + state->resolved_gravity = PANGO_GRAVITY_AUTO; + /* Initialize the attribute iterator */ if (cached_iter) @@ -1088,10 +1093,6 @@ itemize_state_init (ItemizeState *state, else state->font_desc_gravity = PANGO_GRAVITY_AUTO; - state->gravity = PANGO_GRAVITY_AUTO; - state->centered_baseline = PANGO_GRAVITY_IS_VERTICAL (state->context->resolved_gravity); - state->gravity_hint = state->context->gravity_hint; - state->resolved_gravity = PANGO_GRAVITY_AUTO; state->derived_lang = NULL; state->current_fonts = NULL; state->cache = NULL; diff --git a/pango/pango-gravity.c b/pango/pango-gravity.c index 30e99eb0..0eb3cfe2 100644 --- a/pango/pango-gravity.c +++ b/pango/pango-gravity.c @@ -362,16 +362,13 @@ get_script_properties (PangoScript script) */ PangoGravity pango_gravity_get_for_script (PangoScript script, - PangoGravity base_gravity, - PangoGravityHint hint) + PangoGravity base_gravity, + PangoGravityHint hint) { PangoScriptProperties props = get_script_properties (script); - if (G_UNLIKELY (base_gravity == PANGO_GRAVITY_AUTO)) - base_gravity = props.preferred_gravity; - return pango_gravity_get_for_script_and_width (script, props.wide, - base_gravity, hint); + base_gravity, hint); } /** @@ -403,15 +400,14 @@ pango_gravity_get_for_script (PangoScript script, * Since: 1.26 */ PangoGravity -pango_gravity_get_for_script_and_width (PangoScript script, - gboolean wide, - PangoGravity base_gravity, - PangoGravityHint hint) +pango_gravity_get_for_script_and_width (PangoScript script, + gboolean wide, + PangoGravity base_gravity, + PangoGravityHint hint) { PangoScriptProperties props = get_script_properties (script); gboolean vertical; - if (G_UNLIKELY (base_gravity == PANGO_GRAVITY_AUTO)) base_gravity = props.preferred_gravity; |