[Refactoring] Badge : removed undefined images and styles

Conflicts:

	themes/widgets/badge.edc

Change-Id: I27dbbca21d58ac79e56ce7a3204b8071b3c1c1c9

diff --git a/themes/images/tizen-hd/Others/00_badge_34x34.png b/themes/images/tizen-hd/Others/00_badge_34x34.png
deleted file mode 100644 (file)
index 326ca8c..0000000
Binary files a/themes/images/tizen-hd/Others/00_badge_34x34.png and /dev/null differ

diff --git a/themes/images/tizen-hd/Others/00_badge_40x40.png b/themes/images/tizen-hd/Others/00_badge_40x40.png
deleted file mode 100644 (file)
index 4b08ae1..0000000
Binary files a/themes/images/tizen-hd/Others/00_badge_40x40.png and /dev/null differ

diff --git a/themes/widgets/badge.edc b/themes/widgets/badge.edc
index 34b2650..4a5334d 100644 (file)
--- a/themes/widgets/badge.edc
+++ b/themes/widgets/badge.edc
@@ -15,198 +15,109 @@
  * limitations under the License.
  */
 
-
-
-#define STYLE1_ICON_W                  50
-#define STYLE1_ICON_H                   50
-#define STYLE1_BADGE_W                  34
-#define STYLE1_BADGE_H                  34
-#define STYLE1_BADGE_BORDER            16
-#define STYLE1_BADGE_PADDING             8
-#define STYLE1_BADGE_OVER_X              8
-#define STYLE1_BADGE_OVER_Y             -6
-
-#define STYLE2_ICON_W                   50
-#define STYLE2_ICON_H                   50
-#define STYLE2_BADGE_W                  40
-#define STYLE2_BADGE_H                  40
-#define STYLE2_BADGE_BORDER             19
-#define STYLE2_BADGE_PADDING             8
-#define STYLE2_BADGE_OVER_X              2
-#define STYLE2_BADGE_OVER_Y             -8
-
 group
 {
-        name: "elm/icon_badge/base/style1";
-
-        images {
-                image : "00_badge_34x34.png" COMP;
-        }
-
-        parts {
-                part {
-                        name: "elm.icon";
-                        type: SWALLOW;
-                        scale: 1;
-                        description {
-                                state: "default" 0.0;
-                                min: STYLE1_ICON_W STYLE1_ICON_H;
-                                rel1 { relative: 0.0 0.0; }
-                                rel2 { relative: 1.0 1.0; }
-                        }
-                }
-
-                part {
-                        name: "elm.badge.bg";
-                        type: IMAGE;
-                        scale: 1;
-                        description {
-                                state: "default" 0.0;
-                                rel1 { relative: 0.0 0.0; to_x: "elm.badge.padding.left"; to_y: "elm.badge.text"; }
-                                rel2 { relative: 1.0 1.0; to_x: "elm.badge.padding.right"; to_y: "elm.badge.text"; }
-                                image.normal: "00_badge_34x34.png";
-                                image.border: STYLE1_BADGE_BORDER STYLE1_BADGE_BORDER STYLE1_BADGE_BORDER STYLE1_BADGE_BORDER;
-                                image.border_scale:1;
-                        }
-                }
-
-                part {
-                        name: "elm.badge.text";
-                       type: TEXT;
-                        scale: 1;
-                        description {
-                                state: "default" 0.0;
-                                fixed: 1 1;
-                                align: 1.0 0.5;
-                                rel1 { relative: (STYLE1_ICON_W-STYLE1_BADGE_W+STYLE1_BADGE_OVER_X+STYLE1_BADGE_PADDING)/STYLE1_ICON_W (STYLE1_BADGE_OVER_Y)/STYLE1_ICON_H; to: "elm.icon"; }
-                                rel2 { relative: (STYLE1_ICON_W+STYLE1_BADGE_OVER_X-STYLE1_BADGE_PADDING)/STYLE1_ICON_W (STYLE1_BADGE_H+STYLE1_BADGE_OVER_Y)/STYLE1_ICON_H; to: "elm.icon"; }
-                                text {
-                                        font: "Tizen";
-                                        size: 20;
-                                        min: 1 1;
-                                        align: 0.5 0.5;
-                                        text_class: "tizen";
-                                }
-                                color: 255 255 255 255;
-                        }
-                }
-
-                part {
-                        name: "elm.badge.padding.left";
-                        type: RECT;
-                        scale : 1;
-                        description {
-                                state: "default" 0.0;
-                                min: STYLE1_BADGE_PADDING 0;
-                                fixed: 1 0;
-                                align: 1.0 0.0;
-                                rel1 { relative: 0.0 0.0; to: "elm.badge.text"; }
-                                rel2 { relative: 0.0 1.0; to: "elm.badge.text"; }
-                                color: 0 0 0 0;
-                        }
-                }
-
-                part {
-                        name: "elm.badge.padding.right";
-                        type: RECT;
-                        scale : 1;
-                        description {
-                                state: "default" 0.0;
-                                min: STYLE1_BADGE_PADDING 0;
-                                fixed: 1 0;
-                                align: 0.0 0.0;
-                                rel1 { relative: 1.0 0.0; to: "elm.badge.text"; }
-                                rel2 { relative: 1.0 1.0; to: "elm.badge.text"; }
-                                color: 0 0 0 0;
-                        }
-                }
-        }
+   name: "elm/icon_badge/base/default";
+
+   images {
+      image : "00_badge_bg.png" COMP;
+   }
+
+   parts {
+      part { name: "elm.image.badge";
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            min: 54 54;
+            fixed: 1 1;
+            rel1 {
+               to: "left.padding.text";
+               relative: 0.0 0.0;
+            }
+            rel2 {
+               to: "right.padding.text";
+               relative: 1.0 1.0;
+            }
+            image {
+               normal: "00_badge_bg.png";
+               border: 29 24 0 0;
+               border_scale: 1;
+            }
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "left.padding.text";
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            fixed: 1 1;
+            min: 13 54;
+            rel1 {
+               to: "elm.text.badge";
+               relative: 0.0 1.0;
+            }
+            rel2 {
+               to: "elm.text.badge";
+               relative: 0.0 1.0;
+            }
+            align: 1.0 1.0;
+         }
+      }
+      part { name: "right.padding.text";
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            fixed: 1 1;
+            min: 8 54;
+            rel1 {
+               to: "elm.image.badge";
+               relative: 1.0 0.0;
+            }
+            rel2 {
+               to: "elm.image.badge";
+               relative: 1.0 0.0;
+            }
+            align: 1.0 1.0;
+         }
+      }
+      part { name: "elm.text.badge";
+         type: TEXT;
+         mouse_events: 0;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            rel1 {
+               to: "right.padding.text";
+               relative: 0.0 0.0;
+            }
+            rel2 {
+               to: "right.padding.text";
+               relative: 0.0 1.0;
+            }
+            min: 25 0;
+            fixed: 1 0;
+            align: 1.0 0.5;
+            color: 10 100 208 255;
+            text {
+               font: "Tizen:style=Bold";
+               size: 26;
+               min: 1 1;
+            }
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+   }
 }
 
-group
-{
-        name: "elm/icon_badge/base/style2";
-
-        images {
-                image : "00_badge_40x40.png" COMP;
-        }
-
-        parts {
-                part {
-                        name: "elm.icon";
-                        type: SWALLOW;
-                        scale: 1;
-                        description {
-                                state: "default" 0.0;
-                                min: STYLE2_ICON_W STYLE2_ICON_H;
-                                rel1 { relative: 0.0 0.0; }
-                                rel2 { relative: 1.0 1.0; }
-                        }
-                }
-
-                part {
-                        name: "elm.badge.bg";
-                        type: IMAGE;
-                        scale: 1;
-                        description {
-                                state: "default" 0.0;
-                                rel1 { relative: 0.0 0.0; to_x: "elm.badge.padding.left"; to_y: "elm.badge.text"; }
-                                rel2 { relative: 1.0 1.0; to_x: "elm.badge.padding.right"; to_y: "elm.badge.text"; }
-                                image.normal: "00_badge_40x40.png";
-                                image.border: STYLE2_BADGE_BORDER STYLE2_BADGE_BORDER STYLE2_BADGE_BORDER STYLE2_BADGE_BORDER;
-                                image.border_scale:1;
-                        }
-                }
-
-                part {
-                        name: "elm.badge.text";
-                        type: TEXT;
-                        scale: 1;
-                        description {
-                                state: "default" 0.0;
-                                fixed: 1 1;
-                                align: 1.0 0.5;
-                                rel1 { relative: (STYLE2_ICON_W-STYLE2_BADGE_W+STYLE2_BADGE_OVER_X+STYLE2_BADGE_PADDING)/STYLE2_ICON_W (STYLE2_BADGE_OVER_Y)/STYLE2_ICON_H; to: "elm.icon"; }
-                                rel2 { relative: (STYLE2_ICON_W+STYLE2_BADGE_OVER_X-STYLE2_BADGE_PADDING)/STYLE2_ICON_W (STYLE2_BADGE_H+STYLE2_BADGE_OVER_Y)/STYLE2_ICON_H; to: "elm.icon"; }
-                                text {
-                                        font: "Tizen";
-                                        size: 22;
-                                        min: 1 1;
-                                        align: 0.6 0.48;
-                                        text_class: "tizen";
-                                }
-                                color: 255 255 255 255;
-                        }
-                }
-
-                part {
-                        name: "elm.badge.padding.left";
-                        type: RECT;
-                        scale : 1;
-                        description {
-                                state: "default" 0.0;
-                                min: STYLE2_BADGE_PADDING 0;
-                                fixed: 1 0;
-                                align: 1.0 0.0;
-                                rel1 { relative: 0.0 0.0; to: "elm.badge.text"; }
-                                rel2 { relative: 0.0 1.0; to: "elm.badge.text"; }
-                                color: 0 0 0 0;
-                        }
-                }
-
-                part {
-                        name: "elm.badge.padding.right";
-                        type: RECT;
-                        scale : 1;
-                        description {
-                                state: "default" 0.0;
-                                min: STYLE2_BADGE_PADDING 0;
-                                fixed: 1 0;
-                                align: 0.0 0.0;
-                                rel1 { relative: 1.0 0.0; to: "elm.badge.text"; }
-                                rel2 { relative: 1.0 1.0; to: "elm.badge.text"; }
-                                color: 0 0 0 0;
-                        }
-                }
-        }
-}