Fixed: thumbnails size.

Change-Id: I866fcb1d72a099ace22eafbd1a76ad898430b3c1
Signed-off-by: Denis Dolzhenko <d.dolzhenko@samsung.com>

diff --git a/src/Common/Utils/inc/ThumbnailMaker.h b/src/Common/Utils/inc/ThumbnailMaker.h
index 10827007e0ad7d9e426cf04139134f440ce18619..da37b66a682f85da2603fffa500a625272dae7ca 100644 (file)
--- a/src/Common/Utils/inc/ThumbnailMaker.h
+++ b/src/Common/Utils/inc/ThumbnailMaker.h
@@ -61,7 +61,8 @@ namespace Msg
         private:
             void invalidate();
             ThumbId getThumbIdFromFile(const std::string &path);
-            Evas_Object *makeFace(Evas_Object *parent, const std::string &path);
+            Evas_Object *makeMask(Evas_Object *parent, int size);
+            Evas_Object *makeImage(Evas_Object *parent, const std::string &path, int size);
             Evas_Object *makeOriginThumb(Evas_Object *parent, const std::string &path);
             Evas_Object *makeDefaultOriginThumb(Evas_Object *parent, const std::string &path);
             const std::string &defaultThumbsToStr(DefaultThumbs thumb);

diff --git a/src/Common/Utils/src/ThumbnailMaker.cpp b/src/Common/Utils/src/ThumbnailMaker.cpp
index 2b3c8d3d4a41780c830acdaec316fa5058cb7f98..21f95e47446e0a31eb3c7b5406fe3aac07557bcb 100644 (file)
--- a/src/Common/Utils/src/ThumbnailMaker.cpp
+++ b/src/Common/Utils/src/ThumbnailMaker.cpp
@@ -131,35 +131,26 @@ Evas_Object *ThumbnailMaker::getThumb(Evas_Object *parent, ThumbId id, int thumb
 
 Evas_Object *ThumbnailMaker::getThumb(Evas_Object *parent, const std::string &path, int thumbSize)
 {
-    Evas_Object *ic = elm_layout_add(parent);
-    std::string edjePath = PathUtils::getResourcePath(THUMBNAIL_EDJ_PATH);
-    elm_layout_file_set(ic, edjePath.c_str(), MSG_THUMB_STYLE_LIST);
+    int scaledThumbSize = ELM_SCALE_SIZE(thumbSize);
 
-    Evas_Object *img = makeFace(ic, path);
+    Evas_Object *ic = makeMask(parent, scaledThumbSize);
+    Evas_Object *img = makeImage(ic, path, scaledThumbSize);
     elm_object_part_content_set(ic, "content", img);
-    int scaledThumbSize = ELM_SCALE_SIZE(thumbSize);
-    evas_object_resize(ic, scaledThumbSize, scaledThumbSize);
-    evas_object_show(ic);
     return ic;
 }
 
 Evas_Object *ThumbnailMaker::makeOriginThumb(Evas_Object *parent, const std::string &path)
 {
-    Evas_Object *ic = elm_layout_add(parent);
-    std::string edjePath = PathUtils::getResourcePath(THUMBNAIL_EDJ_PATH);
-    elm_layout_file_set(ic, edjePath.c_str(), MSG_THUMB_STYLE_LIST);
-
-    Evas_Object *img = makeFace(ic, path);
+    Evas_Object *ic = makeMask(parent, DEFAULT_THUMB_SIZE);
+    Evas_Object *img = makeImage(ic, path, DEFAULT_THUMB_SIZE);
     elm_object_part_content_set(ic, "content", img);
-    evas_object_resize(ic, DEFAULT_THUMB_SIZE, DEFAULT_THUMB_SIZE);
     evas_object_move(ic, -DEFAULT_THUMB_SIZE, -DEFAULT_THUMB_SIZE);
-    evas_object_show(ic);
     return ic;
 }
 
 Evas_Object *ThumbnailMaker::makeDefaultOriginThumb(Evas_Object *parent, const std::string &path)
 {
-    Evas_Object *img = makeFace(parent, path);
+    Evas_Object *img = makeImage(parent, path, DEFAULT_THUMB_SIZE);
     evas_object_color_set(img, COLOR_BLUE);
     evas_object_resize(img, DEFAULT_THUMB_SIZE, DEFAULT_THUMB_SIZE);
     evas_object_move(img, -DEFAULT_THUMB_SIZE, -DEFAULT_THUMB_SIZE);
@@ -167,17 +158,27 @@ Evas_Object *ThumbnailMaker::makeDefaultOriginThumb(Evas_Object *parent, const s
     return img;
 }
 
-Evas_Object *ThumbnailMaker::makeFace(Evas_Object *parent, const std::string &path)
+Evas_Object *ThumbnailMaker::makeImage(Evas_Object *parent, const std::string &path, int size)
 {
     Evas_Object *img = elm_image_add(parent);
     elm_image_file_set(img, path.c_str(), nullptr);
-    evas_object_size_hint_min_set(img, DEFAULT_THUMB_SIZE, DEFAULT_THUMB_SIZE);
-    evas_object_size_hint_max_set(img, DEFAULT_THUMB_SIZE, DEFAULT_THUMB_SIZE);
-    elm_image_aspect_fixed_set(img, EINA_TRUE);
-    elm_image_fill_outside_set(img, EINA_TRUE);
+    evas_object_size_hint_min_set(img, size, size);
+    evas_object_size_hint_max_set(img, size, size);
+    elm_image_aspect_fixed_set(img, true);
+    elm_image_fill_outside_set(img, true);
     return img;
 }
 
+Evas_Object *ThumbnailMaker::makeMask(Evas_Object *parent, int size)
+{
+    Evas_Object *ic = elm_layout_add(parent);
+    static std::string edjePath = PathUtils::getResourcePath(THUMBNAIL_EDJ_PATH);
+    elm_layout_file_set(ic, edjePath.c_str(), MSG_THUMB_STYLE_LIST);
+    evas_object_resize(ic, size, size);
+    evas_object_show(ic);
+    return ic;
+}
+
 void ThumbnailMaker::invalidate()
 {
     MSG_LOG("");