TizenRefApp-7920 Implement use of the same thumbnail image for landscape and portrait...

Change-Id: I740fa90e5223ce544b87191a8b893a5fc0d9d994
Signed-off-by: Iryna Ferenchak <i.ferenchak@samsung.com>

diff --git a/lib-common/res/item/edje/MemoItemLayout.h b/lib-common/res/item/edje/MemoItemLayout.h
index 0e6a02aeb92223b8d3850ddfb24230c91ddae4d3..cceb95074ece7d437abd0e3b5c8f782d6cd93246 100644 (file)
--- a/lib-common/res/item/edje/MemoItemLayout.h
+++ b/lib-common/res/item/edje/MemoItemLayout.h
@@ -22,7 +22,6 @@
 #define STYLE_ITEM_MEMO         "memo"
 
 #define LAYOUT_MEMO_SOUND       "memo_sound"
-#define LAYOUT_MEMO_IMAGE       "memo_image"
 #define LAYOUT_MEMO_BG          "memo_bg"
 
 #define LAYOUT_SUBITEM_TEXT     "subitem_text"

diff --git a/lib-common/res/item/edje/memo-item.edc b/lib-common/res/item/edje/memo-item.edc
index d12585ad878c058380a2c3f075651c89d1cf46bc..986a5ea1d65960b6625180e05e45c257b86b1099 100644 (file)
--- a/lib-common/res/item/edje/memo-item.edc
+++ b/lib-common/res/item/edje/memo-item.edc
@@ -82,39 +82,6 @@ collections {
                }
        }
 
-       group { LAYOUT_MEMO_IMAGE;
-               parts {
-                       spacer { "spacer.left_top"; scale;
-                               desc { "default";
-                                       min: IMAGE_LTRB IMAGE_LTRB;
-                                       align: 0.0 0.0;
-                                       rel2.relative: 0.0 0.0;
-                               }
-                       }
-                       spacer { "spacer.right_bottom"; scale;
-                               desc { "default";
-                                       min: IMAGE_LTRB IMAGE_LTRB;
-                                       align: 1.0 1.0;
-                                       rel1.relative: 1.0 1.0;
-                               }
-                       }
-                       image { "image.mask"; precise;
-                               desc { "default";
-                                       rel1 { relative: 1.0 1.0; to: "spacer.left_top"; }
-                                       rel2 { relative: 0.0 0.0; to: "spacer.right_bottom"; }
-                                       image.normal: MEMO_BG;
-                               }
-                       }
-                       swallow { PART_IMAGE;
-                               clip: "image.mask";
-                               desc { "default";
-                                       rel1.to: "image.mask";
-                                       rel2.to: "image.mask";
-                               }
-                       }
-               }
-       }
-
        group { "elm/gengrid/item/"STYLE_ITEM_MEMO"/default";
                data.item: "texts" PART_TITLE;
                data.item: "contents" PART_BG" "PART_CHECK" "PART_CONTENT" "PART_IMAGE;
@@ -221,13 +188,39 @@ collections {
                                        rel2 { relative: 0.0 0.0; to_x: PART_CHECK; to_y: PART_SOUND; }
                                }
                        }
-                       swallow { PART_IMAGE;
-                               before: "image.effect_bg";
+                       spacer { "spacer.image.left_top"; scale;
                                desc { "default";
+                                       min: IMAGE_LTRB IMAGE_LTRB;
+                                       align: 0.0 0.0;
                                        rel1 { relative: 0.0 1.0; to_x: PART_BG; to_y: "spacer.title.bottom"; }
-                                       rel2.to: PART_BG;
+                                       rel2 { relative: 0.0 1.0; to_x: PART_BG; to_y: "spacer.title.bottom"; }
                                }
                                desc { "full";
+                                       min: IMAGE_LTRB IMAGE_LTRB;
+                                       align: 0.0 0.0;
+                                       rel1.to: PART_BG;
+                                       rel2 { relative: 0.0 0.0; to: PART_BG; }
+                               }
+                       }
+                       spacer { "spacer.image.right_bottom"; scale;
+                               desc { "default";
+                                       min: IMAGE_LTRB IMAGE_LTRB;
+                                       align: 1.0 1.0;
+                                       rel1 { relative: 1.0 1.0; to: PART_BG; }
+                                       rel2.to: PART_BG;
+                               }
+                       }
+                       image { "image.mask"; precise;
+                               desc { "default";
+                                       rel1 { relative: 1.0 1.0; to: "spacer.image.left_top"; }
+                                       rel2 { relative: 0.0 0.0; to: "spacer.image.right_bottom"; }
+                                       image.normal: MEMO_BG;
+                               }
+                       }
+                       swallow { PART_IMAGE;
+                               before: "image.effect_bg";
+                               clip: "image.mask";
+                               desc { "default";
                                        rel1.to: PART_BG;
                                        rel2.to: PART_BG;
                                }
@@ -263,14 +256,14 @@ collections {
                                source: "elm";
                                action: STATE_SET "default" 0.0;
                                target: PART_CONTENT;
-                               target: PART_IMAGE;
+                               target: "spacer.image.left_top";
                        }
                        program {
                                signal: "elm,state,"PART_TITLE",passive";
                                source: "elm";
                                action: STATE_SET "full" 0.0;
                                target: PART_CONTENT;
-                               target: PART_IMAGE;
+                               target: "spacer.image.left_top";
                        }
                        program {
                                signal: "elm,state,"PART_CONTENT",active";

diff --git a/lib-common/src/Common/MemoItem.cpp b/lib-common/src/Common/MemoItem.cpp
index d7959fdc6a2968437436b88322701f363e7c6add..4a1d42b65273cbc6f1b4c8f47d14116d2f3bd2f4 100644 (file)
--- a/lib-common/src/Common/MemoItem.cpp
+++ b/lib-common/src/Common/MemoItem.cpp
@@ -173,15 +173,11 @@ Evas_Object *MemoItem::createContent(Evas_Object *parent) const
 
 Evas_Object *MemoItem::createImage(Evas_Object *parent) const
 {
-       Evas_Object *layout = elm_layout_add(parent);
-       elm_layout_file_set(layout, App::getResourcePath(MEMO_ITEM_EDJ).c_str(), LAYOUT_MEMO_IMAGE);
-
-       Evas_Object *image = elm_image_add(layout);
+       Evas_Object *image = elm_image_add(parent);
        elm_image_aspect_fixed_set(image, EINA_FALSE);
        elm_image_file_set(image, m_Memo.getThumbnail().getPath().c_str(), nullptr);
-       elm_object_part_content_set(layout, PART_IMAGE, image);
 
-       return layout;
+       return image;
 }
 
 Evas_Object *MemoItem::createBg(Evas_Object *parent, const Color &color) const