X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Flib%2Felm_factory.c;h=123f67f0ded2e2abcb4962865a542e395e0f8638;hb=a876f2ce883e2a6a2167fb514b6668ab93da76e3;hp=86f81e9ae7dd303074ec5cff86011791fcffeb8d;hpb=f7e6e7146354a246c838df93bce9e5c26f0f82c6;p=framework%2Fuifw%2Felementary.git

diff --git a/src/lib/elm_factory.c b/src/lib/elm_factory.c
index 86f81e9..123f67f 100644
--- a/src/lib/elm_factory.c
+++ b/src/lib/elm_factory.c
@@ -1,19 +1,34 @@
 #include <Elementary.h>
 #include "elm_priv.h"
 
+// FIXME: handle if canvas resizes
+
 typedef struct _Widget_Data Widget_Data;
 
 struct _Widget_Data
 {
    Evas_Object *obj;
    Evas_Object *content;
-   Ecore_Job *eval_job;
+   int last_calc_count;
+   Evas_Coord maxminw, maxminh;
+   Eina_Bool eval : 1;
+   Eina_Bool szeval : 1;
+   Eina_Bool maxmin : 1;
 };
 
 static const char *widtype = NULL;
 static void _del_hook(Evas_Object *obj);
+static Eina_Bool _focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next);
 static void _sizing_eval(Evas_Object *obj);
-static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void _eval(Evas_Object *obj);
+static void _changed(Evas_Object *obj);
+static void _move(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__);
+static void _resize(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__);
+static void _child_change(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__);
+static void _child_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__);
+static void _content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content);
+static Evas_Object *_content_get_hook(const Evas_Object *obj, const char *part);
+static Evas_Object *_content_unset_hook(Evas_Object *obj, const char *part);
 
 static const char SIG_REALIZE[] = "realize";
 static const char SIG_UNREALIZE[] = "unrealize";
@@ -24,12 +39,28 @@ static const Evas_Smart_Cb_Description _signals[] = {
    {NULL, NULL}
 };
 
+static int fac = 0;
+
 static void
 _del_hook(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   if (wd->eval_job) ecore_job_del(wd->eval_job);
+   if (wd->content)
+     {
+        Evas_Object *o = wd->content;
+
+        evas_object_event_callback_del_full(o,
+                                            EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                            _child_change, obj);
+        evas_object_event_callback_del_full(o,
+                                            EVAS_CALLBACK_DEL,
+                                            _child_del, obj);
+        wd->content = NULL;
+        evas_object_del(o);
+        fac--;
+//        printf("FAC-- = %i\n", fac);
+     }
    free(wd);
 }
 
@@ -38,7 +69,7 @@ _focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    Evas_Object *cur;
-   
+
    if ((!wd) || (!wd->content)) return EINA_FALSE;
    cur = wd->content;
    return elm_widget_focus_next_get(cur, dir, next);
@@ -49,65 +80,118 @@ _sizing_eval(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1;
-   
+
    if (!wd) return;
    if (!wd->content) return;
    evas_object_size_hint_min_get(wd->content, &minw, &minh);
    evas_object_size_hint_max_get(wd->content, &maxw, &maxh);
-   evas_object_size_hint_min_set(obj, minw, minh);
+   if (wd->maxmin)
+     {
+        if (minw > wd->maxminw) wd->maxminw = minw;
+        if (minh > wd->maxminh) wd->maxminh = minh;
+        evas_object_size_hint_min_set(obj, wd->maxminw, wd->maxminh);
+     }
+   else
+     {
+        evas_object_size_hint_min_set(obj, minw, minh);
+     }
    evas_object_size_hint_max_set(obj, maxw, maxh);
+//   printf("FAC SZ: %i %i | %i %i\n", minw, minh, maxw, maxh);
 }
 
 static void
-_eval_do(void *data)
+_eval(Evas_Object *obj)
 {
-   Evas_Object *obj = data;
    Evas_Coord x, y, w, h, cvx, cvy, cvw, cvh;
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   
-   wd->eval_job = NULL;
+
+   evas_event_freeze(evas_object_evas_get(obj));
    evas_object_geometry_get(obj, &x, &y, &w, &h);
-   evas_output_viewport_get(evas_object_evas_get(obj), 
+   if (w < 1) w = 1;
+   if (h < 1) h = 1;
+   evas_output_viewport_get(evas_object_evas_get(obj),
                             &cvx, &cvy, &cvw, &cvh);
+   if ((cvw < 1) || (cvh < 1)) return;
+   // need some fuzz value thats beyond the current viewport
+   // for now just make it the viewport * 3 in size (so 1 vp in each direction)
+   /*
+   cvx -= cvw;
+   cvy -= cvh;
+   cvw *= 3;
+   cvh *= 3;
+    */
    if (ELM_RECTS_INTERSECT(x, y, w, h, cvx, cvy, cvw, cvh))
      {
         if (!wd->content)
-           evas_object_smart_callback_call(obj, SIG_REALIZE, NULL);
+          {
+//             printf("                 + %i %i %ix%i <> %i %i %ix%i\n", x, y, w, h, cvx, cvy, cvw, cvh);
+             evas_object_smart_callback_call(obj, SIG_REALIZE, NULL);
+             if (wd->content)
+               {
+                  if (evas_object_smart_data_get(wd->content))
+                     evas_object_smart_calculate(wd->content);
+               }
+             //wd->last_calc_count =
+             //evas_smart_objects_calculate_count_get(evas_object_evas_get(obj));
+          }
      }
    else
      {
         if (wd->content)
-           evas_object_smart_callback_call(obj, SIG_UNREALIZE, NULL);
+          {
+             //if (wd->last_calc_count !=
+             //evas_smart_objects_calculate_count_get(evas_object_evas_get(obj)))
+                evas_object_smart_callback_call(obj, SIG_UNREALIZE, NULL);
+          }
      }
+   evas_event_thaw(evas_object_evas_get(obj));
+   evas_event_thaw_eval(evas_object_evas_get(obj));
 }
 
 static void
-_eval(Evas_Object *obj)
+_changed(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   
-   if (wd->eval_job) ecore_job_del(wd->eval_job);
-   wd->eval_job = ecore_job_add(_eval_do, obj);
+   if (wd->eval)
+     {
+        _eval(obj);
+        wd->eval = EINA_FALSE;
+     }
+   if (wd->szeval)
+     {
+        _sizing_eval(obj);
+        wd->szeval = EINA_FALSE;
+     }
 }
 
 static void
 _move(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
 {
-   _eval(obj);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   wd->eval = EINA_TRUE;
+   evas_object_smart_changed(obj);
 }
-               
+
 static void
 _resize(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
-{              
-   _eval(obj);
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   wd->eval = EINA_TRUE;
+   evas_object_smart_changed(obj);
 }
 
 static void
-_child_change(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+_child_change(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   _eval(obj);
+   Widget_Data *wd = elm_widget_data_get(data);
+   if (!wd) return;
+   wd->eval = EINA_TRUE;
+   wd->szeval = EINA_TRUE;
+   evas_object_smart_changed(data);
 }
 
 static void
@@ -117,13 +201,78 @@ _child_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __
    Widget_Data *wd = elm_widget_data_get(fobj);
    if (!wd) return;
    if (wd->content != obj) return;
-   evas_object_event_callback_del_full(wd->content, 
+   evas_object_event_callback_del_full(wd->content,
                                        EVAS_CALLBACK_CHANGED_SIZE_HINTS,
                                        _child_change, obj);
-   evas_object_event_callback_del_full(wd->content, 
+   evas_object_event_callback_del_full(wd->content,
                                        EVAS_CALLBACK_DEL,
                                        _child_del, obj);
    wd->content = NULL;
+   fac--;
+//   printf("FAC-- = %i\n", fac);
+}
+
+static Evas_Object *
+_content_unset_hook(Evas_Object *obj, const char *part)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd;
+   Evas_Object *content;
+
+   if (part && strcmp(part, "default")) return NULL;
+   wd = elm_widget_data_get(obj);
+   if (!wd || !wd->content) return NULL;
+
+   content = wd->content;
+   evas_object_event_callback_del_full(content,
+                                       EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                       _child_change, obj);
+   evas_object_event_callback_del_full(content,
+                                       EVAS_CALLBACK_DEL,
+                                       _child_del, obj);
+   wd->content = NULL;
+   fac--;
+//         printf("FAC-- = %i\n", fac);
+   return content;
+}
+
+static void
+_content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd;
+   Evas_Object *prev_content;
+
+   if (part && strcmp(part, "default")) return;
+   wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   if (wd->content == content) return;
+
+   prev_content = _content_unset_hook(obj, part);
+   if (prev_content) evas_object_del(prev_content);
+
+   wd->content = content;
+   if (!content) return;
+
+   elm_widget_resize_object_set(obj, content);
+   evas_object_event_callback_add(content, EVAS_CALLBACK_DEL, _child_del, obj);
+   evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                  _child_change, obj);
+   wd->eval = EINA_TRUE;
+   wd->szeval = EINA_TRUE;
+   evas_object_smart_changed(obj);
+   fac++;
+}
+
+static Evas_Object *
+_content_get_hook(const Evas_Object *obj, const char *part)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd;
+   if (part && strcmp(part, "default")) return NULL;
+   wd = elm_widget_data_get(obj);
+   if (!wd) return NULL;
+   return wd->content;
 }
 
 EAPI Evas_Object *
@@ -141,39 +290,49 @@ elm_factory_add(Evas_Object *parent)
    elm_widget_data_set(obj, wd);
    elm_widget_del_hook_set(obj, _del_hook);
    elm_widget_focus_next_hook_set(obj, _focus_next_hook);
+   elm_widget_content_set_hook_set(obj, _content_set_hook);
+   elm_widget_content_get_hook_set(obj, _content_get_hook);
+   elm_widget_content_unset_hook_set(obj, _content_unset_hook);
    elm_widget_can_focus_set(obj, EINA_FALSE);
+   elm_widget_changed_hook_set(obj, _changed);
 
    evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _move, NULL);
    evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _resize, NULL);
 
    evas_object_smart_callbacks_descriptions_set(obj, _signals);
-   
+
    wd->obj = obj;
+   wd->last_calc_count = -1;
    return obj;
 }
 
 EAPI void
-elm_factory_content_set(Evas_Object *obj, Evas_Object *content)
+elm_factory_maxmin_mode_set(Evas_Object *obj, Eina_Bool enabled)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   if (wd->content == content) return;
-   if (wd->content) evas_object_del(wd->content);
-   wd->content = content;
-   elm_widget_resize_object_set(obj, wd->content);
-   evas_object_event_callback_add(wd->content, EVAS_CALLBACK_DEL,
-                                  _child_del, obj);
-   evas_object_event_callback_add(wd->content, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
-                                  _child_change, obj);
-    _sizing_eval(obj);
+   wd->maxmin = !!enabled;
 }
 
-EAPI Evas_Object *
-elm_factory_content_get(const Evas_Object *obj)
+EAPI Eina_Bool
+elm_factory_maxmin_mode_get(const Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
    Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return NULL;
-   return wd->content;
+   if (!wd) return EINA_FALSE;
+   return wd->maxmin;
+}
+
+EAPI void
+elm_factory_maxmin_reset_set(Evas_Object *obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   wd->maxminw = 0;
+   wd->maxminh = 0;
+   wd->eval = EINA_TRUE;
+   wd->szeval = EINA_TRUE;
+   evas_object_smart_changed(obj);
 }