Dear developers.
This patch adds evas_event_freeze and thaw to elm_{entry,label}.
Normally it's not speed up much.
But in some event storm cases, it's speed up to 10% in my test cases
(which is putting 200 entries in a box)
Thank you
Index: src/lib/elm_entry.c
===================================================================
--- src/lib/elm_entry.c (리ë¹ì 63245)
+++ src/lib/elm_entry.c (ìì
ì¬ë³¸)
@@ -445,6 +445,8 @@
Elm_Entry_Item_Provider *ip;
Elm_Entry_Text_Filter *tf;
+ evas_event_freeze(evas_object_evas_get(obj));
+
if (wd->file) eina_stringshare_del(wd->file);
if (wd->hovdeljob) ecore_job_del(wd->hovdeljob);
@@ -484,6 +486,9 @@
_filter_free(tf);
}
free(wd);
+
+ evas_event_thaw(evas_object_evas_get(obj));
+ evas_event_thaw_eval(evas_object_evas_get(obj));
}
static void
@@ -498,6 +503,8 @@
{
Widget_Data *wd = elm_widget_data_get(obj);
const char *t;
+
+ evas_event_freeze(evas_object_evas_get(obj));
_elm_widget_mirrored_reload(obj);
_mirrored_set(obj, elm_widget_mirrored_get(obj));
@@ -531,6 +538,8 @@
elm_widget_highlight_in_theme_set(obj, EINA_FALSE);
}
_sizing_eval(obj);
+ evas_event_thaw(evas_object_evas_get(obj));
+ evas_event_thaw_eval(evas_object_evas_get(obj));
}
static void
@@ -652,6 +661,7 @@
if (wd->linewrap)
{
if ((resw == wd->lastw) && (!wd->changed)) return;
+ evas_event_freeze(evas_object_evas_get(obj));
wd->changed = EINA_FALSE;
wd->lastw = resw;
if (wd->scroll)
@@ -685,10 +695,13 @@
if (wd->deferred_recalc_job)
ecore_job_del(wd->deferred_recalc_job);
wd->deferred_recalc_job = ecore_job_add(_elm_deferred_recalc_job,
obj);
}
+ evas_event_thaw(evas_object_evas_get(obj));
+ evas_event_thaw_eval(evas_object_evas_get(obj));
}
else
{
if (!wd->changed) return;
+ evas_event_freeze(evas_object_evas_get(obj));
wd->changed = EINA_FALSE;
wd->lastw = resw;
if (wd->scroll)
@@ -729,6 +742,8 @@
else
evas_object_size_hint_max_set(obj, -1, -1);
}
+ evas_event_thaw(evas_object_evas_get(obj));
+ evas_event_thaw_eval(evas_object_evas_get(obj));
}
_recalc_cursor_geometry(obj);
@@ -773,10 +788,13 @@
Widget_Data *wd = elm_widget_data_get(obj);
if ((!wd) || (!content)) return;
+ evas_event_freeze(evas_object_evas_get(obj));
elm_widget_sub_object_add(obj, content);
evas_object_event_callback_add(content, EVAS_CALLBACK_DEL, _content_del,
obj);
edje_object_part_swallow(wd->ent, part, content);
_sizing_eval(obj);
+ evas_event_thaw(evas_object_evas_get(obj));
+ evas_event_thaw_eval(evas_object_evas_get(obj));
}
static Evas_Object *
@@ -788,10 +806,13 @@
content = (Evas_Object *)edje_object_part_object_get(wd->ent, part);
if (!content) return NULL;
+ evas_event_freeze(evas_object_evas_get(obj));
elm_widget_sub_object_del(obj, content);
evas_object_event_callback_del(content, EVAS_CALLBACK_DEL, _content_del);
edje_object_part_unswallow(wd->ent, content);
_sizing_eval(obj);
+ evas_event_thaw(evas_object_evas_get(obj));
+ evas_event_thaw_eval(evas_object_evas_get(obj));
return content;
}
@@ -1323,6 +1344,7 @@
Widget_Data *wd = elm_widget_data_get(data);
Evas_Coord minh;
if (!wd) return;
+ evas_event_freeze(evas_object_evas_get(data));
wd->changed = EINA_TRUE;
/* Reset the size hints which are no more relevant.
* Keep the height, this is a hack, but doesn't really matter
@@ -1338,6 +1360,8 @@
ecore_timer_del(wd->delay_write);
wd->delay_write = NULL;
}
+ evas_event_thaw(evas_object_evas_get(data));
+ evas_event_thaw_eval(evas_object_evas_get(data));
if ((!wd->autosave) || (!wd->file)) return;
wd->delay_write = ecore_timer_add(2.0, _delay_write, data);
}
@@ -1815,6 +1839,7 @@
char backup;
Evas_Object *obj = (Evas_Object *) data;
Widget_Data *wd = elm_widget_data_get(obj);
+ evas_event_freeze(evas_object_evas_get(obj));
if (wd->text) eina_stringshare_del(wd->text);
wd->text = NULL;
wd->changed = EINA_TRUE;
@@ -1874,6 +1899,9 @@
wd->append_text_left[wd->append_text_position] = backup;
+ evas_event_thaw(evas_object_evas_get(obj));
+ evas_event_thaw_eval(evas_object_evas_get(obj));
+
/* If there's still more to go, renew the idler, else, cleanup */
if (wd->append_text_position < wd->append_text_len)
{
@@ -1964,6 +1992,7 @@
if (item && strcmp(item, "default")) return;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
+ evas_event_freeze(evas_object_evas_get(obj));
if (!entry) entry = "";
if (wd->text) eina_stringshare_del(wd->text);
wd->text = NULL;
@@ -1999,6 +2028,8 @@
{
edje_object_part_text_set(wd->ent, "elm.text", entry);
}
+ evas_event_thaw(evas_object_evas_get(obj));
+ evas_event_thaw_eval(evas_object_evas_get(obj));
}
static const char *
Index: src/lib/elm_label.c
===================================================================
--- src/lib/elm_label.c (리ë¹ì 63245)
+++ src/lib/elm_label.c (ìì
ì¬ë³¸)
@@ -41,6 +41,7 @@
Evas_Coord minw = -1, minh = -1;
Evas_Coord resw;
if (!wd) return;
+ evas_event_freeze(evas_object_evas_get(data));
wd->deferred_recalc_job = NULL;
evas_object_geometry_get(wd->lbl, NULL, NULL, &resw, NULL);
if (wd->wrap_w > resw)
@@ -62,6 +63,8 @@
if ((wd->ellipsis) && (wd->linewrap) && (wd->wrap_h > 0) &&
(_is_width_over(data) == 1))
_ellipsis_label_to_width(data);
+ evas_event_thaw(evas_object_evas_get(data));
+ evas_event_thaw_eval(evas_object_evas_get(data));
}
static void
@@ -69,10 +72,13 @@
{
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
+ evas_event_freeze(evas_object_evas_get(obj));
if (wd->deferred_recalc_job) ecore_job_del(wd->deferred_recalc_job);
if (wd->label) eina_stringshare_del(wd->label);
if (wd->bg) evas_object_del(wd->bg);
free(wd);
+ evas_event_thaw(evas_object_evas_get(obj));
+ evas_event_thaw_eval(evas_object_evas_get(obj));
}
static void
@@ -98,6 +104,7 @@
{
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
+ evas_event_freeze(evas_object_evas_get(obj));
_elm_widget_mirrored_reload(obj);
_mirrored_set(obj, elm_widget_mirrored_get(obj));
_theme_change(obj);
@@ -107,6 +114,8 @@
_elm_config->scale);
_label_sliding_change(obj);
_sizing_eval(obj);
+ evas_event_thaw(evas_object_evas_get(obj));
+ evas_event_thaw_eval(evas_object_evas_get(obj));
}
static void
@@ -130,6 +139,7 @@
}
else
{
+ evas_event_freeze(evas_object_evas_get(obj));
evas_object_geometry_get(wd->lbl, NULL, NULL, &resw, &resh);
edje_object_size_min_calc(wd->lbl, &minw, &minh);
if (wd->wrap_w > 0 && minw > wd->wrap_w) minw = wd->wrap_w;
@@ -138,6 +148,8 @@
evas_object_size_hint_max_set(obj, wd->wrap_w, wd->wrap_h);
if ((wd->ellipsis) && (_is_width_over(obj) == 1))
_ellipsis_label_to_width(obj);
+ evas_event_thaw(evas_object_evas_get(obj));
+ evas_event_thaw_eval(evas_object_evas_get(obj));
}
}
@@ -339,6 +351,7 @@
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return 0;
+ evas_event_freeze(evas_object_evas_get(obj));
edje_object_part_geometry_get(wd->lbl, "elm.text", &x, &y, NULL, NULL);
/* Calc the formatted size with ellipsis turned off */
if (wd->ellipsis)
@@ -384,6 +397,8 @@
evas_object_textblock_size_formatted_get(tb, &w, &h);
}
evas_object_geometry_get(obj, &vx, &vy, &vw, &vh);
+ evas_event_thaw(evas_object_evas_get(obj));
+ evas_event_thaw_eval(evas_object_evas_get(obj));
if (w > wd->wrap_w || h > wd->wrap_h)
return 1;
@@ -421,6 +436,7 @@
const char *minfont, *deffont, *maxfont;
int minfontsize, maxfontsize;
+ evas_event_freeze(evas_object_evas_get(obj));
minfont = edje_object_data_get(wd->lbl, "min_font_size");
if (minfont) minfontsize = atoi(minfont);
else minfontsize = 1;
@@ -451,6 +467,8 @@
break;
}
}
+ evas_event_thaw(evas_object_evas_get(obj));
+ evas_event_thaw_eval(evas_object_evas_get(obj));
}
static void
------------------------------------------------------------------------------
Using storage to extend the benefits of virtualization and iSCSI
Virtualization increases hardware utilization and delivers a new level of
agility. Learn what those decisions are and how to modernize your storage
and backup environments for virtualization.
http://www.accelacomm.com/jaw/sfnl/114/51434361/
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
