diff options
author | Matthias Clasen <mclasen@redhat.com> | 2021-08-02 05:49:23 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2021-08-02 05:49:23 +0000 |
commit | e2c1cdbec788875fe02d63d801ba022ee6d75db5 (patch) | |
tree | 17b032d705eeeb5ae527d91d0eda4d2bdf523356 /pango/pango-context.c | |
parent | fc9057e3a5b73dffb7761d00a9324ea8903a26bf (diff) | |
parent | 91687742f61d4b74572f3176fa3d8442438df504 (diff) | |
download | pango-e2c1cdbec788875fe02d63d801ba022ee6d75db5.tar.gz |
Merge branch 'gravity-fix' into 'main'
gravity: Remove redundant code
See merge request GNOME/pango!384
Diffstat (limited to 'pango/pango-context.c')
-rw-r--r-- | pango/pango-context.c | 9 |
1 files changed, 5 insertions, 4 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; |