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

elementary: properly propagate "child.selected" change. 

Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Differential Revision: https://phab.enlightenment.org/D11013
This commit is contained in:
Cedric BAIL 2020-01-03 15:35:17 -08:00
parent 93c7e7dc8f
commit 9ac976b079
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/lib/elementary/efl_ui_select_model.c
View File

@ -24,10 +24,15 @@ struct _Efl_Ui_Select_Model_Data
Efl_Ui_Select_Model *last_model; Efl_Ui_Select_Model *last_model;
Efl_Ui_Select_Mode selection; Efl_Ui_Select_Mode selection;
Eina_Bool none : 1;
}; };
static void
_efl_ui_select_model_apply_last_model(Eo *obj, Efl_Ui_Select_Model_Data *pd, Eo *last_model)
{
efl_replace(&pd->last_model, last_model);
efl_model_properties_changed(obj, "child.selected");
}
static void static void
_efl_ui_select_model_child_removed(void *data, const Efl_Event *event) _efl_ui_select_model_child_removed(void *data, const Efl_Event *event)
{ {
@ -35,7 +40,7 @@ _efl_ui_select_model_child_removed(void *data, const Efl_Event *event)
Efl_Model_Children_Event *ev = event->info; Efl_Model_Children_Event *ev = event->info;
if (ev->child == pd->last_model) if (ev->child == pd->last_model)
efl_replace(&pd->last_model, NULL); _efl_ui_select_model_apply_last_model(event->object, pd, NULL);
} }
static Eo* static Eo*
@ -49,7 +54,6 @@ _efl_ui_select_model_efl_object_constructor(Eo *obj,
efl_boolean_model_boolean_add(obj, "selected", EINA_FALSE); efl_boolean_model_boolean_add(obj, "selected", EINA_FALSE);
efl_event_callback_add(obj, EFL_MODEL_EVENT_CHILD_REMOVED, _efl_ui_select_model_child_removed, pd); efl_event_callback_add(obj, EFL_MODEL_EVENT_CHILD_REMOVED, _efl_ui_select_model_child_removed, pd);
pd->none = EINA_TRUE;
parent = efl_parent_get(obj); parent = efl_parent_get(obj);
if (efl_isa(parent, EFL_UI_SELECT_MODEL_CLASS)) if (efl_isa(parent, EFL_UI_SELECT_MODEL_CLASS))
@ -64,7 +68,6 @@ _efl_ui_select_model_efl_object_invalidate(Eo *obj,
{ {
efl_replace(&pd->fallback_model, NULL); efl_replace(&pd->fallback_model, NULL);
efl_replace(&pd->last_model, NULL); efl_replace(&pd->last_model, NULL);
pd->none = EINA_TRUE;
efl_invalidate(efl_super(obj, EFL_UI_SELECT_MODEL_CLASS)); efl_invalidate(efl_super(obj, EFL_UI_SELECT_MODEL_CLASS));
} }
@ -75,7 +78,7 @@ _efl_ui_select_model_fallback(Efl_Ui_Select_Model_Data *pd)
Eina_Value selected; Eina_Value selected;
if (!pd->parent) return; if (!pd->parent) return;
if (!pd->parent->none) return; if (!pd->parent->last_model) return;
if (!pd->parent->fallback_model) return; if (!pd->parent->fallback_model) return;
// I think it only make sense to trigger the fallback on single mode // I think it only make sense to trigger the fallback on single mode
if (pd->parent->selection != EFL_UI_SELECT_MODE_SINGLE) return; if (pd->parent->selection != EFL_UI_SELECT_MODE_SINGLE) return;
@ -129,8 +132,7 @@ _commit_change(Eo *child, void *data EINA_UNUSED, const Eina_Value v)
if (selflag) if (selflag)
{ {
// select case // select case
pd->none = EINA_FALSE; _efl_ui_select_model_apply_last_model(parent, pd, child);
efl_replace(&pd->last_model, child);
efl_event_callback_call(child, EFL_UI_SELECT_MODEL_EVENT_SELECTED, child); efl_event_callback_call(child, EFL_UI_SELECT_MODEL_EVENT_SELECTED, child);
} }
else else
@ -139,8 +141,7 @@ _commit_change(Eo *child, void *data EINA_UNUSED, const Eina_Value v)
// There should only be one model which represent the same data at all in memory // There should only be one model which represent the same data at all in memory
if (pd->last_model == child) // direct comparison of pointer is ok if (pd->last_model == child) // direct comparison of pointer is ok
{ {
efl_replace(&pd->last_model, NULL); _efl_ui_select_model_apply_last_model(parent, pd, NULL);
pd->none = EINA_TRUE;
// Just in case we need to refill the fallback // Just in case we need to refill the fallback
_efl_ui_select_model_fallback(pd); _efl_ui_select_model_fallback(pd);
@ -401,13 +402,12 @@ _efl_ui_select_model_efl_model_property_set(Eo *obj,
{ {
if (pd->parent->last_model == obj && !newflag) if (pd->parent->last_model == obj && !newflag)
{ {
efl_replace(&pd->last_model, NULL); _efl_ui_select_model_apply_last_model(efl_parent_get(obj), pd->parent, NULL);
pd->parent->none = EINA_TRUE;
_efl_ui_select_model_fallback(pd); _efl_ui_select_model_fallback(pd);
} }
} }
else else if (pd->parent->last_model)
{ {
Eo *parent; Eo *parent;
unsigned long selected = 0; unsigned long selected = 0;
@ -431,6 +431,10 @@ _efl_ui_select_model_efl_model_property_set(Eo *obj,
.error = _untangle_error, .error = _untangle_error,
.free = _untangle_free); .free = _untangle_free);
} }
else
{
_efl_ui_select_model_apply_last_model(efl_parent_get(obj), pd->parent, obj);
}
} }
return efl_future_then(efl_ref(obj), chain, return efl_future_then(efl_ref(obj), chain,
@ -450,10 +454,10 @@ _efl_ui_select_model_efl_model_property_get(const Eo *obj, Efl_Ui_Select_Model_D
// Last selected child // Last selected child
if (eina_streq("child.selected", property)) if (eina_streq("child.selected", property))
{ {
if (pd->none) if (pd->last_model)
return eina_value_error_new(EFL_MODEL_ERROR_INCORRECT_VALUE);
else if (pd->last_model)
return eina_value_ulong_new(efl_composite_model_index_get(pd->last_model)); return eina_value_ulong_new(efl_composite_model_index_get(pd->last_model));
else if (pd->fallback_model)
return eina_value_ulong_new(efl_composite_model_index_get(pd->fallback_model));
else // Nothing selected yet, try again later else // Nothing selected yet, try again later
return eina_value_error_new(EAGAIN); return eina_value_error_new(EAGAIN);
} }
@ -653,7 +657,7 @@ _efl_ui_select_model_efl_ui_single_selectable_fallback_selection_set(Eo *obj,
efl_replace(&pd->fallback_model, fallback); efl_replace(&pd->fallback_model, fallback);
if (!pd->none) return ; if (!pd->last_model) return ;
// When we provide a fallback, we should use it! // When we provide a fallback, we should use it!
index = efl_model_property_get(fallback, EFL_COMPOSITE_MODEL_CHILD_INDEX); index = efl_model_property_get(fallback, EFL_COMPOSITE_MODEL_CHILD_INDEX);