From: Daniel Juyung Seo Date: Wed, 20 Jun 2012 09:08:30 +0000 (+0900) Subject: [Genlist] Added 1text.1/expandable_n_depth(2.5.3.1) and 1text.2/expandable_n_depth... X-Git-Tag: 2.0_alpha~104^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=22a5819d92684986888b85f650ea07d5c0eac1c6;p=framework%2Fuifw%2Fefl-theme-tizen.git [Genlist] Added 1text.1/expandable_n_depth(2.5.3.1) and 1text.2/expandable_n_depth(2.5.3.2). Change-Id: Ic14bae1a3f29b5eab911a0fb1671b3b1f753c7bf --- diff --git a/themes/images/tizen-hd/00_expandable_icon_folder.png b/themes/images/tizen-hd/00_expandable_icon_folder.png new file mode 100755 index 0000000..ad94b9c Binary files /dev/null and b/themes/images/tizen-hd/00_expandable_icon_folder.png differ diff --git a/themes/images/tizen-hd/00_expandable_icon_folder_minus.png b/themes/images/tizen-hd/00_expandable_icon_folder_minus.png new file mode 100755 index 0000000..abb828d Binary files /dev/null and b/themes/images/tizen-hd/00_expandable_icon_folder_minus.png differ diff --git a/themes/images/tizen-hd/00_expandable_icon_folder_plus.png b/themes/images/tizen-hd/00_expandable_icon_folder_plus.png new file mode 100755 index 0000000..415226c Binary files /dev/null and b/themes/images/tizen-hd/00_expandable_icon_folder_plus.png differ diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index a052437..e6324ac 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -220,6 +220,7 @@ #define GENLIST_SIZE_672_INC 672 #define GENLIST_TREESIZE_16_INC 16 +#define GENLIST_TREESIZE_20_INC 20 #define GENLIST_TREESIZE_32_INC 32 //new diff --git a/themes/widgets/genlist/genlist_expandable.edc b/themes/widgets/genlist/genlist_expandable.edc index 0d2fa8b..765a6a2 100644 --- a/themes/widgets/genlist/genlist_expandable.edc +++ b/themes/widgets/genlist/genlist_expandable.edc @@ -3595,3 +3595,299 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D } } } + + /* 2.5.3.1 */ + group { name: "elm/genlist/tree/1text.1/expandable_n_depth/default"; + alias: "elm/genlist/tree_odd/1text.1/expandable_n_depth/default"; + alias: "elm/genlist/tree_compress/1text.1/expandable_n_depth/default"; + alias: "elm/genlist/tree_compress_odd/1text.1/expandable_n_depth/default"; + data.item: "stacking" "above"; + data.item: "selectraise" "on"; + data.item: "texts" "elm.text"; + data.item: "treesize" GENLIST_TREESIZE_20_INC; + broadcast_signal: 1; + parts { + alias: "base" "group:base"; + alias: "arrow" "group:arrow"; + alias: "elm.text" "group:elm.text"; + alias: "bottom_line" "group:bottom_line"; + alias: "elm.padding.left" "group:elm.padding.left"; + alias: "elm.padding.right" "group:elm.padding.right"; + alias: "elm.swallow.pad" "group:elm.swallow.pad"; + GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT() + part { name: "event"; + type: RECT; + description { + state: "default" 0.0; + color: 0 0 0 0; + } + } + part { name: "group"; + type: GROUP; + scale: 1; + source: "elm/genlist/tree/1text.1/expandable_n_depth/effect_parts/default"; + description { + min: 16 GENLIST_HEIGHT_113_INC; + state: "default" 0.0; + } + GENLIST_PART_MAP_START(-90.0, 0, 0) + GENLIST_PART_MAP_FINISH(0, 0, 0) + } + } + programs { + program { + name: "expand"; + signal: "mouse,up,1"; + source: "group:touch_arrow"; + action: SIGNAL_EMIT "elm,action,expand,toggle" "elm"; + } + program { + GENLIST_PROGRAM_MAP_ROTATE_EXPAND_START() + target: "group"; + } + program { + GENLIST_PROGRAM_MAP_ROTATE_EXPAND_FINISH( 0.2 ) + target: "group"; + } + program { + GENLIST_PROGRAM_MAP_EXPAND_END() + target: "group"; + } + program { + GENLIST_PROGRAM_MAP_ROTATE_CONTRACT_START() + target: "group"; + } + program { + GENLIST_PROGRAM_MAP_ROTATE_CONTRACT_FINISH( 0.5 ) + target: "group"; + } + program { + GENLIST_PROGRAM_MAP_CONTRACT_END() + target: "group"; + } + program { + name: "show"; + signal: "elm,state,show"; + action: STATE_SET "default" 0.0; + target: "group"; + } + program { + name: "hide"; + signal: "elm,state,hide"; + action: STATE_SET "hide" 0.0; + target: "group"; + } + } + } + + /* internally used in 2.5.3.1 */ + group { name: "elm/genlist/tree/1text.1/expandable_n_depth/effect_parts/default"; + images { + image: "00_expandable_icon_folder_plus.png" COMP; + image: "00_expandable_icon_folder_minus.png" COMP; + } + parts { + GENLIST_EXPANDABLE_PART_BASE_NEW( GENLIST_HEIGHT_113_INC, GENLIST_PART_BG_COLOR_INC ) + GENLIST_PART_BOTTOM_LINE + GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC ) + GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC ) + part { name: "elm.swallow.pad"; + type: SWALLOW; + description { state: "default" 0.0; + fixed: 1 0; + align: 0.0 0.5; + rel1 { + relative: 1.0 0.0; + to_x: "elm.padding.left"; + } + rel2.to_x: "elm.padding.left"; + } + } + part { name: "touch_arrow"; + type: RECT; + clip_to: "disclip"; + ignore_flags: ON_HOLD; + scale: 1; + description { state: "default" 0.0; + min: GENLIST_SIZE_112_INC GENLIST_SIZE_128_INC; + fixed: 1 1; + align: 0.5 0.5; + rel1 { + relative: 0.5 0.5; + to: "arrow"; + } + rel2 { + relative: 0.5 0.5; + to: "arrow"; + } + color: 0 0 0 0; + } + } + part { name: "elm.padding.arrow.right"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + min: GENLIST_SIZE_16_INC 0; + fixed: 1 0; + visible: 0; + align: 0.0 0.5; + rel1 { + relative: 1.0 0.0; + to: "arrow"; + } + rel2.to: "arrow"; + } + } + part { name: "arrow"; + clip_to: "disclip"; + ignore_flags: ON_HOLD; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + min: GENLIST_SIZE_64_INC GENLIST_SIZE_64_INC; + max: GENLIST_SIZE_64_INC GENLIST_SIZE_64_INC; + fixed: 1 1; + align: 0.0 0.5; + aspect: 1.0 1.0; + rel1 { + relative: 1.0 0.0; + to_x: "elm.swallow.pad"; + } + rel2.to_x: "elm.swallow.pad"; + image.normal: "00_expandable_icon_folder_plus.png"; + } + description { state: "active" 0.0; + inherit: "default" 0.0; + image.normal: "00_expandable_icon_folder_minus.png"; + } + } + part { name: "elm.text"; + clip_to: "disclip"; + type: TEXT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + align: 0.5 0.5; + rel1 { + relative: 1.0 0.0; + to_x: "elm.padding.arrow.right"; + } + rel2 { + relative: 0.0 1.0; + to_x: "elm.padding.right"; + } + color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC; + text { + font: "SLP:style=Roman"; + size: GENLIST_FONT_44_INC; + min: 0 1; + align: 0.0 0.5; + text_class: "list_item"; + } + } + description { state: "selected" 0.0; + inherit: "default" 0.0; + color: GENLIST_PART_TEXT_PRESS_COLOR_INC; + } + } + GENLIST_PART_DISCLIP + } + programs { + program { + name: "go_expanded"; + signal: "elm,state,expanded"; + source: "elm"; + action: STATE_SET "active" 0.0; + target: "arrow"; + } + program { + name: "go_contracted"; + signal: "elm,state,contracted"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "arrow"; + } + + program { + name: "go_active"; + signal: "elm,state,selected"; + source: "elm"; + action: STATE_SET "selected" 0.0; + target: "base"; + target: "elm.text"; + } + program { + name: "go_passive"; + signal: "elm,state,unselected"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "base"; + target: "elm.text"; + transition: LINEAR 0.1; + } + program { + name: "go_disabled"; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "disclip"; + } + program { + name: "go_enabled"; + signal: "elm,state,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "disclip"; + } + } + } + + /* 2.5.3.2 */ + group { name: "elm/genlist/item/1text.2/expandable_n_depth/default"; + alias: "elm/genlist/item_odd/1text.2/expandable_n_depth/default"; + alias: "elm/genlist/item_compress/1text.2/expandable_n_depth/default"; + alias: "elm/genlist/item_compress_odd/1text.2/expandable_n_depth/default"; + inherit: "elm/genlist/tree/1text.1/expandable_n_depth/default"; + broadcast_signal: 1; + parts { + alias: "base" "group:base"; + alias: "arrow" "group:arrow"; + alias: "elm.text" "group:elm.text"; + alias: "bottom_line" "group:bottom_line"; + alias: "elm.padding.left" "group:elm.padding.left"; + alias: "elm.padding.right" "group:elm.padding.right"; + alias: "elm.swallow.pad" "group:elm.swallow.pad"; + part { name: "group"; + type: GROUP; + scale: 1; + source: "elm/genlist/tree/1text.2/expandable_n_depth/effect_parts/default"; + description { + min: 16 GENLIST_HEIGHT_113_INC; + state: "default" 0.0; + } + GENLIST_PART_MAP_START(-90.0, 0, 0) + GENLIST_PART_MAP_FINISH(0, 0, 0) + } + } + } + + /* internally used in 2.5.3.2 */ + group { name: "elm/genlist/tree/1text.2/expandable_n_depth/effect_parts/default"; + inherit: "elm/genlist/tree/1text.1/expandable_n_depth/effect_parts/default"; + images { + image: "00_expandable_icon_folder.png" COMP; + } + parts { + part { name: "touch_arrow"; + mouse_events: 0; + } + part { name: "arrow"; + description { state: "default" 0.0; + image.normal: "00_expandable_icon_folder.png"; + } + description { state: "active" 0.0; + image.normal: "00_expandable_icon_folder.png"; + } + } + } + } diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc index e1b5b19..8efcf2a 100644 --- a/themes/widgets/genlist/genlist_macro.edc +++ b/themes/widgets/genlist/genlist_macro.edc @@ -340,6 +340,24 @@ GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \ } +/* XXX: refactor expandable edc first. + and use GENLIST_EXPANDABLE_PART_BASE_NEW as GENLIST_EXPANDABLE_PART_BASE. +*/ +#define GENLIST_EXPANDABLE_PART_BASE_NEW( GE_HEIGHT , GE_COLOR ) \ + part { name: "base"; \ + type: RECT; \ + repeat_events: 1; \ + scale: 1; \ + description { state: "default" 0.0; \ + min: 0 GE_HEIGHT; \ + color: GE_COLOR; \ + } \ + description { state: "selected" 0.0; \ + inherit: "default" 0.0; \ + color: GENLIST_PART_LIST_PRESS_COLOR_INC; \ + } \ + } + #define GENLIST_PROGRAM_MAP_ROTATE_EXPAND_START() \ name: "rotaion_transition"; \ signal: "flip_item"; \