bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0a99fb87bb856bb53ef627184dc968c6ee46fc7a
commit 0a99fb87bb856bb53ef627184dc968c6ee46fc7a
Author: Cedric Bail <cedric.b...@free.fr>
Date: Sun Sep 15 20:52:50 2019 -0700
elementary: rework Efl.Ui.Factory to have another additional stage during
releasing of items.
Reviewed-by: Marcel Hollerbach <m...@marcel-hollerbach.de>
Differential Revision: https://phab.enlightenment.org/D9954
---
src/lib/efl/interfaces/efl_ui_factory.eo | 1 +
src/lib/elementary/efl_ui_caching_factory.c | 3 +-
src/lib/elementary/efl_ui_widget_factory.c | 62 +++++++++++++++++++++++++++--
3 files changed, 61 insertions(+), 5 deletions(-)
diff --git a/src/lib/efl/interfaces/efl_ui_factory.eo
b/src/lib/efl/interfaces/efl_ui_factory.eo
index 7eda0c6c84..1db7d8fb9c 100644
--- a/src/lib/efl/interfaces/efl_ui_factory.eo
+++ b/src/lib/efl/interfaces/efl_ui_factory.eo
@@ -39,5 +39,6 @@ interface @beta Efl.Ui.Factory extends Efl.Ui.Property_Bind,
Efl.Ui.Factory_Bind
item,building: Efl.Gfx.Entity; [[Event triggered when an item has
processed @Efl.Object.finalize, but before all the factory are done building it.
Note: if the @Efl.Ui.Factory does keep a
cache of object, this will be called when object are pulled out of the cache.]]
item,created: Efl.Gfx.Entity; [[Event triggered when an item has been
successfully created by the factory and is about to be used by an
@Efl.Ui.View.]]
+ item,releasing: Efl.Gfx.Entity; [[Event triggered when an item is being
released by the @Efl.Ui.Factory. It must be assumed that after this call, the
object can be recycle to another @Efl.Ui.View and there can be more than one
call for the same item.]]
}
}
diff --git a/src/lib/elementary/efl_ui_caching_factory.c
b/src/lib/elementary/efl_ui_caching_factory.c
index 3035c308b4..54f5fd9442 100644
--- a/src/lib/elementary/efl_ui_caching_factory.c
+++ b/src/lib/elementary/efl_ui_caching_factory.c
@@ -136,6 +136,7 @@ _efl_ui_caching_factory_create_then(Eo *model, void *data,
const Eina_Value v)
_efl_ui_caching_factory_remove(r->pd, eina_list_data_find(r->pd->cache, w),
w);
efl_ui_view_model_set(w, model);
+ efl_event_callback_call(r->factory, EFL_UI_FACTORY_EVENT_ITEM_BUILDING, w);
return eina_value_object_init(w);
}
@@ -356,7 +357,7 @@ _efl_ui_caching_factory_efl_ui_factory_release(Eo *obj,
// Change parent, disconnect the object and make it invisible
efl_gfx_entity_visible_set(ui_view, EINA_FALSE);
- efl_ui_view_model_set(ui_view, NULL);
+ efl_event_callback_call(obj, EFL_UI_FACTORY_EVENT_ITEM_RELEASING, ui_view);
// Add to the cache
pd->cache = eina_list_prepend(pd->cache, ui_view);
diff --git a/src/lib/elementary/efl_ui_widget_factory.c
b/src/lib/elementary/efl_ui_widget_factory.c
index a485edfe7b..d7fc34ba64 100644
--- a/src/lib/elementary/efl_ui_widget_factory.c
+++ b/src/lib/elementary/efl_ui_widget_factory.c
@@ -90,9 +90,28 @@ static void
_efl_ui_widget_factory_constructing(void *data EINA_UNUSED, const Efl_Event
*ev)
{
Efl_Gfx_Entity *ui_view = ev->info;
+ const Efl_Model *model;
+ Eina_Value *width, *height;
+
+ model = efl_ui_view_model_get(ui_view);
+
+ // Fetch min size from model if available to avoid recalculcating it
+ width = efl_model_property_get(model, "self.width");
+ height = efl_model_property_get(model, "self.height");
+ if (eina_value_type_get(width) != EINA_VALUE_TYPE_ERROR &&
+ eina_value_type_get(height) != EINA_VALUE_TYPE_ERROR)
+ {
+ Eina_Size2D s;
- /* NOP */
- (void)(ui_view);
+ if (!eina_value_int_convert(width, &s.w)) s.w = 0;
+ if (!eina_value_int_convert(height, &s.h)) s.h = 0;
+
+ /* efl_event_freeze(ui_view); */
+ efl_key_data_set(ui_view, "efl.ui.widget.factory.size_set",
(void*)EINA_TRUE);
+ efl_gfx_hint_size_min_set(ui_view, s);
+ }
+ eina_value_free(width);
+ eina_value_free(height);
}
@@ -109,6 +128,10 @@ _efl_ui_widget_factory_building(void *data, const
Efl_Event *ev)
model = efl_ui_view_model_get(ui_view);
+ // Check property size only if not checked yet
+ if (!efl_key_data_get(ui_view, "efl.ui.widget.factory.size_check"))
+ _efl_ui_widget_factory_constructing(data, ev);
+
// Bind all property before the object is finalize
it = eina_hash_iterator_data_new(pd->parts);
EINA_ITERATOR_FOREACH(it, bpd)
@@ -152,9 +175,37 @@ _efl_ui_widget_factory_building(void *data, const
Efl_Event *ev)
eina_value_free(property);
}
+static void
+_efl_ui_widget_factory_releasing(void *data, const Efl_Event *ev)
+{
+ Efl_Ui_Widget_Factory_Data *pd = data;
+ Efl_Gfx_Entity *ui_view = ev->info;
+ Efl_Ui_Bind_Part_Data *bpd;
+ Eina_Iterator *it;
+
+ efl_key_data_set(ui_view, "efl.ui.widget.factory.size_set", NULL);
+ efl_key_data_set(ui_view, "efl.ui.widget.factory.size_check", NULL);
+
+ // Bind all property before the object is finalize
+ it = eina_hash_iterator_data_new(pd->parts);
+ EINA_ITERATOR_FOREACH(it, bpd)
+ {
+ Efl_Ui_Property_Bind_Data *bppd;
+ Eina_List *l;
+
+ EINA_LIST_FOREACH(bpd->properties, l, bppd)
+ efl_ui_property_bind(efl_part(ui_view, bpd->part),
+ bppd->part_property, NULL);
+ }
+ eina_iterator_free(it);
+
+ efl_ui_view_model_set(ui_view, NULL);
+}
+
EFL_CALLBACKS_ARRAY_DEFINE(item_callbacks,
{ EFL_UI_FACTORY_EVENT_ITEM_CONSTRUCTING,
_efl_ui_widget_factory_constructing },
- { EFL_UI_FACTORY_EVENT_ITEM_BUILDING,
_efl_ui_widget_factory_building })
+ { EFL_UI_FACTORY_EVENT_ITEM_BUILDING,
_efl_ui_widget_factory_building },
+ { EFL_UI_FACTORY_EVENT_ITEM_RELEASING,
_efl_ui_widget_factory_releasing })
static Eo *
_efl_ui_widget_factory_efl_object_constructor(Efl_Ui_Widget_Factory *obj,
@@ -273,10 +324,13 @@ alloc_array_error:
}
static void
-_efl_ui_widget_factory_efl_ui_factory_release(Eo *obj EINA_UNUSED,
+_efl_ui_widget_factory_efl_ui_factory_release(Eo *obj,
Efl_Ui_Widget_Factory_Data *pd
EINA_UNUSED,
Efl_Gfx_Entity *ui_view)
{
+ // There might be multiple call to releasing on the same object as every
factory in the
+ // inheritance chain can decide to keep it for a time
+ efl_event_callback_call(obj, EFL_UI_FACTORY_EVENT_ITEM_RELEASING, ui_view);
// We do not cache or track this item, just get rid of them asap
efl_del(ui_view);
}
--
