From a39fa6452c8b46e7b360b41a70c9de265c875b1c Mon Sep 17 00:00:00 2001 From: Jung Chanwook Date: Fri, 10 May 2013 10:45:55 +0900 Subject: [PATCH] [Refactoring] Badge : removed undefined images and styles Conflicts: themes/widgets/badge.edc Change-Id: I27dbbca21d58ac79e56ce7a3204b8071b3c1c1c9 --- themes/images/tizen-hd/Others/00_badge_34x34.png | Bin 3883 -> 0 bytes themes/images/tizen-hd/Others/00_badge_40x40.png | Bin 4029 -> 0 bytes themes/widgets/badge.edc | 293 ++++++++--------------- 3 files changed, 102 insertions(+), 191 deletions(-) delete mode 100644 themes/images/tizen-hd/Others/00_badge_34x34.png delete mode 100644 themes/images/tizen-hd/Others/00_badge_40x40.png 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 index 326ca8ceff5f5cd481f08b4c603fdfcfe1e9889f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3883 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 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 index 4b08ae1b760ba6aa4eab6870200d5a41e1e5fe20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4029 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 diff --git a/themes/widgets/badge.edc b/themes/widgets/badge.edc index 34b2650..4a5334d 100644 --- 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; - } - } - } -} -- 2.7.4