vtorri
/
enventor
forked from enlightenment/enventor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

enventor - fix crash when toggle the dummy swallow

This commit is contained in:
ChunEon Park 2013-07-21 05:30:49 +09:00
parent 2f8f8e21e3
commit 4e6b1e0585
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/dummy_obj.c
View File

@ -147,7 +147,12 @@ void dummy_obj_del(Evas_Object *layout)
free(po);
}
eina_list_free(dummy->swallows);
free(dummy);
evas_object_data_set(layout, DUMMYOBJ, NULL);
evas_object_event_callback_del(layout, EVAS_CALLBACK_DEL, layout_del_cb);
edje_object_signal_callback_del(elm_layout_edje_get(layout),
"edje,change,file", "edje",
edje_change_file_cb);
}

13
src/edc_viewer.c
View File

@ -131,8 +131,17 @@ view_dummy_toggle(view_data *vd)
{
Eina_Bool dummy_obj = option_dummy_swallow_get(vd->od);
if (dummy_obj == vd->dummy_obj) return;
if (dummy_obj) dummy_obj_new(vd->layout);
else dummy_obj_del(vd->layout);
if (dummy_obj)
{
stats_info_msg_update(vd->sd, "Dummy Swallow Enabled");
dummy_obj_new(vd->layout);
}
else
{
stats_info_msg_update(vd->sd, "Dummy Swallow Disabled");
dummy_obj_del(vd->layout);
}
vd->dummy_obj = dummy_obj;
}

1
src/main.c
View File

@ -167,7 +167,6 @@ part_highlight_toggle(app_data *ad)
if (highlight) edit_cur_part_update(ad->ed);
else view_part_highlight_set(ad->vd, NULL);
if (!option_stats_bar_get(ad->od)) return;
if (highlight)
stats_info_msg_update(ad->sd, "Part Highlighting Enabled");
else

2
src/statusbar.c
View File

@ -75,6 +75,8 @@ info_msg_timer_cb(void *data)
void
stats_info_msg_update(stats_data *sd, const char *msg)
{
if (!option_stats_bar_get(sd->od)) return;
elm_object_part_text_set(sd->layout, "elm.text.info_msg", msg);
elm_object_signal_emit(sd->layout, "elm,action,info_msg,show", "");
if (sd->info_msg_timer) ecore_timer_del(sd->info_msg_timer);