summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2018-06-25 11:29:50 -0400
committerMike Blumenkrantz <zmike@samsung.com>2018-06-25 11:36:40 -0400
commit5a54a3d357acc1b7c285cea29b67b4a4f6404469 (patch)
treec11f71d1c15c10fa60117b8db0be1f4781c706aa
parentc1f3cf2a478ef26e21ad02a9e066aa9e46365c8e (diff)
efl_ui_calendar: Wrap calls to edje_object_part_object_get with
Summary: freeze/thaw @ref T6884 Depends on D6411 Reviewers: zmike, ManMower Reviewed By: zmike Subscribers: cedric, #committers Tags: #efl Maniphest Tasks: T6884 Differential Revision: https://phab.enlightenment.org/D6412
-rw-r--r--src/lib/elementary/efl_ui_calendar.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/lib/elementary/efl_ui_calendar.c b/src/lib/elementary/efl_ui_calendar.c
index 02bb5172b9..7278e63aff 100644
--- a/src/lib/elementary/efl_ui_calendar.c
+++ b/src/lib/elementary/efl_ui_calendar.c
@@ -261,7 +261,7 @@ _access_calendar_item_register(Evas_Object *obj)
261static void 261static void
262_access_calendar_spinner_register(Evas_Object *obj) 262_access_calendar_spinner_register(Evas_Object *obj)
263{ 263{
264 Evas_Object *po; 264 Evas_Object *po, *o;
265 Elm_Access_Info *ai; 265 Elm_Access_Info *ai;
266 EFL_UI_CALENDAR_DATA_GET(obj, sd); 266 EFL_UI_CALENDAR_DATA_GET(obj, sd);
267 267
@@ -285,8 +285,10 @@ _access_calendar_spinner_register(Evas_Object *obj)
285 ai = _elm_access_info_get(sd->year_access); 285 ai = _elm_access_info_get(sd->year_access);
286 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar year")); 286 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar year"));
287 287
288 po = (Evas_Object *)edje_object_part_object_get 288 o = elm_layout_edje_get(obj);
289 (elm_layout_edje_get(obj), "month_text"); 289 edje_object_freeze(o);
290 po = (Evas_Object *)edje_object_part_object_get(o, "month_text");
291 edje_object_thaw(o);
290 evas_object_pass_events_set(po, EINA_FALSE); 292 evas_object_pass_events_set(po, EINA_FALSE);
291} 293}
292 294
@@ -1282,13 +1284,15 @@ EOLIAN static void
1282_efl_ui_calendar_item_day_number_set(Eo *obj, Efl_Ui_Calendar_Item_Data *pd, int i) 1284_efl_ui_calendar_item_day_number_set(Eo *obj, Efl_Ui_Calendar_Item_Data *pd, int i)
1283{ 1285{
1284 char pname[14]; 1286 char pname[14];
1285 Evas_Object *po; 1287 Evas_Object *po, *o;
1286 1288
1287 pd->v = i; 1289 pd->v = i;
1288 snprintf(pname, sizeof(pname), "cit_%i.access", i); 1290 snprintf(pname, sizeof(pname), "cit_%i.access", i);
1289 1291
1290 po = (Evas_Object *)edje_object_part_object_get 1292 o = elm_layout_edje_get(efl_parent_get(obj));
1291 (elm_layout_edje_get(efl_parent_get(obj)), pname); 1293 edje_object_freeze(o);
1294 po = (Evas_Object *)edje_object_part_object_get(o, pname);
1295 edje_object_thaw(o);
1292 1296
1293 if (_elm_config->access_mode != ELM_ACCESS_MODE_ON) 1297 if (_elm_config->access_mode != ELM_ACCESS_MODE_ON)
1294 pd->part = po; 1298 pd->part = po;