Group overlay's size have same size as that of default overlay.

[framework/uifw/elementary.git] / src / lib / elm_layout.c

diff --git a/src/lib/elm_layout.c b/src/lib/elm_layout.c
index 753ea36..6f14484 100644 (file)
--- a/src/lib/elm_layout.c
+++ b/src/lib/elm_layout.c
@@ -19,27 +19,32 @@ struct _Subinfo
 {
    const char *part;
    Evas_Object *obj;
-   enum {
-     SWALLOW,
-     BOX_APPEND,
-     BOX_PREPEND,
-     BOX_INSERT_BEFORE,
-     BOX_INSERT_AT,
-     TABLE_PACK,
-     TEXT
-   } type;
-   union {
-      union {
-         const Evas_Object *reference;
-         unsigned int pos;
-      } box;
-      struct {
-         unsigned short col, row, colspan, rowspan;
-      } table;
-      struct {
-         const char *text;
-      } text;
-   } p;
+   enum
+     {
+        SWALLOW,
+        BOX_APPEND,
+        BOX_PREPEND,
+        BOX_INSERT_BEFORE,
+        BOX_INSERT_AT,
+        TABLE_PACK,
+        TEXT
+     } type;
+   union
+     {
+        union
+          {
+             const Evas_Object *reference;
+             unsigned int pos;
+          } box;
+        struct
+          {
+             unsigned short col, row, colspan, rowspan;
+          } table;
+        struct
+          {
+             const char *text;
+          } text;
+     } p;
 };
 
 struct _Part_Cursor
@@ -303,7 +308,7 @@ _parts_text_fix(Widget_Data *wd)
    EINA_LIST_FOREACH(wd->subs, l, si)
      {
         if (si->type == TEXT)
-          edje_object_part_text_set(wd->lay, si->part, si->p.text.text);
+          edje_object_part_text_escaped_set(wd->lay, si->part, si->p.text.text);
      }
 }
 
@@ -325,7 +330,7 @@ _elm_layout_label_set(Evas_Object *obj, const char *part, const char *text)
                   eina_stringshare_del(si->part);
                   eina_stringshare_del(si->p.text.text);
                   free(si);
-                  edje_object_part_text_set(wd->lay, part, NULL);
+                  edje_object_part_text_escaped_set(wd->lay, part, NULL);
                   wd->subs = eina_list_remove_list(wd->subs, l);
                   return;
                }
@@ -345,7 +350,7 @@ _elm_layout_label_set(Evas_Object *obj, const char *part, const char *text)
      }
 
    eina_stringshare_replace(&si->p.text.text, text);
-   edje_object_part_text_set(wd->lay, part, text);
+   edje_object_part_text_escaped_set(wd->lay, part, text);
    _request_sizing_eval(wd);
 }
 
@@ -366,6 +371,7 @@ _content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content)
    Subinfo *si;
    const Eina_List *l;
    if (!wd) return;
+   EINA_SAFETY_ON_NULL_RETURN(part);
    EINA_LIST_FOREACH(wd->subs, l, si)
      {
         if ((si->type == SWALLOW) && (!strcmp(part, si->part)))
@@ -514,39 +520,6 @@ elm_layout_theme_set(Evas_Object *obj, const char *clas, const char *group, cons
 }
 
 EAPI Eina_Bool
-elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content)
-{
-   _content_set_hook(obj, swallow, content);
-   return EINA_TRUE;
-}
-
-
-EAPI Evas_Object *
-elm_layout_content_get(const Evas_Object *obj, const char *swallow)
-{
-   return _content_get_hook(obj, swallow);
-}
-
-EAPI Evas_Object *
-elm_layout_content_unset(Evas_Object *obj, const char *swallow)
-{
-   return _content_unset_hook(obj, swallow);
-}
-
-EAPI Eina_Bool
-elm_layout_text_set(Evas_Object *obj, const char *part, const char *text)
-{
-   _elm_layout_label_set(obj, part, text);
-   return EINA_TRUE;
-}
-
-EAPI const char *
-elm_layout_text_get(const Evas_Object *obj, const char *part)
-{
-   return _elm_layout_label_get(obj, part);
-}
-
-EAPI Eina_Bool
 elm_layout_box_append(Evas_Object *obj, const char *part, Evas_Object *child)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;