AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GtkLabel: Make it possible to get the ellipsis range

Browse Source 
This will be used in the next commit to expand the selection.
This commit is contained in:
Matthias Clasen 2014-09-03 21:39:34 -04:00
parent 1cddd14ab4
commit fc5f7cc138
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gtk/gtklabel.c
View File

@ -4562,9 +4562,11 @@ get_layout_index (GtkLabel *label,
} }
static gboolean static gboolean
range_is_in_ellipsis (GtkLabel *label, range_is_in_ellipsis_full (GtkLabel *label,
gint start, gint range_start,
gint end) gint range_end,
gint *ellipsis_start,
gint *ellipsis_end)
{ {
GtkLabelPrivate *priv = label->priv; GtkLabelPrivate *priv = label->priv;
PangoLayoutIter *iter; PangoLayoutIter *iter;
@ -4592,13 +4594,19 @@ range_is_in_ellipsis (GtkLabel *label,
item = ((PangoGlyphItem*)run)->item; item = ((PangoGlyphItem*)run)->item;
if (item->offset <= start && end <= item->offset + item->length) if (item->offset <= range_start && range_end <= item->offset + item->length)
{ {
if (item->analysis.flags & PANGO_ANALYSIS_FLAG_IS_ELLIPSIS) if (item->analysis.flags & PANGO_ANALYSIS_FLAG_IS_ELLIPSIS)
in_ellipsis = TRUE; {
if (ellipsis_start)
*ellipsis_start = item->offset;
if (ellipsis_end)
*ellipsis_end = item->offset + item->length;
in_ellipsis = TRUE;
}
break; break;
} }
else if (item->offset + item->length >= end) else if (item->offset + item->length >= range_end)
break; break;
} }
} while (pango_layout_iter_next_run (iter)); } while (pango_layout_iter_next_run (iter));
@ -4608,6 +4616,14 @@ range_is_in_ellipsis (GtkLabel *label,
return in_ellipsis; return in_ellipsis;
} }
static gboolean
range_is_in_ellipsis (GtkLabel *label,
gint range_start,
gint range_end)
{
return range_is_in_ellipsis_full (label, range_start, range_end, NULL, NULL);
}
static void static void
gtk_label_select_word (GtkLabel *label) gtk_label_select_word (GtkLabel *label)
{ {