Imported Upstream version 1.7.2

[platform/upstream/edje.git] / src / lib / edje_util.c

diff --git a/src/lib/edje_util.c b/src/lib/edje_util.c
index 75faa4d..b6d2b3f 100644 (file)
--- a/src/lib/edje_util.c
+++ b/src/lib/edje_util.c
@@ -345,6 +345,7 @@ edje_object_scale_set(Evas_Object *obj, double scale)
    Edje *ed, *ged;
    Evas_Object *o;
    Eina_List *l;
+   unsigned int i;
 
    ed = _edje_fetch(obj);
    if (!ed) return EINA_FALSE;
@@ -354,6 +355,17 @@ edje_object_scale_set(Evas_Object *obj, double scale)
       ged->scale = ed->scale;
    EINA_LIST_FOREACH(ed->subobjs, l, o)
       edje_object_calc_force(o);
+   for(i = 0; i < ed->table_parts_size; ++i)
+     {
+        Edje_Real_Part *ep;
+        ep = ed->table_parts[i];
+        if ((ep->part->type == EDJE_PART_TYPE_BOX)
+            || (ep->part->type == EDJE_PART_TYPE_TABLE))
+          {
+             EINA_LIST_FOREACH(ep->items, l, o)
+                edje_object_scale_set(o, scale);
+          }
+     }
    edje_object_calc_force(obj);
    return EINA_TRUE;
 }
@@ -812,10 +824,9 @@ edje_text_class_set(const char *text_class, const char *font, Evas_Font_Size siz
    else
      {
         /* Match and the same, return */
-        if ((tc->size == size) ||
-            (tc->font == font) ||
-            (tc->font && font && !strcmp(tc->font, font)))
-           return EINA_TRUE;
+        if (((tc->font && font) && !strcmp(tc->font, font)) &&
+            (tc->size == size))
+          return EINA_TRUE;
 
         /* Update the class found */
         eina_stringshare_replace(&tc->font, font);