rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=7fa341e876842c1f9190466f3b601ded375f0c4c

commit 7fa341e876842c1f9190466f3b601ded375f0c4c
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date:   Wed Dec 14 14:04:59 2016 +0200

    thumbs: replase thumbs to image special for Windows
    
    Thumbs does not work on windows now. We have some fixes but now fully.
    Special for Windows replace thumbs to image. This is temporary
    solution, it's make posible to work with image resource on Windows.
    Yes, if edj project consist many images, Image manager in Eflete will be
    open very slow, but it work nad user can see images.
    
    After fix ethumb on Windows this commit should be revert.
    
    Change-Id: If3f161e76b34544ecaf47a2ec0bbf8386613f76a
---
 src/bin/ui/image_manager.c | 19 +++++++++++++++++++
 src/bin/ui/popup.c         |  9 ++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/bin/ui/image_manager.c b/src/bin/ui/image_manager.c
index e1eed2e..5099f5d 100644
--- a/src/bin/ui/image_manager.c
+++ b/src/bin/ui/image_manager.c
@@ -85,6 +85,7 @@ _image_manager_image_setup(Evas_Object *image,
    assert(image != NULL);
    assert(it != NULL);
 
+#ifndef _WIN32
    if (it->comp_type == EDJE_EDIT_IMAGE_COMP_USER)
      {
         if (ecore_file_exists(it->source))
@@ -96,6 +97,20 @@ _image_manager_image_setup(Evas_Object *image,
      {
         elm_thumb_file_set(image, it->source, NULL);
      }
+#else
+   TODO("Remove this urgly hack when we fix thumbs on Windows")
+   if (it->comp_type == EDJE_EDIT_IMAGE_COMP_USER)
+     {
+        if (ecore_file_exists(it->source))
+          elm_image_file_set(image, it->source, NULL);
+        else
+          elm_image_file_set(image, ap.path.theme_edj, 
"elm/image/icon/attention");
+     }
+   else
+     {
+        elm_image_file_set(image, it->source, NULL);
+     }
+#endif /* _WIN32 */
 }
 
 static inline Evas_Object *
@@ -126,7 +141,11 @@ _grid_content_get(void *data,
 
    if (!strcmp(part, "elm.swallow.icon"))
      {
+#ifndef _WIN32
         image_obj = elm_thumb_add(grid);
+#else
+        image_obj = elm_image_add(grid);
+#endif /* _win32 */
         elm_object_style_set(image_obj, "noframe");
         _image_manager_image_setup(image_obj, it);
         evas_object_show(image_obj);
diff --git a/src/bin/ui/popup.c b/src/bin/ui/popup.c
index a90b43f..29809e2 100644
--- a/src/bin/ui/popup.c
+++ b/src/bin/ui/popup.c
@@ -784,10 +784,17 @@ _grid_content_get(void *data,
 
    if (!strcmp(part, "elm.swallow.icon"))
      {
+#ifndef _WIN32
         image_obj = elm_thumb_add(grid);
-        elm_object_style_set(image_obj, "noframe");
         if (strcmp(it->image_name, EFLETE_DUMMY_IMAGE_NAME) != 0)
           elm_thumb_file_set(image_obj, it->source, NULL);
+#else
+        TODO("Remove this urgly hack when we fix thumbs on Windows")
+        image_obj = elm_image_add(grid);
+        if (strcmp(it->image_name, EFLETE_DUMMY_IMAGE_NAME) != 0)
+          elm_image_file_set(image_obj, it->source, NULL);
+#endif /* _WIN32 */
+        elm_object_style_set(image_obj, "noframe");
         evas_object_show(image_obj);
      }
    else if ((!strcmp(part, "elm.swallow.end") && (strcmp(it->image_name, 
EFLETE_DUMMY_IMAGE_NAME) != 0)))

-- 


Reply via email to