projects / platform / core / appfw / data-provider-slave.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2e16c24)
Revert icon shadow effect apply code
authorSung-jae Park <nicesj.park@samsung.com>
Fri, 25 Oct 2013 08:40:04 +0000 (17:40 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Fri, 25 Oct 2013 08:40:04 +0000 (17:40 +0900)
Change-Id: I7e6a3d0f1f9c9c01c658f8336f90859421e5ccf4

data/icon.edc patch | blob | history
icon_src/script_handler.c patch | blob | history
packaging/com.samsung.data-provider-slave.spec patch | blob | history

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