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

elementary: prevent asynchronous properties change to believe target is ready when it is not in fileselector. 

In some case, the properties changed event would be triggered first on the object model
instead of the target model. This now enforce that the target will be the first model
to handle and react on the information.

Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de>
Differential Revision: https://phab.enlightenment.org/D8449
This commit is contained in:
Cedric BAIL 2019-03-22 10:31:52 -07:00
parent db618e179a
commit 1eb49b2e9b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/elementary/elc_fileselector.c
View File

@ -900,7 +900,7 @@ _process_model(Elm_Fileselector_Data *sd, Efl_Model *child)
efl_key_data_set(child, ".item.data", item);
// Is this item selected
if (sd->target)
if (sd->target && sd->target_ready)
{
const char *target_path = efl_io_model_path_get(sd->target);
@ -2409,7 +2409,7 @@ _properties_ready(void *data, const Efl_Event *ev)
efl_event_callback_del(ev->object, EFL_MODEL_EVENT_PROPERTIES_CHANGED, _properties_ready, obj);
eina_value_bool_get(value, &is_dir);
pd->target_ready = EINA_TRUE;
if (!is_dir)
{
Efl_Model *parent;
@ -2453,6 +2453,7 @@ _elm_fileselector_selected_set_internal(Evas_Object *obj, const char *path)
if (stat(path, &st)) return EINA_FALSE;
pd->target_ready = EINA_FALSE;
pd->target = efl_add_ref(EFL_IO_MODEL_CLASS, obj, efl_io_model_path_set(efl_added, path),
efl_event_callback_array_add(efl_added, noref_death(), NULL));
if (!pd->target)

1
src/lib/elementary/elm_widget_fileselector.h
View File

@ -86,6 +86,7 @@ struct _Elm_Fileselector_Data
Eina_Bool dir_selected : 1;
Eina_Bool hidden_visible : 1;
Eina_Bool target_ready : 1;
};
struct sel_data