diff options
Diffstat (limited to 'tests/test-ellipsize.c')
| -rw-r--r-- | tests/test-ellipsize.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/tests/test-ellipsize.c b/tests/test-ellipsize.c index d0fe2dec..f68d9baf 100644 --- a/tests/test-ellipsize.c +++ b/tests/test-ellipsize.c @@ -31,26 +31,26 @@ static PangoContext *context; static void test_ellipsize_height (void) { - PangoSimpleLayout *layout; + PangoLayout *layout; int height1, height2; PangoFontDescription *desc; - layout = pango_simple_layout_new (context); + layout = pango_layout_new (context); desc = pango_font_description_from_string ("Fixed 7"); //pango_layout_set_font_description (layout, desc); pango_font_description_free (desc); - pango_simple_layout_set_text (layout, "some text that should be ellipsized", -1); - g_assert_cmpint (pango_lines_get_line_count (pango_simple_layout_get_lines (layout)), ==, 1); - pango_lines_get_size (pango_simple_layout_get_lines (layout), NULL, &height1); + pango_layout_set_text (layout, "some text that should be ellipsized", -1); + g_assert_cmpint (pango_lines_get_line_count (pango_layout_get_lines (layout)), ==, 1); + pango_lines_get_size (pango_layout_get_lines (layout), NULL, &height1); - pango_simple_layout_set_width (layout, 100 * PANGO_SCALE); - pango_simple_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END); + pango_layout_set_width (layout, 100 * PANGO_SCALE); + pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END); - g_assert_cmpint (pango_lines_get_line_count (pango_simple_layout_get_lines (layout)), ==, 1); - g_assert_true (pango_lines_ellipsized (pango_simple_layout_get_lines (layout))); - pango_lines_get_size (pango_simple_layout_get_lines (layout), NULL, &height2); + g_assert_cmpint (pango_lines_get_line_count (pango_layout_get_lines (layout)), ==, 1); + g_assert_true (pango_lines_ellipsized (pango_layout_get_lines (layout))); + pango_lines_get_size (pango_layout_get_lines (layout), NULL, &height2); g_assert_cmpint (height1, ==, height2); @@ -62,18 +62,18 @@ test_ellipsize_height (void) static void test_ellipsize_crash (void) { - PangoSimpleLayout *layout; + PangoLayout *layout; - layout = pango_simple_layout_new (context); + layout = pango_layout_new (context); - pango_simple_layout_set_text (layout, "some text that should be ellipsized", -1); - g_assert_cmpint (pango_lines_get_line_count (pango_simple_layout_get_lines (layout)), ==, 1); + pango_layout_set_text (layout, "some text that should be ellipsized", -1); + g_assert_cmpint (pango_lines_get_line_count (pango_layout_get_lines (layout)), ==, 1); - pango_simple_layout_set_width (layout, 100 * PANGO_SCALE); - pango_simple_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END); + pango_layout_set_width (layout, 100 * PANGO_SCALE); + pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END); - g_assert_cmpint (pango_lines_get_line_count (pango_simple_layout_get_lines (layout)), ==, 1); - g_assert_true (pango_lines_ellipsized (pango_simple_layout_get_lines (layout))); + g_assert_cmpint (pango_lines_get_line_count (pango_layout_get_lines (layout)), ==, 1); + g_assert_true (pango_lines_ellipsized (pango_layout_get_lines (layout))); g_object_unref (layout); } @@ -84,21 +84,21 @@ test_ellipsize_crash (void) static void test_ellipsize_fully (void) { - PangoSimpleLayout *layout; + PangoLayout *layout; PangoRectangle ink, logical; PangoRectangle ink2, logical2; - layout = pango_simple_layout_new (context); + layout = pango_layout_new (context); - pango_simple_layout_set_text (layout, "…", -1); - pango_lines_get_extents (pango_simple_layout_get_lines (layout), &ink, &logical); + pango_layout_set_text (layout, "…", -1); + pango_lines_get_extents (pango_layout_get_lines (layout), &ink, &logical); - pango_simple_layout_set_text (layout, "ellipsized", -1); + pango_layout_set_text (layout, "ellipsized", -1); - pango_simple_layout_set_width (layout, 10 * PANGO_SCALE); - pango_simple_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END); + pango_layout_set_width (layout, 10 * PANGO_SCALE); + pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END); - pango_lines_get_extents (pango_simple_layout_get_lines (layout), &ink2, &logical2); + pango_lines_get_extents (pango_layout_get_lines (layout), &ink2, &logical2); g_assert_cmpint (ink.width, ==, ink2.width); g_assert_cmpint (logical.width, ==, logical2.width); |