diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-06-08 17:41:58 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-06-08 17:41:58 +0000 |
| commit | 8175bfe7ebbdd885cfdab857783aa2e5f7c136e4 (patch) | |
| tree | 7d358946ca78f9fd242aeed26c44a1fbb2e47982 /pango/pangocairo-context.c | |
| parent | 1fb9e50c73bb8c6389c7eaa9adb2eee13642d2ff (diff) | |
| parent | 4d8e71471984fb0fc147d1a64695ad5f18576fde (diff) | |
| download | pango-8175bfe7ebbdd885cfdab857783aa2e5f7c136e4.tar.gz | |
Merge branch 'wip/baedert/for-master2' into 'master'
Wip/baedert/for master2
See merge request GNOME/pango!190
Diffstat (limited to 'pango/pangocairo-context.c')
| -rw-r--r-- | pango/pangocairo-context.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pango/pangocairo-context.c b/pango/pangocairo-context.c index d2e66c4b..1b8bfbba 100644 --- a/pango/pangocairo-context.c +++ b/pango/pangocairo-context.c @@ -242,7 +242,15 @@ pango_cairo_context_set_font_options (PangoContext *context, g_return_if_fail (PANGO_IS_CONTEXT (context)); - info = get_context_info (context, TRUE); + info = get_context_info (context, TRUE); + + if (!info->set_options && !options) + return; + + if (info->set_options && + options && + cairo_font_options_equal (info->set_options, options)) + return; if (info->set_options || options) pango_context_changed (context); |