diff options
author | Thiep Ha <thiep.ha@samsung.com> | 2015-09-21 23:56:08 +0900 |
---|---|---|
committer | Thiep Ha <thiep.ha@samsung.com> | 2015-09-22 00:03:37 +0900 |
commit | d601829210764959b046588916031c1ab7f6ab06 (patch) | |
tree | 594da6e9db3c8765cf76fe82237aa6eeb3bf3b6e /mobile/widgets/entry.edc | |
parent | a57d3a63feaa450cb74cff0a250825506f84ad65 (diff) | |
download | efl-theme-tizen-mobile-d601829210764959b046588916031c1ab7f6ab06.tar.gz efl-theme-tizen-mobile-d601829210764959b046588916031c1ab7f6ab06.tar.bz2 efl-theme-tizen-mobile-d601829210764959b046588916031c1ab7f6ab06.zip |
CNPUI: Implement GUI 150918 (update resource, change size, remove edge)
Change-Id: I475f8f3a1f001f4f03360dce782dedfbdde04622
Diffstat (limited to 'mobile/widgets/entry.edc')
-rw-r--r-- | mobile/widgets/entry.edc | 165 |
1 files changed, 31 insertions, 134 deletions
diff --git a/mobile/widgets/entry.edc b/mobile/widgets/entry.edc index c4468dc5..428dc0ac 100644 --- a/mobile/widgets/entry.edc +++ b/mobile/widgets/entry.edc @@ -2389,8 +2389,10 @@ group { name: "elm/entry/handler/start/default"; data.item: "height" ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC; data.item: "gap" ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC; images { - image: "copy&paste_handler_left_bottom.png" COMP; - image: "copy&paste_handler_left_top.png" COMP; + image: "copy&paste_handler_bottom_l.png" COMP; + image: "copy&paste_handler_bottom_r.png" COMP; + image: "copy&paste_handler_top_l.png" COMP; + image: "copy&paste_handler_top_r.png" COMP; } script { public handler_ontop; @@ -2398,39 +2400,6 @@ group { name: "elm/entry/handler/start/default"; public handler_disabled; } parts { - part { name: "edge"; - type: RECT; - mouse_events: 1; - scale: 1; - description { state: "default" 0.0; - visible: 0; - fixed: 1 1; - align: 1 0; - rel2.offset: 1 0; - min: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH ENTRY_SELECTION_BLOCK_HANDLE_EDGE_HEIGHT; - max: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH ENTRY_SELECTION_BLOCK_HANDLE_EDGE_HEIGHT; - color: 0 184 230 255; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - visible: 1; - } - description { state: "top" 0.0; - inherit: "default" 0.0; - visible: 1; - align: 1 1; - } - description { state: "bottom_reversed" 0.0; - inherit: "default" 0.0; - visible: 1; - align: 1 0; - } - description { state: "top_reversed" 0.0; - inherit: "default" 0.0; - visible: 1; - align: 1 1; - } - } part { name: "handle"; mouse_events: 1; scale: 1; @@ -2438,12 +2407,10 @@ group { name: "elm/entry/handler/start/default"; visible: 0; fixed: 1 1; align: 1.0 0; - rel2.offset: 6 0; min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC; max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC; image { - normal: "copy&paste_handler_left_bottom.png"; - border: 0 0 0 0; + normal: "copy&paste_handler_bottom_l.png"; } } description { state: "show" 0.0; @@ -2455,20 +2422,23 @@ group { name: "elm/entry/handler/start/default"; visible: 1; align: 1.0 1; image { - normal: "copy&paste_handler_left_top.png"; + normal: "copy&paste_handler_top_l.png"; } } description { state: "bottom_reversed" 0.0; inherit: "default" 0.0; visible: 1; - align: 0.5 0; + align: 0 0; + image { + normal: "copy&paste_handler_bottom_r.png"; + } } description { state: "top_reversed" 0.0; inherit: "default" 0.0; visible: 1; - align: 0.5 1; + align: 0.0 1; image { - normal: "copy&paste_handler_left_top.png"; + normal: "copy&paste_handler_top_r.png"; } } } @@ -2487,7 +2457,6 @@ group { name: "elm/entry/handler/start/default"; script { set_int(handler_focused, 0); set_state(PART:"handle", "default", 0.0); - set_state(PART:"edge", "default", 0.0); } } program { name: "bottom_reversed"; @@ -2498,10 +2467,8 @@ group { name: "elm/entry/handler/start/default"; disabled = get_int(handler_disabled); if (disabled == 0) { set_state(PART:"handle", "bottom_reversed", 0.0); - set_state(PART:"edge", "bottom_reversed", 0.0); } else { set_state(PART:"handle", "default", 0.0); - set_state(PART:"edge", "default", 0.0); } } } @@ -2513,10 +2480,8 @@ group { name: "elm/entry/handler/start/default"; disabled = get_int(handler_disabled); if (disabled == 0) { set_state(PART:"handle", "top_reversed", 0.0); - set_state(PART:"edge", "top_reversed", 0.0); } else { set_state(PART:"handle", "default", 0.0); - set_state(PART:"edge", "default", 0.0); } } } @@ -2530,10 +2495,8 @@ group { name: "elm/entry/handler/start/default"; set_int(handler_ontop, 1); if ((focused == 1) && (disabled == 0)) { set_state(PART:"handle", "top", 0.0); - set_state(PART:"edge", "top", 0.0); } else { set_state(PART:"handle", "default", 0.0); - set_state(PART:"edge", "default", 0.0); } } } @@ -2547,10 +2510,8 @@ group { name: "elm/entry/handler/start/default"; set_int(handler_ontop, 0); if ((focused == 1) && (disabled == 0)) { set_state(PART:"handle", "show", 0.0); - set_state(PART:"edge", "show", 0.0); } else { set_state(PART:"handle", "default", 0.0); - set_state(PART:"edge", "default", 0.0); } } } @@ -2576,8 +2537,10 @@ group { name: "elm/entry/handler/end/default"; data.item: "height" ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC; data.item: "gap" ENTRY_SELECTION_BLOCK_HANDLE_MIN_WEIGHT_INC; images { - image: "copy&paste_handler_right_bottom.png" COMP; - image: "copy&paste_handler_right_top.png" COMP; + image: "copy&paste_handler_bottom_l.png" COMP; + image: "copy&paste_handler_bottom_r.png" COMP; + image: "copy&paste_handler_top_l.png" COMP; + image: "copy&paste_handler_top_r.png" COMP; } script { public handler_ontop; @@ -2586,39 +2549,6 @@ group { name: "elm/entry/handler/end/default"; public handler_pressed; } parts { - part { name: "edge"; - type: RECT; - mouse_events: 1; - scale: 1; - description { state: "default" 0.0; - visible: 0; - fixed: 1 1; - align: 0 0; - rel1.offset: -1 0; - min: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH ENTRY_SELECTION_BLOCK_HANDLE_EDGE_HEIGHT; - max: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH ENTRY_SELECTION_BLOCK_HANDLE_EDGE_HEIGHT; - color: 0 184 230 255; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - visible: 1; - } - description { state: "top" 0.0; - inherit: "default" 0.0; - visible: 1; - align: 0 1; - } - description { state: "bottom_reversed" 0.0; - inherit: "default" 0.0; - visible: 1; - align: 0 0; - } - description { state: "top_reversed" 0.0; - inherit: "default" 0.0; - visible: 1; - align: 0 1; - } - } part { name: "handle"; mouse_events: 1; scale: 1; @@ -2626,12 +2556,10 @@ group { name: "elm/entry/handler/end/default"; visible: 0; fixed: 1 1; align: 0 0; - rel1.offset: -7 0; min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC; max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC; image { - normal: "copy&paste_handler_right_bottom.png"; - border: 0 0 0 0; + normal: "copy&paste_handler_bottom_r.png"; } } description { state: "show" 0.0; @@ -2643,20 +2571,23 @@ group { name: "elm/entry/handler/end/default"; visible: 1; align: 0 1; image { - normal: "copy&paste_handler_right_top.png"; + normal: "copy&paste_handler_top_r.png"; } } description { state: "bottom_reversed" 0.0; inherit: "default" 0.0; visible: 1; - align: 0 0; + align: 1 0; + image { + normal: "copy&paste_handler_bottom_l.png"; + } } description { state: "top_reversed" 0.0; inherit: "default" 0.0; visible: 1; - align: 0 1; + align: 1 1; image { - normal: "copy&paste_handler_right_top.png"; + normal: "copy&paste_handler_top_l.png"; } } } @@ -2675,7 +2606,6 @@ group { name: "elm/entry/handler/end/default"; script { set_int(handler_focused, 0); set_state(PART:"handle", "default", 0.0); - set_state(PART:"edge", "default", 0.0); } } program { name: "top"; @@ -2688,10 +2618,8 @@ group { name: "elm/entry/handler/end/default"; set_int(handler_ontop, 1); if ((focused == 1) && (disabled == 0)) { set_state(PART:"handle", "top", 0.0); - set_state(PART:"edge", "top", 0.0); } else { set_state(PART:"handle", "default", 0.0); - set_state(PART:"edge", "default", 0.0); } } } @@ -2705,10 +2633,8 @@ group { name: "elm/entry/handler/end/default"; set_int(handler_ontop, 0); if ((focused == 1) && (disabled == 0)) { set_state(PART:"handle", "show", 0.0); - set_state(PART:"edge", "show", 0.0); } else { set_state(PART:"handle", "default", 0.0); - set_state(PART:"edge", "default", 0.0); } } } @@ -2720,10 +2646,8 @@ group { name: "elm/entry/handler/end/default"; disabled = get_int(handler_disabled); if (disabled == 0) { set_state(PART:"handle", "bottom_reversed", 0.0); - set_state(PART:"edge", "bottom_reversed", 0.0); } else { set_state(PART:"handle", "default", 0.0); - set_state(PART:"edge", "default", 0.0); } } } @@ -2735,10 +2659,8 @@ group { name: "elm/entry/handler/end/default"; disabled = get_int(handler_disabled); if (disabled == 0) { set_state(PART:"handle", "top_reversed", 0.0); - set_state(PART:"edge", "top_reversed", 0.0); } else { set_state(PART:"handle", "default", 0.0); - set_state(PART:"edge", "default", 0.0); } } } @@ -2773,32 +2695,10 @@ group { name: "elm/entry/handler/end/spinner/vertical"; group { name: "elm/entry/cursor_handle/default"; images { - set { - name: "copy&paste_handler_center_circle"; - image { - image: SMALL"images/Copy_Paste/copy&paste_handler_center.png" COMP; - } - image { - image: MEDIUM"images/Copy_Paste/copy&paste_handler_center.png" COMP; - } - } + image: "copy&paste_handler_bottom_center.png" COMP; + image: "copy&paste_handler_top_center.png" COMP; } parts { - part { name: "sens"; - type: RECT; - scale: 1; - mouse_events: 1; - description { state: "default" 0.0; - visible: 0; - color: 0 0 0 0; - rel1 { relative: -0.25 0.0; to: "handle";} - rel2 { relative: 1.25 1.0; to: "handle";} - } - description { state: "show" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } part { name: "handle"; scale: 1; mouse_events: 1; @@ -2808,12 +2708,11 @@ group { name: "elm/entry/cursor_handle/default"; align: 0 0; visible: 0; align: 0.5 0; + rel1.offset: -2 0; image { - normal: "copy&paste_handler_center_circle"; - border: 0 0 0 0; + normal: "copy&paste_handler_bottom_center.png"; } image.middle: SOLID; - fill.smooth: 0; } description { state: "show" 0.0; inherit: "default" 0.0; @@ -2823,6 +2722,9 @@ group { name: "elm/entry/cursor_handle/default"; inherit: "default" 0.0; visible: 1; align: 0.5 1.0; + image { + normal: "copy&paste_handler_top_center.png"; + } } } } @@ -2840,7 +2742,6 @@ group { name: "elm/entry/cursor_handle/default"; } else { set_state(PART:"handle", "show", 0.0); } - set_state(PART:"sens", "show", 0.0); } } program { name: "unfocused"; @@ -2848,7 +2749,6 @@ group { name: "elm/entry/cursor_handle/default"; source: "edje"; script { set_state(PART:"handle", "default", 0.0); - set_state(PART:"sens", "default", 0.0); } } program { name: "show"; @@ -2857,7 +2757,6 @@ group { name: "elm/entry/cursor_handle/default"; script { set_int(on_top, 0); set_state(PART:"handle", "show", 0.0); - set_state(PART:"sens", "show", 0.0); } } program { name: "hide"; @@ -2865,7 +2764,6 @@ group { name: "elm/entry/cursor_handle/default"; source: "edje"; script { set_state(PART:"handle", "default", 0.0); - set_state(PART:"sens", "default", 0.0); } } program { name: "top"; @@ -2874,7 +2772,6 @@ group { name: "elm/entry/cursor_handle/default"; script { set_int(on_top, 1); set_state(PART:"handle", "top", 0.0); - set_state(PART:"sens", "show", 0.0); } } } |