diff options
author | JinYong Park <j4939.park@samsung.com> | 2017-01-04 20:17:01 +0900 |
---|---|---|
committer | JinYong Park <j4939.park@samsung.com> | 2017-01-09 17:29:29 +0900 |
commit | ca9567c887bfbb92910f7f32ee8ee5046bdc409e (patch) | |
tree | 7d384b6eb4513545523b4fbf69037189423f48dd | |
parent | 00600b6486c4634b0b32e969f0277e5eaa482c1b (diff) | |
download | efl-theme-tizen-mobile-ca9567c887bfbb92910f7f32ee8ee5046bdc409e.tar.gz efl-theme-tizen-mobile-ca9567c887bfbb92910f7f32ee8ee5046bdc409e.tar.bz2 efl-theme-tizen-mobile-ca9567c887bfbb92910f7f32ee8ee5046bdc409e.zip |
popup: add item style to remove app crashsubmit/tizen/20170110.035404accepted/tizen/mobile/20170110.080846
Change-Id: Ia06873fb34c3c7f9905e2b322b4b95da762832df
Signed-off-by: Jinyong Park <j4939.park@samsung.com>
-rw-r--r-- | mobile/HD-inc.edc | 6 | ||||
-rw-r--r-- | mobile/color_classes.edc | 9 | ||||
-rw-r--r-- | mobile/widgets/popup.edc | 152 |
3 files changed, 167 insertions, 0 deletions
diff --git a/mobile/HD-inc.edc b/mobile/HD-inc.edc index 2077149d..d6d7eef3 100644 --- a/mobile/HD-inc.edc +++ b/mobile/HD-inc.edc @@ -727,6 +727,12 @@ #define POPUP_TOAST_TEXT_MAX_HEIGHT_INC 668 #define POPUP_TOAST_TEXT_MULTI_LINE_MIN_INC 564 +#define POPUP_ITEM_BASE_DEFAULT_MIN_INC 660 120 +#define POPUP_ITEM_PADDING_LEFT_RIGHT_WIDTH_INC 32 +#define POPUP_ITEM_ICON_LEFT_PADDING 17 +#define POPUP_ITEM_ICON_SIZE_INC 40 40 +#define POPUP_ITEM_TEXT_MIN_HEIGHT_INC 38 + //****************************************************************************// // Gengrid diff --git a/mobile/color_classes.edc b/mobile/color_classes.edc index e8447367..0dd09690 100644 --- a/mobile/color_classes.edc +++ b/mobile/color_classes.edc @@ -1523,6 +1523,15 @@ color_classes { color_class { "popup/toast/text"; color: 0 0 0 255; } + color_class { "popup_item/default/bg"; + color: 250 250 250 255; + } + color_class { "popup_item/default/bg_pressed"; + color: 61 185 204 77; + } + color_class { "popup_item/default/text"; + color: 0 0 0 255; + } /* * Progressbar diff --git a/mobile/widgets/popup.edc b/mobile/widgets/popup.edc index 1f2db8d8..8d0b9b99 100644 --- a/mobile/widgets/popup.edc +++ b/mobile/widgets/popup.edc @@ -1979,3 +1979,155 @@ group { "elm/label/base/popup/toast"; } } } + + +group { name: "elm/popup/item/popup/default"; + alias: "elm/popup/item/popup/theme_bg"; + + parts { + spacer { "base"; + desc { "default"; + } + } + rect { "bg"; + scale; + desc { "default"; + rel.to: "base"; + min: POPUP_ITEM_BASE_DEFAULT_MIN_INC; + color_class: "popup_item/default/bg"; + } + desc { "clicked"; + inherit: "default"; + color_class: "popup_item/default/bg_pressed"; + } + } + spacer { "padding_left_icon"; + scale; + desc { "default"; + rel.to: "base"; + align: 0.0 0.5; + min: POPUP_ITEM_PADDING_LEFT_RIGHT_WIDTH_INC 0; + max: POPUP_ITEM_PADDING_LEFT_RIGHT_WIDTH_INC 0; + fixed: 1 1; + } + } + swallow { "elm.swallow.content"; + scale; + mouse; + desc { "default"; + rel1 { + to_x: "padding_left_icon"; + to_y: "base"; + relative: 1.0 0.0; + } + rel2 { + to_x: "padding_left_icon"; + to_y: "base"; + relative: 1.0 1.0; + } + align: 0.0 0.5; + min: POPUP_ITEM_ICON_SIZE_INC; + max: POPUP_ITEM_ICON_SIZE_INC; + aspect: 1.0 1.0; + } + } + spacer { "padding_right_icon"; + scale; + desc { "default"; + rel1 { + to_x: "elm.swallow.content"; + to_y: "base"; + relative: 1.0 0.0; + } + rel2 { + to_x: "elm.swallow.content"; + to_y: "base"; + relative: 1.0 1.0; + } + align: 0.0 0.5; + min: POPUP_ITEM_ICON_LEFT_PADDING 0; + max: POPUP_ITEM_ICON_LEFT_PADDING 0; + fixed: 1 1; + } + } + text { "elm.text"; + scale; + desc { "default"; + rel1 { + to_x: "padding_left_icon"; + to_y: "base"; + relative: 1.0 0.0; + } + rel2 { + to_x: "padding_right_text"; + to_y: "base"; + relative: 0.0 1.0; + } + align: 0.0 0.5; + min: 1 POPUP_ITEM_TEXT_MIN_HEIGHT_INC; + color_class: "popup_item/default/text"; + text { + font: "Tizen:weight=Light"; size: "40"; + text_class: "list_item"; + align: -1.0 0.5; + min: 0 1; + } + } + desc { "visible_icon"; + inherit: "default"; + rel1.to_x: "padding_right_icon"; + } + } + spacer { "padding_right_text"; + scale; + desc { "default"; + rel.to: "base"; + align: 1.0 0.5; + min: POPUP_ITEM_PADDING_LEFT_RIGHT_WIDTH_INC 0; + max: POPUP_ITEM_PADDING_LEFT_RIGHT_WIDTH_INC 0; + } + } + rect { "event"; + mouse; + norepeat; + desc { "default"; + rel.to: "base"; + color: 0 0 0 0; + } + } + } + + programs { + program { "on_clicked"; + signal: "mouse,clicked,1"; + source: "event"; + action: SIGNAL_EMIT "elm,action,click" "elm"; + } + program { "visible_icon"; + signal: "elm,state,item,icon,visible"; + source: "elm"; + action: STATE_SET "visible_icon"; + target: "elm.text"; + } + program { "hidden_icon"; + signal: "elm,state,item,icon,hidden"; + source: "elm"; + action: STATE_SET "default"; + target: "elm.text"; + } + program { "on_pressed"; + signal: "mouse,down,1"; + source: "event"; + script { + set_state(PART:"bg", "clicked", 0.0); + } + } + program { "on_unpressed"; + signal: "mouse,up,1"; + source: "event"; + script { + set_state(PART:"bg", "default", 0.0); + } + } + } +} |