From: Youngbok Shin Date: Mon, 27 May 2013 04:03:31 +0000 (+0900) Subject: entry: Entry theme include rename, clear swallow parts and programs now, except no... X-Git-Tag: accepted/tizen/20131029.210118~260 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e08f232fbbc7d1fa11dfa0fa60c98e551d9511d7;p=profile%2Fivi%2Fefl-theme-tizen.git entry: Entry theme include rename, clear swallow parts and programs now, except no-edit entries. Change-Id: I9c2e44e272381dbfcc88520096a2f77cdb90f52a --- diff --git a/themes/widgets/entry.edc b/themes/widgets/entry.edc index ed0295f..7545b0b 100644 --- a/themes/widgets/entry.edc +++ b/themes/widgets/entry.edc @@ -21,6 +21,130 @@ #define ENTRY_BLOCK_HANDLE_SOURCE10 "elm/entry/selection/block_handle_edge_left" #define ENTRY_BLOCK_HANDLE_SOURCE11 "elm/entry/selection/block_handle_edge_right" +#define ENTRY_TEXTBLOCK_DEFAULT_REL \ + rel1 { \ + relative: 0.0 0.0; \ + } \ + rel2 { \ + to_x: "editfield_space"; \ + relative: 0.0 1.0; \ + } + +#define ENTRY_SWALLOW_SCRIPT_PUBLIC \ + script { \ + public scroll_enabled; \ + } + +#define ENTRY_SWALLOW_PARTS \ + part { name: "editfield_space"; \ + type: SPACER; \ + description { state: "default" 0.0; \ + min: 0 0; \ + max: 0 0; \ + rel1.relative: 1.0 0.0; \ + rel2.relative: 1.0 1.0; \ + } \ + description { state: "editfield" 0.0; \ + inherit: "default" 0.0; \ + align: 1.0 0.5; \ + fixed: 1 1; \ + min: 70 60; \ + max: 70 60; \ + } \ + } \ + part { name: "elm.swallow.clear"; \ + type: SWALLOW; \ + description { state: "default" 0.0; \ + fixed: 1 1; \ + rel1.relative: 1.0 0.0; \ + rel2.relative: 1.0 1.0; \ + visible: 0; \ + } \ + description { state: "visible" 0.0; \ + inherit: "default" 0.0; \ + align: 1.0 0.5; \ + visible: 1; \ + } \ + } \ + part { name: "elm.swallow.rename"; \ + type: SWALLOW; \ + description { state: "default" 0.0; \ + fixed: 1 1; \ + align: 1.0 0.5; \ + rel1.relative: 1.0 0.0; \ + rel2.relative: 1.0 1.0; \ + visible: 0; \ + } \ + description { state: "visible" 0.0; \ + inherit: "default" 0.0; \ + visible: 1; \ + } \ + } + +#define ENTRY_SWALLOW_PROGRAMS \ + program { name: "scroll_enabled"; \ + signal: "elm,state,scroll,enabled"; \ + source: "*"; \ + script { \ + set_int(scroll_enabled, 1); \ + } \ + } \ + program { name: "scroll_disabled"; \ + signal: "elm,state,scroll,disabled"; \ + source: "*"; \ + script { \ + set_int(scroll_enabled, 0); \ + } \ + } \ + program { name: "clear_show"; \ + signal: "elm,state,clear,visible"; \ + source: "*"; \ + script { \ + new v; \ + v = get_int(scroll_enabled); \ + if (!v) { \ + set_state(PART:"elm.swallow.clear", "visible", 0.0); \ + set_state(PART:"editfield_space", "editfield", 0.0); \ + } \ + } \ + } \ + program { name: "clear_hide"; \ + signal: "elm,state,clear,hidden"; \ + source: "*"; \ + script { \ + new v; \ + v = get_int(scroll_enabled); \ + if (!v) { \ + set_state(PART:"elm.swallow.clear", "default", 0.0); \ + set_state(PART:"editfield_space", "default", 0.0); \ + } \ + } \ + } \ + program { name: "rename_show"; \ + signal: "elm,state,rename,visible"; \ + source: "*"; \ + script { \ + new v; \ + v = get_int(scroll_enabled); \ + if (!v) { \ + set_state(PART:"elm.swallow.rename", "visible", 0.0); \ + set_state(PART:"editfield_space", "editfield", 0.0); \ + } \ + } \ + } \ + program { name: "rename_hide"; \ + signal: "elm,state,rename,hidden"; \ + source: "*"; \ + script { \ + new v; \ + v = get_int(scroll_enabled); \ + if (!v) { \ + set_state(PART:"elm.swallow.rename", "default", 0.0); \ + set_state(PART:"editfield_space", "default", 0.0); \ + } \ + } \ + } + sounds { sample { name: "touch_sound" AS_IS; @@ -125,6 +249,7 @@ group { name: "elm/entry/base/default"; min: 0 1; align: 0.0 0.0; } + ENTRY_TEXTBLOCK_DEFAULT_REL } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -134,7 +259,9 @@ group { name: "elm/entry/base/default"; } } } + ENTRY_SWALLOW_PARTS } + ENTRY_SWALLOW_SCRIPT_PUBLIC programs { program { name: "focus"; signal: "load"; @@ -171,6 +298,7 @@ group { name: "elm/entry/base/default"; source: "elm.text"; action: PLAY_SAMPLE "touch_sound" 1.0; } + ENTRY_SWALLOW_PROGRAMS } } @@ -271,6 +399,7 @@ group { name: "elm/entry/base-charwrap/default"; min: 0 1; align: 0.0 0.0; } + ENTRY_TEXTBLOCK_DEFAULT_REL } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -280,7 +409,9 @@ group { name: "elm/entry/base-charwrap/default"; } } } + ENTRY_SWALLOW_PARTS } + ENTRY_SWALLOW_SCRIPT_PUBLIC programs { program { name: "focus"; signal: "load"; @@ -317,6 +448,7 @@ group { name: "elm/entry/base-charwrap/default"; source: "elm.text"; action: PLAY_SAMPLE "touch_sound" 1.0; } + ENTRY_SWALLOW_PROGRAMS } } @@ -370,6 +502,7 @@ group { name: "elm/entry/base-nowrap/default"; min: 1 1; align: 0.0 0.0; } + ENTRY_TEXTBLOCK_DEFAULT_REL } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -379,7 +512,9 @@ group { name: "elm/entry/base-nowrap/default"; } } } + ENTRY_SWALLOW_PARTS } + ENTRY_SWALLOW_SCRIPT_PUBLIC programs { program { name: "focus"; signal: "load"; @@ -416,6 +551,7 @@ group { name: "elm/entry/base-nowrap/default"; source: "elm.text"; action: PLAY_SAMPLE "touch_sound" 1.0; } + ENTRY_SWALLOW_PROGRAMS } } @@ -522,6 +658,7 @@ group { name: "elm/entry/base/editfield"; min: 0 1; align: 0.0 0.0; } + ENTRY_TEXTBLOCK_DEFAULT_REL } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -531,7 +668,9 @@ group { name: "elm/entry/base/editfield"; } } } + ENTRY_SWALLOW_PARTS } + ENTRY_SWALLOW_SCRIPT_PUBLIC programs { program { name: "focus"; signal: "load"; @@ -568,6 +707,7 @@ group { name: "elm/entry/base/editfield"; source: "elm.text"; action: PLAY_SAMPLE "touch_sound" 1.0; } + ENTRY_SWALLOW_PROGRAMS } } @@ -673,6 +813,7 @@ group { name: "elm/entry/base-charwrap/editfield"; min: 0 1; align: 0.0 0.0; } + ENTRY_TEXTBLOCK_DEFAULT_REL } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -682,7 +823,9 @@ group { name: "elm/entry/base-charwrap/editfield"; } } } + ENTRY_SWALLOW_PARTS } + ENTRY_SWALLOW_SCRIPT_PUBLIC programs { program { name: "focus"; signal: "load"; @@ -719,6 +862,7 @@ group { name: "elm/entry/base-charwrap/editfield"; source: "elm.text"; action: PLAY_SAMPLE "touch_sound" 1.0; } + ENTRY_SWALLOW_PROGRAMS } } @@ -821,6 +965,7 @@ group { name: "elm/entry/base-single/editfield"; min: 1 1; max: 0 1; } + ENTRY_TEXTBLOCK_DEFAULT_REL } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -829,7 +974,9 @@ group { name: "elm/entry/base-single/editfield"; } } } + ENTRY_SWALLOW_PARTS } + ENTRY_SWALLOW_SCRIPT_PUBLIC programs { program { name: "focus"; signal: "load"; @@ -866,6 +1013,7 @@ group { name: "elm/entry/base-single/editfield"; source: "elm.text"; action: PLAY_SAMPLE "touch_sound" 1.0; } + ENTRY_SWALLOW_PROGRAMS } } @@ -919,6 +1067,7 @@ group { name: "elm/entry/base-single/editfield/searchbar/default"; min: 1 1; max: 0 1; } + ENTRY_TEXTBLOCK_DEFAULT_REL } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -927,7 +1076,9 @@ group { name: "elm/entry/base-single/editfield/searchbar/default"; } } } + ENTRY_SWALLOW_PARTS } + ENTRY_SWALLOW_SCRIPT_PUBLIC programs { program { name: "focus"; signal: "load"; @@ -964,6 +1115,7 @@ group { name: "elm/entry/base-single/editfield/searchbar/default"; source: "elm.text"; action: PLAY_SAMPLE "touch_sound" 1.0; } + ENTRY_SWALLOW_PROGRAMS } } @@ -1063,6 +1215,7 @@ group { name: "elm/entry/base-single/default"; max: 0 0; align: 0.0 0.5; } + ENTRY_TEXTBLOCK_DEFAULT_REL } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -1071,7 +1224,9 @@ group { name: "elm/entry/base-single/default"; } } } + ENTRY_SWALLOW_PARTS } + ENTRY_SWALLOW_SCRIPT_PUBLIC programs { program { name: "focus"; signal: "load"; @@ -1108,6 +1263,7 @@ group { name: "elm/entry/base-single/default"; source: "elm.text"; action: PLAY_SAMPLE "touch_sound" 1.0; } + ENTRY_SWALLOW_PROGRAMS } } @@ -1552,6 +1708,7 @@ group { name: "elm/entry/base-noedit/default"; min: 1 1; max: 0 1; } + ENTRY_TEXTBLOCK_DEFAULT_REL } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -1560,7 +1717,9 @@ group { name: "elm/entry/base-noedit/default"; } } } + ENTRY_SWALLOW_PARTS } + ENTRY_SWALLOW_SCRIPT_PUBLIC programs { program { name: "focus"; signal: "load"; @@ -1597,6 +1756,7 @@ group { name: "elm/entry/base-noedit/default"; source: "elm.text"; action: PLAY_SAMPLE "touch_sound" 1.0; } + ENTRY_SWALLOW_PROGRAMS } } @@ -1696,6 +1856,7 @@ group { name: "elm/entry/base-password/popup"; min: 1 1; max: 0 1; } + ENTRY_TEXTBLOCK_DEFAULT_REL } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -1704,7 +1865,9 @@ group { name: "elm/entry/base-password/popup"; } } } + ENTRY_SWALLOW_PARTS } + ENTRY_SWALLOW_SCRIPT_PUBLIC programs { program { name: "focus"; signal: "load"; @@ -1741,6 +1904,7 @@ group { name: "elm/entry/base-password/popup"; source: "elm.text"; action: PLAY_SAMPLE "touch_sound" 1.0; } + ENTRY_SWALLOW_PROGRAMS } } @@ -4274,6 +4438,7 @@ group { name: "elm/entry/base/font_color_black"; style: "font_color_black_textblock_style"; min: 0 1; } + ENTRY_TEXTBLOCK_DEFAULT_REL } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -4283,7 +4448,9 @@ group { name: "elm/entry/base/font_color_black"; } } } + ENTRY_SWALLOW_PARTS } + ENTRY_SWALLOW_SCRIPT_PUBLIC programs { program { name: "focus"; signal: "load"; @@ -4320,6 +4487,7 @@ group { name: "elm/entry/base/font_color_black"; source: "elm.text"; action: PLAY_SAMPLE "touch_sound" 1.0; } + ENTRY_SWALLOW_PROGRAMS } } @@ -4527,6 +4695,7 @@ group { name: "elm/entry/base-charwrap/font_color_black"; style: "font_color_black_textblock_char_wrap_style"; min: 0 1; } + ENTRY_TEXTBLOCK_DEFAULT_REL } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -4536,7 +4705,9 @@ group { name: "elm/entry/base-charwrap/font_color_black"; } } } + ENTRY_SWALLOW_PARTS } + ENTRY_SWALLOW_SCRIPT_PUBLIC programs { program { name: "focus"; signal: "load"; @@ -4573,6 +4744,7 @@ group { name: "elm/entry/base-charwrap/font_color_black"; source: "elm.text"; action: PLAY_SAMPLE "touch_sound" 1.0; } + ENTRY_SWALLOW_PROGRAMS } } @@ -4679,6 +4851,7 @@ group { name: "elm/entry/base-single/font_color_black"; min: 1 1; max: 0 1; } + ENTRY_TEXTBLOCK_DEFAULT_REL } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -4687,7 +4860,9 @@ group { name: "elm/entry/base-single/font_color_black"; } } } + ENTRY_SWALLOW_PARTS } + ENTRY_SWALLOW_SCRIPT_PUBLIC programs { program { name: "focus"; signal: "load"; @@ -4724,6 +4899,7 @@ group { name: "elm/entry/base-single/font_color_black"; source: "elm.text"; action: PLAY_SAMPLE "touch_sound" 1.0; } + ENTRY_SWALLOW_PROGRAMS } } @@ -4894,6 +5070,7 @@ group { name: "elm/entry/base-single/font_color_black/tizen_text_class"; text { style: "tizen_text_class_single_textblock_style"; } + ENTRY_TEXTBLOCK_DEFAULT_REL } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -4955,6 +5132,7 @@ group { name: "elm/entry/base-password/font_color_black"; min: 1 1; max: 0 1; } + ENTRY_TEXTBLOCK_DEFAULT_REL } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -4963,7 +5141,9 @@ group { name: "elm/entry/base-password/font_color_black"; } } } + ENTRY_SWALLOW_PARTS } + ENTRY_SWALLOW_SCRIPT_PUBLIC programs { program { name: "focus"; signal: "load"; @@ -5000,6 +5180,7 @@ group { name: "elm/entry/base-password/font_color_black"; source: "elm.text"; action: PLAY_SAMPLE "touch_sound" 1.0; } + ENTRY_SWALLOW_PROGRAMS } } @@ -5048,6 +5229,29 @@ group { name: "elm/scroller/entry/default"; rel2.to: "bg"; } } + part { name: "editfield_space"; + type: SPACER; + description { state: "default" 0.0; + rel1.to: "elm.swallow.end"; + rel1.relative: 0.0 0.0; + rel2.to: "elm.swallow.end"; + rel2.relative: 1.0 1.0; + } + description { state: "editfield" 0.0; + align: 1.0 1.0; + fixed: 1 1; + min: 70 60; + max: 70 60; + rel1 { + to_x: "elm.swallow.end"; + relative: 0.0 0.0; + } + rel2 { + to_x: "elm.swallow.end"; + relative: 0.0 1.0; + } + } + } part { name: "contentclipper"; type: RECT; mouse_events: 0; @@ -5055,7 +5259,7 @@ group { name: "elm/scroller/entry/default"; description { state: "default" 0.0; rel1.to: "elm.swallow.icon"; rel1.relative: 1.0 0.0; - rel2.to: "elm.swallow.end"; + rel2.to: "editfield_space"; rel2.relative: 0.0 1.0; } } @@ -5088,24 +5292,57 @@ group { name: "elm/scroller/entry/default"; visible: 1; } } - part { name: "elm.swallow.end"; + part { name: "elm.swallow.clear"; type: SWALLOW; clip_to: "clipper"; description { state: "default" 0.0; fixed: 1 1; rel1 { - to: "bg"; - relative: 1.0 0.0; + to_x: "elm.swallow.end"; + to_y: "bg"; + relative: 0.0 0.0; } rel2 { - to: "bg"; - relative: 1.0 1.0; + to_x: "elm.swallow.end"; + to_y: "bg"; + relative: 0.0 1.0; } visible: 0; } description { state: "visible" 0.0; - fixed: 1 1; + inherit: "default" 0.0; align: 1.0 1.0; + visible: 1; + } + } + part { name: "elm.swallow.rename"; + type: SWALLOW; + clip_to: "clipper"; + description { state: "default" 0.0; + align: 1.0 1.0; + fixed: 1 1; + rel1 { + to_x: "elm.swallow.end"; + to_y: "bg"; + relative: 0.0 0.0; + } + rel2 { + to_x: "elm.swallow.end"; + to_y: "bg"; + relative: 0.0 1.0; + } + visible: 0; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part { name: "elm.swallow.end"; + type: SWALLOW; + clip_to: "clipper"; + description { state: "default" 0.0; + fixed: 1 1; rel1 { to: "bg"; relative: 1.0 0.0; @@ -5114,6 +5351,11 @@ group { name: "elm/scroller/entry/default"; to: "bg"; relative: 1.0 1.0; } + visible: 0; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + align: 1.0 1.0; visible: 1; } } @@ -5126,7 +5368,7 @@ group { name: "elm/scroller/entry/default"; relative: 1.0 0.0; } rel2 { - to: "elm.swallow.end"; + to: "editfield_space"; relative: 0.0 1.0; } } @@ -5163,12 +5405,12 @@ group { name: "elm/scroller/entry/default"; rel1 { relative: 0.0 0.0; to_y: "elm.swallow.content"; - to_x: "elm.swallow.end"; + to_x: "editfield_space"; } rel2 { relative: 0.0 0.0; to_y: "sb_hbar"; - to_x: "elm.swallow.end"; + to_x: "editfield_space"; } } } @@ -5287,6 +5529,42 @@ group { name: "elm/scroller/entry/default"; action: STATE_SET "default" 0.0; target: "elm.swallow.icon"; } + program { name: "clear_show"; + signal: "elm,state,clear,visible"; + source: "*"; + action: STATE_SET "visible" 0.0; + target: "elm.swallow.clear"; + after: "editfield_set"; + } + program { name: "clear_hide"; + signal: "elm,state,clear,hidden"; + source: "*"; + action: STATE_SET "default" 0.0; + target: "elm.swallow.clear"; + after: "editfield_unset"; + } + program { name: "rename_show"; + signal: "elm,state,rename,visible"; + source: "*"; + action: STATE_SET "visible" 0.0; + target: "elm.swallow.rename"; + after: "editfield_set"; + } + program { name: "rename_hide"; + signal: "elm,state,rename,hidden"; + source: "*"; + action: STATE_SET "default" 0.0; + target: "elm.swallow.rename"; + after: "editfield_unset"; + } + program { name: "editfield_set"; + action: STATE_SET "editfield" 0.0; + target: "editfield_space"; + } + program { name: "editfield_unset"; + action: STATE_SET "default" 0.0; + target: "editfield_space"; + } program { name: "end_show"; signal: "elm,action,show,end"; source: "elm";