projects / platform / core / appfw / data-provider-slave.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3863d57)
Enable Icon shadow effect option (cairo & efl-assist)
authorSung-jae Park <nicesj.park@samsung.com>
Sat, 26 Oct 2013 08:28:21 +0000 (17:28 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Sat, 26 Oct 2013 08:28:21 +0000 (17:28 +0900)
Change-Id: I5062c5cc66c4749d36f2f68414ea02ca8d45db1a

data/icon.edc patch | blob | history
icon_src/script_handler.c patch | blob | history

diff --git a/data/icon.edc b/data/icon.edc
index cbf17ae..2df2d1c 100644 (file)
--- a/data/icon.edc
+++ b/data/icon.edc
@@ -15,7 +15,6 @@
  */
 
 images {
-       image: "icon_shadow.png" COMP;
        image: "shortcut_bg_1x1.png" COMP;
 }
 
@@ -36,12 +35,12 @@ collections {
 
                        part {
                                name: "bg";
-                               type: IMAGE;
+                               type: RECT;
                                description {
                                        state: "default" 0.0;
                                        rel1 { relative: 23/175 11/175; }
-                                       rel2 { relative: 152/175 140/175; }
-                                       image { normal: "icon_shadow.png"; }
+                                       rel2 { relative: 160/175 150/175; }
+                                       color: 0 0 0 0;
                                        align: 0.5 0.5;
                                        aspect: 1.0 1.0;
                                        aspect_preference: BOTH;
@@ -52,8 +51,8 @@ collections {
                                 name: "icon";
                                 type: SWALLOW;
                                 description {
-                                        rel1 { relative: 6/129 3/129; to, "bg"; }
-                                        rel2 { relative: 123/129 120/129; to, "bg"; }
+                                       rel1 { relative: 6/137 0/139; to, "bg"; }
+                                       rel2 { relative: 131/137 130/139; to, "bg"; } // 117x117 125x127
                                }
                         }
 
@@ -99,14 +98,14 @@ collections {
                parts {
                        part {
                                name: "bg";
-                               type: IMAGE;
+                               type: RECT;
                                description {
                                        state: "default" 0.0;
                                        rel1 { relative: 112.5/354 11/175; }
-                                       rel2 { relative: 241.5/354 140/175; }
-                                       image { normal: "icon_shadow.png"; }
+                                       rel2 { relative: 249.5/354 150/175; }
                                        align: 0.5 0.5;
                                        aspect: 1.0 1.0;
+                                       color: 0 0 0 0;
                                        aspect_preference: BOTH;
                                }
                        }
@@ -115,8 +114,8 @@ collections {
                                 name: "icon";
                                 type: SWALLOW;
                                 description {
-                                        rel1 { relative: 6/129 3/129; to, "bg"; }
-                                        rel2 { relative: 123/129 120/129; to, "bg"; }
+                                       rel1 { relative: 6/137 0/139; to, "bg"; }
+                                       rel2 { relative: 131/137 130/139; to, "bg"; } // 117x117 125x127
                                }
                         }
 
@@ -162,12 +161,12 @@ collections {
                parts {
                        part {
                                name: "bg";
-                               type: IMAGE;
+                               type: RECT;
                                description {
                                        state: "default" 0.0;
                                        rel1 { relative: 112.5/354 100.5/354; }
-                                       rel2 { relative: 241.5/354 229.5/354; }
-                                       image { normal: "icon_shadow.png"; }
+                                       rel2 { relative: 249.5/354 239.5/354; }
+                                       color: 0 0 0 0;
                                        align: 0.5 0.5;
                                        aspect: 1.0 1.0;
                                        aspect_preference: BOTH;
@@ -178,8 +177,8 @@ collections {
                                 name: "icon";
                                 type: SWALLOW;
                                 description {
-                                        rel1 { relative: 6/129 3/129; to, "bg"; }
-                                        rel2 { relative: 123/129 120/129; to, "bg"; }
+                                       rel1 { relative: 6/137 0/139; to, "bg"; }
+                                       rel2 { relative: 131/137 130/139; to, "bg"; } // 117x117 125x127
                                }
                         }
 
@@ -225,12 +224,12 @@ collections {
                parts {
                        part {
                                name: "bg";
-                               type: IMAGE;
+                               type: RECT;
                                description {
                                        state: "default" 0.0;
                                        rel1 { relative: 291.5/712 11/175; }
-                                       rel2 { relative: 420.5/712 140/175; }
-                                       image { normal: "icon_shadow.png"; }
+                                       rel2 { relative: 428.5/712 150/175; }
+                                       color: 0 0 0 0;
                                        align: 0.5 0.5;
                                        aspect: 1.0 1.0;
                                        aspect_preference: BOTH;
@@ -241,8 +240,8 @@ collections {
                                 name: "icon";
                                 type: SWALLOW;
                                 description {
-                                        rel1 { relative: 6/129 3/129; to, "bg"; }
-                                        rel2 { relative: 123/129 120/129; to, "bg"; }
+                                       rel1 { relative: 6/137 0/139; to, "bg"; }
+                                       rel2 { relative: 131/137 130/139; to, "bg"; } // 117x117 125x127
                                }
                         }
 
@@ -288,12 +287,12 @@ collections {
                parts {
                        part {
                                name: "bg";
-                               type: IMAGE;
+                               type: RECT;
                                description {
                                        state: "default" 0.0;
                                        rel1 { relative: 291.5/712 100.5/354; }
-                                       rel2 { relative: 420.5/712 229.5/354; }
-                                       image { normal: "icon_shadow.png"; }
+                                       rel2 { relative: 428.5/712 239.5/354; }
+                                       color: 0 0 0 0;
                                        align: 0.5 0.5;
                                        aspect: 1.0 1.0;
                                        aspect_preference: BOTH;
@@ -304,8 +303,8 @@ collections {
                                 name: "icon";
                                 type: SWALLOW;
                                 description {
-                                        rel1 { relative: 6/129 3/129; to, "bg"; }
-                                        rel2 { relative: 123/129 120/129; to, "bg"; }
+                                       rel1 { relative: 6/137 0/139; to, "bg"; }
+                                       rel2 { relative: 131/137 130/139; to, "bg"; } // 117x117 125x127
                                }
                         }
 
@@ -351,12 +350,12 @@ collections {
                parts {
                        part {
                                name: "bg";
-                               type: IMAGE;
+                               type: RECT;
                                description {
                                        state: "default" 0.0;
                                        rel1 { relative: 291.5/712 190/533; }
-                                       rel2 { relative: 420.5/712 319/533; }
-                                       image { normal: "icon_shadow.png"; }
+                                       rel2 { relative: 428.5/712 329/533; }
+                                       color: 0 0 0 0;
                                        align: 0.5 0.5;
                                        aspect: 1.0 1.0;
                                        aspect_preference: BOTH;
@@ -367,8 +366,8 @@ collections {
                                 name: "icon";
                                 type: SWALLOW;
                                 description {
-                                        rel1 { relative: 6/129 3/129; to, "bg"; }
-                                        rel2 { relative: 123/129 120/129; to, "bg"; }
+                                       rel1 { relative: 6/137 0/139; to, "bg"; }
+                                       rel2 { relative: 131/137 130/139; to, "bg"; } // 117x117 125x127
                                }
                         }
 
@@ -414,12 +413,12 @@ collections {
                parts {
                        part {
                                name: "bg";
-                               type: IMAGE;
+                               type: RECT;
                                description {
                                        state: "default" 0.0;
                                        rel1 { relative: 291.5/712 279.5/712; }
-                                       rel2 { relative: 420.5/712 408.5/712; }
-                                       image { normal: "icon_shadow.png"; }
+                                       rel2 { relative: 428.5/712 418.5/712; }
+                                       color: 0 0 0 0;
                                        align: 0.5 0.5;
                                        aspect: 1.0 1.0;
                                        aspect_preference: BOTH;
@@ -430,8 +429,8 @@ collections {
                                 name: "icon";
                                 type: SWALLOW;
                                 description {
-                                        rel1 { relative: 6/129 3/129; to, "bg"; }
-                                        rel2 { relative: 123/129 120/129; to, "bg"; }
+                                       rel1 { relative: 6/137 0/139; to, "bg"; }
+                                       rel2 { relative: 131/137 130/139; to, "bg"; } // 117x117 125x127
                                }
                         }
 
@@ -477,12 +476,12 @@ collections {
                parts {
                        part {
                                name: "bg";
-                               type: IMAGE;
+                               type: RECT;
                                description {
                                        state: "default" 0.0;
                                        rel1 { relative: 291.5/712 369/891; }
-                                       rel2 { relative: 420.5/712 498/891; }
-                                       image { normal: "icon_shadow.png"; }
+                                       rel2 { relative: 428.5/712 508/891; }
+                                       color: 0 0 0 0;
                                        align: 0.5 0.5;
                                        aspect: 1.0 1.0;
                                        aspect_preference: BOTH;
@@ -493,8 +492,8 @@ collections {
                                 name: "icon";
                                 type: SWALLOW;
                                 description {
-                                        rel1 { relative: 6/129 3/129; to, "bg"; }
-                                        rel2 { relative: 123/129 120/129; to, "bg"; }
+                                       rel1 { relative: 6/137 0/139; to, "bg"; }
+                                       rel2 { relative: 131/137 130/139; to, "bg"; } // 117x117 125x127
                                }
                         }
 
@@ -540,12 +539,12 @@ collections {
                parts {
                        part {
                                name: "bg";
-                               type: IMAGE;
+                               type: RECT;
                                description {
                                        state: "default" 0.0;
                                        rel1 { relative: 291.5/712 458.5/1070; }
-                                       rel2 { relative: 420.5/712 587.5/1070; }
-                                       image { normal: "icon_shadow.png"; }
+                                       rel2 { relative: 428.5/712 597.5/1070; }
+                                       color: 0 0 0 0;
                                        align: 0.5 0.5;
                                        aspect: 1.0 1.0;
                                        aspect_preference: BOTH;
@@ -556,8 +555,8 @@ collections {
                                 name: "icon";
                                 type: SWALLOW;
                                 description {
-                                        rel1 { relative: 6/129 3/129; to, "bg"; }
-                                        rel2 { relative: 123/129 120/129; to, "bg"; }
+                                       rel1 { relative: 6/137 0/139; to, "bg"; }
+                                       rel2 { relative: 131/137 130/139; to, "bg"; } // 117x117 125x127
                                }
                         }
 
diff --git a/icon_src/script_handler.c b/icon_src/script_handler.c
index a57f078..002cb0f 100644 (file)
--- a/icon_src/script_handler.c
+++ b/icon_src/script_handler.c
@@ -699,8 +699,14 @@ static int update_script_image(Evas_Object *edje, struct block *block)
                evas_object_size_hint_weight_set(img, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        }
 
-       if (img_opt.shadow.enabled) {
 #if 0
+       img_opt.shadow.enabled = 1;
+       img_opt.shadow.angle = -90;
+       img_opt.shadow.offset = 2;
+       img_opt.shadow.softness = 4;
+       img_opt.shadow.color = 0x99000000;
+#endif
+       if (img_opt.shadow.enabled) {
                ea_effect_h *ea_effect;
 
                ea_effect = ea_image_effect_create();
@@ -718,7 +724,6 @@ static int update_script_image(Evas_Object *edje, struct block *block)
 
                        ea_image_effect_destroy(ea_effect);
                }
-#endif
        }
 
        /*!
Domain: App Framework / Application Utility;