summaryrefslogtreecommitdiff
path: root/pango/pango-layout.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2019-08-19 23:53:35 +0200
committerMatthias Clasen <mclasen@redhat.com>2019-10-31 21:23:59 -0400
commit215b1ed9b72fe5b1c55b42bf0440bf1ba045cf84 (patch)
tree741881181c7f288d135ab38a67e5bc40974e9452 /pango/pango-layout.c
parent58cb52a561c689c9b58ccb9b08eff1e6cec32bfd (diff)
downloadpango-215b1ed9b72fe5b1c55b42bf0440bf1ba045cf84.tar.gz
layout: Handle new underline values
Diffstat (limited to 'pango/pango-layout.c')
-rw-r--r--pango/pango-layout.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 898a6a1c..d598680e 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -4978,6 +4978,7 @@ pango_layout_run_get_extents_and_height (PangoLayoutRun *run,
}
}
+<<<<<<< HEAD
if (properties.uline_low)
run_ink->height += 2 * underline_thickness;
if (properties.uline_single)
@@ -5873,15 +5874,18 @@ pango_layout_get_item_properties (PangoItem *item,
case PANGO_UNDERLINE_NONE:
break;
case PANGO_UNDERLINE_SINGLE:
+ case PANGO_UNDERLINE_SINGLE_LINE:
properties->uline_single = TRUE;
break;
case PANGO_UNDERLINE_DOUBLE:
+ case PANGO_UNDERLINE_DOUBLE_LINE:
properties->uline_double = TRUE;
break;
case PANGO_UNDERLINE_LOW:
properties->uline_low = TRUE;
break;
case PANGO_UNDERLINE_ERROR:
+ case PANGO_UNDERLINE_ERROR_LINE:
properties->uline_error = TRUE;
break;
default: