diff options
| author | Jaehyun Cho <jae_hyun.cho@samsung.com> | 2020-04-20 17:08:50 +0900 |
|---|---|---|
| committer | Jaehyun Cho <jae_hyun.cho@samsung.com> | 2020-04-20 17:09:39 +0900 |
| commit | 80ad387e737c7eb0e6a31bfdffa2c0036b44d1bd (patch) | |
| tree | ce18d39a9715133c019532c36577fdfba0120b53 | |
| parent | 36a647fd879860318ec5052063ae0dcbce16b0cd (diff) | |
| download | efl-theme-tizen-common-80ad387e737c7eb0e6a31bfdffa2c0036b44d1bd.tar.gz efl-theme-tizen-common-80ad387e737c7eb0e6a31bfdffa2c0036b44d1bd.tar.bz2 efl-theme-tizen-common-80ad387e737c7eb0e6a31bfdffa2c0036b44d1bd.zip | |
layout: Apply Tizen 6.0 GUI to badge style
Change-Id: Ia95ffb3d931e40e48c693529706fd7ddfa619d20
| -rw-r--r-- | common/HD-inc.edc | 6 | ||||
| -rw-r--r-- | common/HD/images/Assist_Views/core_icon_badge_container.#.png | bin | 900 -> 472 bytes | |||
| -rw-r--r-- | common/widgets/layout.edc | 51 |
3 files changed, 24 insertions, 33 deletions
diff --git a/common/HD-inc.edc b/common/HD-inc.edc index 22244bf..15c4257 100644 --- a/common/HD-inc.edc +++ b/common/HD-inc.edc @@ -119,9 +119,9 @@ #define SEARCHBAR_LEFT_PADDING_INC 0 #define SEARCHBAR_RIGHT_PADDING_INC 0 -#define BADGE_LAYOUT_SIZE_MIN_INC 50 50 -#define BADGE_LAYOUT_LEFT_RIGHT_PADDING_INC 13 50 -#define BADGE_LAYOUT_TEXT_MIN_SIZE_INC 32 50 +#define BADGE_LAYOUT_SIZE_MIN_INC 32 32 +#define BADGE_LAYOUT_LEFT_RIGHT_PADDING_INC 10 32 +#define BADGE_LAYOUT_TEXT_MIN_SIZE_INC 12 32 // FastScroll #define FASTSCROLL_ICON_WIDTH_INC 47 // 43 + 2 + 2 diff --git a/common/HD/images/Assist_Views/core_icon_badge_container.#.png b/common/HD/images/Assist_Views/core_icon_badge_container.#.png Binary files differindex a991012..682f32d 100644 --- a/common/HD/images/Assist_Views/core_icon_badge_container.#.png +++ b/common/HD/images/Assist_Views/core_icon_badge_container.#.png diff --git a/common/widgets/layout.edc b/common/widgets/layout.edc index 8a775ac..092f521 100644 --- a/common/widgets/layout.edc +++ b/common/widgets/layout.edc @@ -1008,7 +1008,7 @@ group { "elm/layout/badge/default"; desc { "default"; rel1.to: "left.padding.text"; rel2.to: "right.padding.text"; - color: 252 116 58 255; + color: 255 147 39 255; // #FF9327 Opacity 1 image.normal: "core_icon_badge_container.#.png"; } desc { "toolbar_badge"; @@ -1016,33 +1016,18 @@ group { "elm/layout/badge/default"; color: 0 0 0 38; } } - spacer { "right.padding.text"; - scale; - desc { "default"; - min: BADGE_LAYOUT_LEFT_RIGHT_PADDING_INC; - fixed: 1 1; - align: 1.0 0.5; - rel1.relative: 1.0 0.0; - rel2.relative: 1.0 1.0; - } - } text { "elm.text"; scale; desc { "default"; min: BADGE_LAYOUT_TEXT_MIN_SIZE_INC; - fixed: 1 0; - align: 1.0 0.5; - rel1 { - to: "right.padding.text"; - relative: 0.0 0.0; - } - rel2 { - to: "right.padding.text"; - relative: 0.0 1.0; - } + fixed: 1 1; + align: 0.5 0.5; + rel.to: "base"; + rel1.relative: 0.5 0.0; + rel2.relative: 0.5 1.0; color: 255 255 255 255; text { - font: "Tizen:weight=Normal"; size: "32"; + font: "Tizen:weight=Bold"; size: "22"; text_class: "tizen"; min: 1 0; } @@ -1054,14 +1039,20 @@ group { "elm/layout/badge/default"; min: BADGE_LAYOUT_LEFT_RIGHT_PADDING_INC; fixed: 1 1; align: 1.0 0.5; - rel1 { - to: "elm.text"; - relative: 0.0 0.0; - } - rel2 { - to: "elm.text"; - relative: 0.0 1.0; - } + rel.to: "elm.text"; + rel1.relative: 0.0 0.0; + rel2.relative: 0.0 1.0; + } + } + spacer { "right.padding.text"; + scale; + desc { "default"; + min: BADGE_LAYOUT_LEFT_RIGHT_PADDING_INC; + fixed: 1 1; + align: 0.0 0.5; + rel.to: "elm.text"; + rel1.relative: 1.0 0.0; + rel2.relative: 1.0 1.0; } } } |
