diff --git a/pango/pango-layout-private.h b/pango/pango-layout-private.h index a03364fceb5055f634f193fca94d2695f77e26cf..74c361267147d4aaa04ee977575ccecfe00d2650 100644 --- a/pango/pango-layout-private.h +++ b/pango/pango-layout-private.h @@ -66,7 +66,6 @@ struct _PangoLayout guint is_wrapped : 1; /* Whether the layout has any wrapped lines */ guint ellipsize : 2; /* PangoEllipsizeMode */ guint is_ellipsized : 1; /* Whether the layout has any ellipsized lines */ - guint is_truncated: 1; /* Whether the layout has any omitted lines due to height */ int unknown_glyphs_count; /* number of unknown glyphs */ /* some caching */ diff --git a/pango/pango-layout.c b/pango/pango-layout.c index 177c10ea956ef287687b0ccf74232bd751c63315..c9c7210a02eb05343756fd6164c7bb3c9cbab6d2 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -236,7 +236,6 @@ pango_layout_init (PangoLayout *layout) layout->is_wrapped = FALSE; layout->ellipsize = PANGO_ELLIPSIZE_NONE; layout->is_ellipsized = FALSE; - layout->is_truncated = FALSE; } static void @@ -444,7 +443,7 @@ pango_layout_set_height (PangoLayout *layout, * Bug 549003 */ if (layout->ellipsize != PANGO_ELLIPSIZE_NONE && - !(layout->lines && !layout->is_ellipsized && !layout->is_truncated && + !(layout->lines && layout->is_ellipsized == FALSE && height < 0 && layout->line_count <= (guint) -height)) layout_changed (layout); } @@ -1205,27 +1204,6 @@ pango_layout_is_ellipsized (PangoLayout *layout) return layout->is_ellipsized; } -/** - * pango_layout_is_truncated: - * @layout: a `PangoLayout` - * - * Queries whether the layout does not show all content because of - * height limitations. - * - * Returns: true if any paragraphs have been omitted due to height - * - * Since: 1.56 - */ -gboolean -pango_layout_is_truncated (PangoLayout *layout) -{ - g_return_val_if_fail (layout != NULL, FALSE); - - pango_layout_check_lines (layout); - - return layout->is_truncated; -} - /** * pango_layout_set_text: * @layout: a `PangoLayout` @@ -3270,7 +3248,6 @@ pango_layout_clear_lines (PangoLayout *layout) layout->logical_rect_cached = FALSE; layout->ink_rect_cached = FALSE; layout->is_ellipsized = FALSE; - layout->is_truncated = FALSE; layout->is_wrapped = FALSE; } @@ -3930,7 +3907,7 @@ find_break_extra_width (PangoLayout *layout, return 0; } -#if 1 +#if 0 # define DEBUG debug static int pango_layout_line_get_width (PangoLayoutLine *line); static void @@ -4988,11 +4965,7 @@ pango_layout_check_lines (PangoLayout *layout) } if (layout->height >= 0 && state.remaining_height < state.line_height) - { - done = TRUE; - if (end < (layout->text + layout->length)) - layout->is_truncated = TRUE; - } + done = TRUE; if (!done) start_offset += pango_utf8_strlen (start, (end - start) + delim_len); diff --git a/pango/pango-layout.h b/pango/pango-layout.h index 7ef716683f59f69fc77e4c8f81ad836d2b811003..ab6d443e3822e19d2bfee7dae39cd5502db23024 100644 --- a/pango/pango-layout.h +++ b/pango/pango-layout.h @@ -270,8 +270,6 @@ PANGO_AVAILABLE_IN_1_6 PangoEllipsizeMode pango_layout_get_ellipsize (PangoLayout *layout); PANGO_AVAILABLE_IN_1_16 gboolean pango_layout_is_ellipsized (PangoLayout *layout); -PANGO_AVAILABLE_IN_1_56 -gboolean pango_layout_is_truncated (PangoLayout *layout); PANGO_AVAILABLE_IN_1_16 int pango_layout_get_unknown_glyphs_count (PangoLayout *layout);