callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sort returned tags array by tags priority (#497102).

Browse Source 
2007-11-15  Yevgen Muntyan  <muntyan@tamu.edu>

	* gtk/gtktextbtree.c (_gtk_text_btree_get_tags): sort returned
	tags array by tags priority (#497102).
	* gtk/gtktextiter.c (gtk_text_iter_get_tags), (gtk_text_iter_get_attributes):
	* gtk/gtktextlayout.c (get_tags_array_at_iter): and do not sort it here.


svn path=/trunk/; revision=18995
This commit is contained in:
Yevgen Muntyan
2007-11-15 17:00:33 +00:00
committed by Yevgen Muntyan
parent a3eb6a98d7
commit 921da326f5
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-11-15 Yevgen Muntyan <muntyan@tamu.edu>
* gtk/gtktextbtree.c (_gtk_text_btree_get_tags): sort returned
tags array by tags priority (#497102).
* gtk/gtktextiter.c (gtk_text_iter_get_tags), (gtk_text_iter_get_attributes):
* gtk/gtktextlayout.c (get_tags_array_at_iter): and do not sort it here.
2007-11-15 Yevgen Muntyan <muntyan@tamu.edu> 2007-11-15 Yevgen Muntyan <muntyan@tamu.edu>
* gtk/gtktextlayout.c: (gtk_text_layout_get_line_display), * gtk/gtktextlayout.c: (gtk_text_layout_get_line_display),

6
gtk/gtktextbtree.c
View File

@ -2196,6 +2196,8 @@ _gtk_text_btree_get_line_at_char (GtkTextBTree *tree,
return line; return line;
} }
/* It returns an array sorted by tags priority, ready to pass to
* _gtk_text_attributes_fill_from_tags() */
GtkTextTag** GtkTextTag**
_gtk_text_btree_get_tags (const GtkTextIter *iter, _gtk_text_btree_get_tags (const GtkTextIter *iter,
gint *num_tags) gint *num_tags)
@ -2304,6 +2306,10 @@ _gtk_text_btree_get_tags (const GtkTextIter *iter,
g_free (tagInfo.tags); g_free (tagInfo.tags);
return NULL; return NULL;
} }
/* Sort tags in ascending order of priority */
_gtk_text_tag_array_sort (tagInfo.tags, dst);
return tagInfo.tags; return tagInfo.tags;
} }

6
gtk/gtktextiter.c
View File

@ -1331,9 +1331,6 @@ gtk_text_iter_get_tags (const GtkTextIter *iter)
return NULL; return NULL;
} }
/* Sort tags in ascending order of priority */
_gtk_text_tag_array_sort (tags, tag_count);
retval = NULL; retval = NULL;
i = 0; i = 0;
while (i < tag_count) while (i < tag_count)
@ -1748,9 +1745,6 @@ gtk_text_iter_get_attributes (const GtkTextIter *iter,
return FALSE; return FALSE;
} }
/* Sort tags in ascending order of priority */
_gtk_text_tag_array_sort (tags, tag_count);
_gtk_text_attributes_fill_from_tags (values, _gtk_text_attributes_fill_from_tags (values,
tags, tags,
tag_count); tag_count);

2
gtk/gtktextlayout.c
View File

@ -2072,8 +2072,6 @@ get_tags_array_at_iter (GtkTextIter *iter)
if (n_tags > 0) if (n_tags > 0)
{ {
/* Sort tags in ascending order of priority */
_gtk_text_tag_array_sort (tags, n_tags);
array = g_ptr_array_sized_new (n_tags); array = g_ptr_array_sized_new (n_tags);
g_ptr_array_set_size (array, n_tags); g_ptr_array_set_size (array, n_tags);
memcpy (array->pdata, tags, n_tags * sizeof (GtkTextTag*)); memcpy (array->pdata, tags, n_tags * sizeof (GtkTextTag*));