kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1. fix scalecache to actually respect env vars set! 

2. fix textblock cursor stuff in corner case.



SVN revision: 40617
This commit is contained in:
Carsten Haitzler 2009-05-13 12:20:14 +00:00
parent 84afbb853e
commit c830f68a06
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
legacy/evas/src/lib/canvas/evas_object_textblock.c
View File

@ -2259,12 +2259,22 @@ _find_layout_item_line_match(Evas_Object *obj, Evas_Object_Textblock_Node *n, in
{
Evas_Object_Textblock_Format_Item *fit;
Evas_Object_Textblock_Item *it;
Evas_Object_Textblock_Line *lnn;
lnn = (Evas_Object_Textblock_Line *)(((Eina_Inlist *)ln)->next);
EINA_INLIST_FOREACH(ln->items, it)
{
if (it->source_node == n)
{
if ((int)(it->source_pos + strlen(it->text)) >= pos)
Evas_Object_Textblock_Item *itn;
int p;
itn = (Evas_Object_Textblock_Item *)(((Eina_Inlist *)it)->next);
p = (int)(it->source_pos + strlen(it->text));
if ((p > pos) ||
((p == pos) && (!lnn) &&
((!itn) |
((itn) && (itn->source_node != n)))))
{
*lnr = ln;
*itr = it;

13
legacy/evas/src/lib/engines/common/evas_image_scalecache.c
View File

@ -197,7 +197,7 @@ _sci_find(RGBA_Image *im,
{
Eina_List *l;
Scaleitem *sci;
EINA_LIST_FOREACH(im->cache.list, l, sci)
{
if (
@ -236,9 +236,14 @@ _sci_find(RGBA_Image *im,
// printf(" 1- %i\n", sci->dst_w * sci->dst_h * 4);
cache_list = eina_inlist_remove(cache_list, (Eina_Inlist *)sci);
}
if (max_scale_items < 1) return NULL;
}
else
{
if (max_scale_items < 1) return NULL;
if (eina_list_count(im->cache.list) > (max_scale_items - 1))
return NULL;
sci = malloc(sizeof(Scaleitem));
memset(sci, 0, sizeof(Eina_Inlist));
sci->parent_im = im;
@ -376,6 +381,12 @@ evas_common_rgba_image_scalecache_prepare(Image_Entry *ie, RGBA_Image *dst,
sci = _sci_find(im, dc, smooth,
src_region_x, src_region_y, src_region_w, src_region_h,
dst_region_w, dst_region_h);
if (!sci)
{
LKU(cache_lock);
LKU(im->cache.lock);
return;
}
// printf("%10i | %4i %4i %4ix%4i -> %4i %4i %4ix%4i | %i\n",
// (int)use_counter,
// src_region_x, src_region_y, src_region_w, src_region_h,