enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

fix new textgrid to actually handle updates right.. well for now. 

SVN revision: 72191
This commit is contained in:
Carsten Haitzler 2012-06-15 13:59:10 +00:00
parent 02ededc16a
commit 824f7172da
1 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
legacy/evas/src/lib/canvas/evas_object_textgrid.c
View File

@ -227,8 +227,8 @@ evas_object_textgrid_render(Evas_Object *obj, void *output, void *context, void
Evas_Script_Type script; Evas_Script_Type script;
int run_len; int run_len;
printf("cell %dx%d: %c\n", j, i, (char)cells->codepoint); // if (cells->codepoint)
if (!cells->codepoint) continue; // printf("cell %dx%d: [%i] %c\n", j, i, cells->codepoint, (char)cells->codepoint);
/* background */ /* background */
if (cells->bg_extended) if (cells->bg_extended)
@ -240,15 +240,19 @@ evas_object_textgrid_render(Evas_Object *obj, void *output, void *context, void
if (!c) if (!c)
continue; continue;
TG_ENFN->context_color_set(output, context, c->r, c->g, c->b, c->a); if (c->a > 0)
TG_ENFN->rectangle_draw(output, {
context, TG_ENFN->context_color_set(output, context, c->r, c->g, c->b, c->a);
surface, TG_ENFN->rectangle_draw(output,
obj->cur.geometry.x + x + j * o->cur.char_width, context,
obj->cur.geometry.y + y + i * o->cur.char_height, surface,
o->cur.char_width, obj->cur.geometry.x + x + j * o->cur.char_width,
o->cur.char_height); obj->cur.geometry.y + y + i * o->cur.char_height,
o->cur.char_width,
o->cur.char_height);
}
if (!cells->codepoint) continue;
/* foreground */ /* foreground */
if (cells->fg_extended) if (cells->fg_extended)
palette = o->cur.palette_extended; palette = o->cur.palette_extended;
@ -258,7 +262,8 @@ evas_object_textgrid_render(Evas_Object *obj, void *output, void *context, void
c = eina_array_data_get(palette, cells->fg); c = eina_array_data_get(palette, cells->fg);
if (!c) if (!c)
continue; continue;
if (c->a == 0) continue;
/* FIXME: manage attributes */ /* FIXME: manage attributes */
script = evas_common_language_script_type_get((const Eina_Unicode *)&cells->codepoint, 1); script = evas_common_language_script_type_get((const Eina_Unicode *)&cells->codepoint, 1);
run_len = TG_ENFN->font_run_end_get(TG_ENDT, run_len = TG_ENFN->font_run_end_get(TG_ENDT,
@ -421,6 +426,10 @@ evas_object_textgrid_render_pre(Evas_Object *obj)
if (o->changed) if (o->changed)
{ {
evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, obj);
goto done;
}
/*
Evas_Textgrid_Cell *cell_cur; Evas_Textgrid_Cell *cell_cur;
Evas_Textgrid_Cell *cell_prev; Evas_Textgrid_Cell *cell_prev;
unsigned int i; unsigned int i;
@ -438,7 +447,7 @@ evas_object_textgrid_render_pre(Evas_Object *obj)
obj); obj);
goto done; goto done;
} }
/* if it changed palettes */ // if it changed palettes
if (eina_array_count(o->cur.palette_standard) != eina_array_count(o->prev.palette_standard)) if (eina_array_count(o->cur.palette_standard) != eina_array_count(o->prev.palette_standard))
{ {
evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, obj); evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, obj);
@ -482,7 +491,7 @@ evas_object_textgrid_render_pre(Evas_Object *obj)
} }
} }
/* if it changed a cell */ // if it changed a cell
for (i = 0, cell_cur = o->cur.cells, cell_prev = o->prev.cells; i < o->cur.nbr_lines; i++) for (i = 0, cell_cur = o->cur.cells, cell_prev = o->prev.cells; i < o->cur.nbr_lines; i++)
for (j = 0; j < o->cur.nbr_columns; j++, cell_cur++, cell_prev++) for (j = 0; j < o->cur.nbr_columns; j++, cell_cur++, cell_prev++)
{ {
@ -501,6 +510,7 @@ evas_object_textgrid_render_pre(Evas_Object *obj)
} }
} }
} }
*/
done: done:
evas_object_render_pre_effect_updates(&obj->layer->evas->clip_changes, obj, is_v, was_v); evas_object_render_pre_effect_updates(&obj->layer->evas->clip_changes, obj, is_v, was_v);
} }
@ -676,6 +686,7 @@ evas_object_textgrid_font_source_set(Evas_Object *obj, const char *font_source)
eina_stringshare_replace(&o->cur.font_source, font_source); eina_stringshare_replace(&o->cur.font_source, font_source);
o->changed = 1; o->changed = 1;
evas_object_change(obj);
} }
EAPI const char * EAPI const char *
@ -757,7 +768,7 @@ evas_object_textgrid_font_set(Evas_Object *obj, const char *font_name, Evas_Font
Evas_Script_Type script; Evas_Script_Type script;
int run_len; int run_len;
script = evas_common_language_script_type_get((const Eina_Unicode *)&W, 1); script = evas_common_language_script_type_get((const Eina_Unicode *)W, 1);
run_len = TG_ENFN->font_run_end_get(TG_ENDT, run_len = TG_ENFN->font_run_end_get(TG_ENDT,
o->font, o->font,
&script_fi, &cur_fi, &script_fi, &cur_fi,
@ -814,6 +825,7 @@ evas_object_textgrid_font_set(Evas_Object *obj, const char *font_name, Evas_Font
} }
evas_object_inform_call_resize(obj); evas_object_inform_call_resize(obj);
o->changed = 1; o->changed = 1;
evas_object_change(obj);
} }
EAPI void EAPI void
@ -945,6 +957,7 @@ evas_object_textgrid_palette_set(Evas_Object *obj, Evas_Textgrid_Palette pal, in
eina_array_push(palette, color); eina_array_push(palette, color);
} }
o->changed = 1; o->changed = 1;
evas_object_change(obj);
} }
EAPI void EAPI void
@ -1014,6 +1027,7 @@ evas_object_textgrid_supported_font_styles_set(Evas_Object *obj, Evas_Textgrid_F
/* FIXME: to do */ /* FIXME: to do */
o->changed = 1; o->changed = 1;
evas_object_change(obj);
} }
EAPI Evas_Textgrid_Font_Style EAPI Evas_Textgrid_Font_Style
@ -1051,8 +1065,9 @@ evas_object_textgrid_cellrow_set(Evas_Object *obj, int y, const Evas_Textgrid_Ce
if ((y < 0) || (y >= o->cur.nbr_lines)) if ((y < 0) || (y >= o->cur.nbr_lines))
return; return;
memcpy(o->cur.cells + y * o->cur.nbr_columns, row, o->cur.nbr_columns * sizeof(Evas_Textgrid_Cell)); // memcpy(o->cur.cells + y * o->cur.nbr_columns, row, o->cur.nbr_columns * sizeof(Evas_Textgrid_Cell));
o->changed = 1; o->changed = 1;
evas_object_change(obj);
} }
EAPI Evas_Textgrid_Cell * EAPI Evas_Textgrid_Cell *