From a1661712daf87c5611ba1c87f8489cc7d85387be Mon Sep 17 00:00:00 2001
From: Michael BOUCHAUD <michael.bouchaud@gmail.com>
Date: Fri, 12 Oct 2012 14:51:45 +0000
Subject: [PATCH] elementary: elm_map use now image proxy and do some cleaning
 in theme, big thx to Bluezery !

SVN revision: 77939
---
 legacy/elementary/data/themes/Makefile.am     |   1 -
 legacy/elementary/data/themes/map_item.png    | Bin 3041 -> 4406 bytes
 legacy/elementary/data/themes/map_item_1.png  | Bin 2669 -> 0 bytes
 legacy/elementary/data/themes/map_item_2.png  | Bin 2578 -> 0 bytes
 legacy/elementary/data/themes/widgets/map.edc |  60 ++-----------
 legacy/elementary/src/bin/test_map.c          |   1 +
 legacy/elementary/src/lib/elm_map.c           |  85 ++++++++++--------
 7 files changed, 54 insertions(+), 93 deletions(-)
 delete mode 100644 legacy/elementary/data/themes/map_item_1.png
 delete mode 100644 legacy/elementary/data/themes/map_item_2.png

diff --git a/legacy/elementary/data/themes/Makefile.am b/legacy/elementary/data/themes/Makefile.am
index 89d2ad213a..b8bfddbfd1 100644
--- a/legacy/elementary/data/themes/Makefile.am
+++ b/legacy/elementary/data/themes/Makefile.am
@@ -285,7 +285,6 @@ emo-wink.png \
 emo-worried.png \
 emo-wtf.png \
 map_item.png \
-map_item_2.png \
 shadow.png \
 black.png \
 tooltip-corner-top-left-tip.png \
diff --git a/legacy/elementary/data/themes/map_item.png b/legacy/elementary/data/themes/map_item.png
index 9e9015921c316146dca1bad9419939e8422d63a6..b83e5527d3edf0518220526c580756fc2c149c67 100644
GIT binary patch
delta 4386
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
C!$*by

delta 3011
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
FV1g9$;PL<f

diff --git a/legacy/elementary/data/themes/map_item_1.png b/legacy/elementary/data/themes/map_item_1.png
deleted file mode 100644
index da9b580c3776a388808cca2229a719fb6360a2b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2669
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
bZ@~WmP+WDwGsb#y00000NkvXXu0mjff-vdX

diff --git a/legacy/elementary/data/themes/map_item_2.png b/legacy/elementary/data/themes/map_item_2.png
deleted file mode 100644
index f92ebfac5d9f657a0b5a76b53d8345cbcd5800d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2578
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

diff --git a/legacy/elementary/data/themes/widgets/map.edc b/legacy/elementary/data/themes/widgets/map.edc
index 367147d54a..a4edd896e2 100644
--- a/legacy/elementary/data/themes/widgets/map.edc
+++ b/legacy/elementary/data/themes/widgets/map.edc
@@ -497,7 +497,7 @@ group { name: "elm/map/marker/radio/default";
       item: size_max_h 58;
    }
    images {
-      image: "radio2.png" COMP;
+      image: "map_item.png" COMP;
    }
    parts {
       part { name: "whole";
@@ -508,7 +508,8 @@ group { name: "elm/map/marker/radio/default";
       part { name: "base";
          ignore_flags: ON_HOLD;
          description { state: "default" 0.0;
-            image.normal: "radio2.png";
+            image.normal: "map_item.png";
+            min: 24 24;
          }
       }
       part { name: "elm.icon";
@@ -518,6 +519,7 @@ group { name: "elm/map/marker/radio/default";
          description { state: "default" 0.0;
             rel1.relative: 0.27 0.27;
             rel2.relative: 0.73 0.73;
+            min: 24 24;
          }
       }
       part { name: "elm.text";
@@ -553,56 +555,7 @@ group { name: "elm/map/marker/radio/default";
       }
    }
 }
-group { name: "elm/map/marker/radio2/default";
-   data {
-      item: size_w 24;
-      item: size_h 24;
-      item: size_max_w 58;
-      item: size_max_h 58;
-   }
-   images {
-      image: "map_item_2.png" COMP;
-   }
-   parts {
-      part { name: "base";
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            image.normal: "map_item_2.png";
-         }
-      }
-      part { name: "elm.text";
-         type:          TEXT;
-         effect:        SOFT_SHADOW;
-         mouse_events:  0;
-         scale: 1;
-         description { state: "default" 0.0;
-            align:    0.5 0.5;
-            color: 224 224 224 255;
-            color3: 0 0 0 64;
-            rel1.relative: 0.28 0.25;
-            rel2.relative: 0.75 0.75;
-            text {
-               font:     "Sans,Edje-Vera";
-               size:     10;
-               min:      0 0;
-               align:    0.5 0.5;
-            }
-         }
-      }
-   }
-   programs {
-      program { name: "open";
-         signal: "mouse,clicked,1";
-         source: "base";
-         action: SIGNAL_EMIT "open" "elm";
-      }
-      program { name: "bringin";
-         signal: "mouse,down,1,double";
-         source: "base";
-         action: SIGNAL_EMIT "bringin" "elm";
-      }
-   }
-}
+
 group { name: "elm/map/marker/empty/default";
    data {
       item: size_w 22;
@@ -627,6 +580,7 @@ group { name: "elm/map/marker/empty/default";
          clip_to: "whole";
          mouse_events:  0;
          description { state: "default" 0.0;
+            min: 24 24;
          }
       }
       part { name: "elm.text";
@@ -718,7 +672,7 @@ group { name: "elm/map/marker_bubble/default";
       part { name: "shine";
          mouse_events:  0;
          clip_to: "clipper";
-         description { state:    "default" 0.0;
+         description { state: "default" 0.0;
             rel1 {
                to: "base0";
             }
diff --git a/legacy/elementary/src/bin/test_map.c b/legacy/elementary/src/bin/test_map.c
index 69842c2001..2076c7192a 100644
--- a/legacy/elementary/src/bin/test_map.c
+++ b/legacy/elementary/src/bin/test_map.c
@@ -117,6 +117,7 @@ _label_get(Evas_Object *obj)
    Evas_Object *label;
    label = elm_label_add(obj);
    elm_object_text_set(label, "Here is a parking lot.");
+   evas_object_show(label);
    return label;
 }
 
diff --git a/legacy/elementary/src/lib/elm_map.c b/legacy/elementary/src/lib/elm_map.c
index da5a8b9375..b83391754c 100644
--- a/legacy/elementary/src/lib/elm_map.c
+++ b/legacy/elementary/src/lib/elm_map.c
@@ -1372,29 +1372,25 @@ _region_max_min_get(Eina_List *overlays,
 }
 
 static Evas_Object *
-_icon_dup(const Evas_Object *icon,
+_icon_dup(Evas_Object *icon,
           Evas_Object *parent)
 {
-   // Evas_Object do not support object duplication??
-   const char *file = NULL, *group = NULL;
-   Eina_Bool size_up, size_down;
    Evas_Object *dupp;
+   Evas_Coord w, h;
 
    if (!icon || !parent) return NULL;
-
-   dupp = elm_icon_add(parent);
-   elm_image_file_get(icon, &file, &group);
-   elm_image_file_set(dupp, file, group);
-   elm_image_animated_set(dupp, elm_image_animated_get(icon));
-   elm_image_animated_play_set(dupp, elm_image_animated_play_get(icon));
-   elm_icon_standard_set(dupp, elm_icon_standard_get(icon));
-   elm_icon_order_lookup_set(dupp, elm_icon_order_lookup_get(icon));
-   elm_image_no_scale_set(dupp, elm_image_no_scale_get(icon));
-   elm_image_resizable_get(icon, &size_up, &size_down);
-   elm_image_resizable_set(dupp, size_up, size_down);
-   elm_image_fill_outside_set(dupp, elm_image_fill_outside_get(icon));
-   elm_image_prescale_set(dupp, elm_image_prescale_get(icon));
-   elm_image_aspect_fixed_set(dupp, elm_image_aspect_fixed_get(icon));
+   dupp = evas_object_image_filled_add(evas_object_evas_get(parent));
+   evas_object_image_source_set(dupp, icon);
+   // Set size as origin' sizse for proxy
+   evas_object_geometry_get(icon, NULL, NULL, &w, &h);
+   if (w <= 0 || h <= 0)
+     {
+        evas_object_size_hint_min_get(icon, &w, &h);
+        evas_object_size_hint_min_set(dupp, w, h);
+     }
+   else evas_object_resize(dupp, w, h);
+   // Original should have size for proxy
+   evas_object_resize(icon, w, h);
 
    return dupp;
 }
@@ -1441,6 +1437,8 @@ _overlay_default_show(Overlay_Default *ovl)
         disp = ovl->content;
         evas_object_geometry_get(disp, NULL, NULL, &w, &h);
         if (w <= 0 || h <= 0) evas_object_size_hint_min_get(disp, &w, &h);
+		ovl->w = w;
+		ovl->h = h;
      }
    else if (!(ovl->icon) && ovl->clas_content)
      {
@@ -1521,17 +1519,6 @@ _overlay_default_content_update(Overlay_Default *ovl,
                                     _overlay_clicked_cb, overlay);
 }
 
-static void
-_overlay_default_class_content_update(Overlay_Default *ovl,
-                                      const Evas_Object *content __UNUSED__)
-{
-   EINA_SAFETY_ON_NULL_RETURN(ovl);
-
-   if (ovl->clas_content) evas_object_del(ovl->clas_content);
-   // Evas_Object can not be duplicated.
-   //ovl->clas_content = _content_dup(content);
-}
-
 static void
 _overlay_default_layout_update(Overlay_Default *ovl)
 {
@@ -1563,6 +1550,17 @@ _overlay_default_layout_update(Overlay_Default *ovl)
      }
 }
 
+static void
+_overlay_default_class_content_update(Overlay_Default *ovl,
+                                      Evas_Object *content)
+{
+   EINA_SAFETY_ON_NULL_RETURN(ovl);
+
+   if (ovl->clas_content) evas_object_del(ovl->clas_content);
+   ovl->clas_content = _icon_dup(content, ovl->layout);
+   _overlay_default_layout_update(ovl);
+}
+
 static void
 _overlay_default_icon_update(Overlay_Default *ovl,
                              Evas_Object *icon)
@@ -1578,7 +1576,7 @@ _overlay_default_icon_update(Overlay_Default *ovl,
 
 static void
 _overlay_default_class_icon_update(Overlay_Default *ovl,
-                                   const Evas_Object *icon)
+                                   Evas_Object *icon)
 {
    EINA_SAFETY_ON_NULL_RETURN(ovl);
 
@@ -1682,7 +1680,7 @@ _overlay_group_coord_member_update(Overlay_Group *grp,
 
 static void
 _overlay_group_icon_update(Overlay_Group *grp,
-                           const Evas_Object *icon)
+                           Evas_Object *icon)
 {
    EINA_SAFETY_ON_NULL_RETURN(grp);
 
@@ -1692,13 +1690,15 @@ _overlay_group_icon_update(Overlay_Group *grp,
 }
 
 static void
-_overlay_group_content_update(Overlay_Group *grp __UNUSED__,
-                              const Evas_Object *content __UNUSED__)
+_overlay_group_content_update(Overlay_Group *grp,
+                              Evas_Object *content,
+                              Elm_Map_Overlay *overlay)
 {
    EINA_SAFETY_ON_NULL_RETURN(grp);
 
-   // Evas_Object can not be duplicated.
-   //_overlay_default_content_update(grp->ovl, _content_dup(content));
+   _overlay_default_content_update
+      (grp->ovl, _icon_dup(content, ELM_WIDGET_DATA(grp->wsd)->obj), overlay);
+
    return;
 }
 
@@ -1778,6 +1778,10 @@ _overlay_class_icon_update(Overlay_Class *ovl,
    if (ovl->icon == icon) return;
    if (ovl->icon) evas_object_del(ovl->icon);
    ovl->icon = icon;
+   // For using proxy, it should have size and be shown but moved away to hide.
+   evas_object_resize(icon, 32, 32);
+   evas_object_move(icon, -9999, -9999);
+   evas_object_show(icon);
 
    // Update class members' class icons
    EINA_LIST_FOREACH(ovl->members, l, overlay)
@@ -1801,11 +1805,14 @@ _overlay_class_content_update(Overlay_Class *ovl,
    if (ovl->content == content) return;
    if (ovl->content) evas_object_del(ovl->content);
    ovl->content = content;
+   // For using proxy, it should have size and be shown but moved away to hide.
+   // content should have it's own size
+   evas_object_move(content, -9999, -9999);
 
    // Update class members' class contents
    EINA_LIST_FOREACH(ovl->members, l, overlay)
      {
-        _overlay_group_content_update(overlay->grp, content);
+        _overlay_group_content_update(overlay->grp, content, overlay);
 
         if (overlay->type == ELM_MAP_OVERLAY_TYPE_DEFAULT)
           _overlay_default_class_content_update(overlay->ovl, content);
@@ -1838,7 +1845,7 @@ _overlay_class_free(Overlay_Class *clas)
    EINA_LIST_FOREACH(clas->members, l, overlay)
      {
         overlay->grp->klass = NULL;
-        _overlay_group_content_update(overlay->grp, NULL);
+        _overlay_group_content_update(overlay->grp, NULL, NULL);
         _overlay_group_icon_update(overlay->grp, NULL);
 
         if (overlay->type == ELM_MAP_OVERLAY_TYPE_DEFAULT)
@@ -5661,7 +5668,7 @@ elm_map_overlay_class_append(Elm_Map_Overlay *klass,
    // Update group by class
    overlay->grp->klass = klass;
    _overlay_group_icon_update(overlay->grp, class_ovl->icon);
-   _overlay_group_content_update(overlay->grp, class_ovl->content);
+   _overlay_group_content_update(overlay->grp, class_ovl->content, overlay);
    _overlay_group_color_update(overlay->grp, klass->c);
    _overlay_group_cb_set(overlay->grp, klass->cb, klass->data);
    if (overlay->type == ELM_MAP_OVERLAY_TYPE_DEFAULT)
@@ -5696,7 +5703,7 @@ elm_map_overlay_class_remove(Elm_Map_Overlay *klass,
 
    overlay->grp->klass = NULL;
    _overlay_group_icon_update(overlay->grp, NULL);
-   _overlay_group_content_update(overlay->grp, NULL);
+   _overlay_group_content_update(overlay->grp, NULL, NULL);
    if (overlay->type == ELM_MAP_OVERLAY_TYPE_DEFAULT)
      {
         _overlay_default_class_icon_update(overlay->ovl, NULL);