From 060653cd2488225565fe9807b4752a78dc3aed2b Mon Sep 17 00:00:00 2001 From: Shinwoo Kim Date: Sat, 26 Nov 2011 21:39:05 +0900 Subject: [PATCH] [*] revert to d0268df64ef9cd87d4dffc1aa24f85ba04a829a7 (control bar open close signals added) --- themes/groups/naviframe.edc | 632 +++++++++++++++++++++++++++++++------------- 1 file changed, 448 insertions(+), 184 deletions(-) diff --git a/themes/groups/naviframe.edc b/themes/groups/naviframe.edc index b7186e0..dfbc7b1 100644 --- a/themes/groups/naviframe.edc +++ b/themes/groups/naviframe.edc @@ -151,7 +151,7 @@ rel1.relative: 0.0 1.0; rel1.to_y: "optionheader_bg"; rel2.relative: 1.0 0.0; - rel2.to_y: "controlbar_bg"; + rel2.to_y: "controlbar_clip"; } description { state: "left" 0.0; inherit: "default" 0.0; @@ -376,7 +376,7 @@ visible: 1; } } - part { name: "controlbar_bg"; + part { name: "controlbar_clip"; type: RECT; scale: 1; description { state: "default" 0.0; @@ -384,7 +384,6 @@ max: 999999 0; fixed: 0 1; align: 0.5 1; - color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC; visible: 0; rel1.to_x: "elm.swallow.content"; rel2.to_x: "elm.swallow.content"; @@ -396,26 +395,31 @@ visible: 1; } } + part { name: "controlbar_bg"; + type: RECT; + description { state: "default" 0.0; + rel1 { to: "controlbar_clip"; } + rel2 { to: "controlbar_clip"; } + color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC; + } + } part { name: "elm.swallow.prev_btn"; type: SWALLOW; scale: 1; + clip_to: "controlbar_clip"; description { state: "default" 0.0; - min: 0 CONTROLBAR_SMALL_HEIGHT_INC; - max: 0 CONTROLBAR_SMALL_HEIGHT_INC; fixed: 1 1; - align: 0 1; + align: 0.0 0.5; rel1.to: "controlbar_bg"; + rel1.relative: 0 0; rel2.to: "controlbar_bg"; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - min: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC; - max: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC; + rel2.relative: 0 1; } } part { name: "elm.swallow.controlbar"; type: SWALLOW; scale: 1; + clip_to: "controlbar_clip"; description { state: "default" 0.0; rel1.to: "elm.swallow.prev_btn"; rel1.relative: 1 0; @@ -426,6 +430,7 @@ part { name: "padding_after_controlbar"; type: RECT; scale: 1; + clip_to: "controlbar_clip"; description { state: "default" 0.0; min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC; max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC; @@ -534,16 +539,14 @@ signal: "elm,state,prev_btn,show"; source: "elm"; script { - emit("elm,state,controlbar_bg,show", "elm"); - set_state(PART:"elm.swallow.prev_btn", "show", 0.0); + emit("elm,state,controlbar_clip,show", "elm"); } } program { name: "prev_btn_hide"; signal: "elm,state,prev_btn,hide"; source: "elm"; script { - emit("elm,state,controlbar_bg,hide", "elm"); - set_state(PART:"elm.swallow.prev_btn", "default", 0.0); + emit("elm,state,controlbar_clip,hide", "elm"); } } program { name: "left_btn_show"; @@ -588,31 +591,31 @@ signal: "elm,state,elm.swallow.controlbar,show"; source: "elm"; script { - emit("elm,state,controlbar_bg,show", "elm"); + emit("elm,state,controlbar_clip,show", "elm"); } } program { name: "controlbar_hide"; signal: "elm,state,elm.swallow.controlbar,hide"; source: "elm"; script { - emit("elm,state,controlbar_bg,hide", "elm"); + emit("elm,state,controlbar_clip,hide", "elm"); } } - program { name: "controlbar_bg_show"; - signal: "elm,state,controlbar_bg,show"; + program { name: "controlbar_clip_show"; + signal: "elm,state,controlbar_clip,show"; source: "elm"; script { - set_state(PART:"controlbar_bg", "show", 0.0); + set_state(PART:"controlbar_clip", "show", 0.0); set_int(cbar_bg, get_int(cbar_bg) + 1); } } - program { name: "controlbar_bg_hide"; - signal: "elm,state,controlbar_bg,hide"; + program { name: "controlbar_clip_hide"; + signal: "elm,state,controlbar_clip,hide"; source: "elm"; script { set_int(cbar_bg, get_int(cbar_bg) - 1); if (get_int(cbar_bg) <= 0) - set_state(PART:"controlbar_bg", "default", 0.0); + set_state(PART:"controlbar_clip", "default", 0.0); } } program { name: "optionheader_show"; @@ -681,6 +684,36 @@ set_int(oh_close, 0); } } + program { name: "controlbar_open"; + signal: "elm,state,controlbar,open"; + source: ""; + action: STATE_SET "show" 0.0; + target: "controlbar_clip"; + transition: LINEAR 0.2; + } + program { name: "controlbar_close"; + signal: "elm,state,controlbar,close"; + source: ""; + action: STATE_SET "default" 0.0; + target: "controlbar_clip"; + transition: LINEAR 0.2; + } + program { name: "controlbar_instant_open"; + signal: "elm,state,controlbar,instant_open"; + source: ""; + script { + emit("elm,state,prev_btn,show", "elm"); + emit("elm,state,elm.swallow.controlbar,show", "elm"); + } + } + program { name: "controlbar_instant_close"; + signal: "elm,state,controlbar,instant_close"; + source: ""; + script { + emit("elm,state,prev_btn,hide", "elm"); + emit("elm,state,elm.swallow.controlbar,hide", "elm"); + } + } program { name: "show_finished"; action: SIGNAL_EMIT "elm,action,show,finished" ""; } @@ -846,7 +879,7 @@ rel1.relative: 0.0 1.0; rel1.to_y: "optionheader_bg"; rel2.relative: 1.0 0.0; - rel2.to_y: "controlbar_bg"; + rel2.to_y: "controlbar_clip"; } description { state: "left" 0.0; inherit: "default" 0.0; @@ -1071,7 +1104,7 @@ color: 255 255 255 255; } } - part { name: "controlbar_bg"; + part { name: "controlbar_clip"; type: RECT; scale: 1; description { state: "default" 0.0; @@ -1079,7 +1112,6 @@ max: 999999 0; fixed: 0 1; align: 0.5 1; - color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC; visible: 0; rel1.to_x: "elm.swallow.content"; rel2.to_x: "elm.swallow.content"; @@ -1091,26 +1123,31 @@ visible: 1; } } + part { name: "controlbar_bg"; + type: RECT; + description { state: "default" 0.0; + rel1 { to: "controlbar_clip"; } + rel2 { to: "controlbar_clip"; } + color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC; + } + } part { name: "elm.swallow.prev_btn"; type: SWALLOW; scale: 1; + clip_to: "controlbar_clip"; description { state: "default" 0.0; - min: 0 CONTROLBAR_SMALL_HEIGHT_INC; - max: 0 CONTROLBAR_SMALL_HEIGHT_INC; fixed: 1 1; - align: 0 1; + align: 0.0 0.5; rel1.to: "controlbar_bg"; + rel1.relative: 0 0; rel2.to: "controlbar_bg"; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - min: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC; - max: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC; + rel2.relative: 0 1; } } part { name: "elm.swallow.controlbar"; type: SWALLOW; scale: 1; + clip_to: "controlbar_clip"; description { state: "default" 0.0; rel1.to: "elm.swallow.prev_btn"; rel1.relative: 1 0; @@ -1121,6 +1158,7 @@ part { name: "padding_after_controlbar"; type: RECT; scale: 1; + clip_to: "controlbar_clip"; description { state: "default" 0.0; min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC; max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC; @@ -1229,16 +1267,14 @@ signal: "elm,state,prev_btn,show"; source: "elm"; script { - emit("elm,state,controlbar_bg,show", "elm"); - set_state(PART:"elm.swallow.prev_btn", "show", 0.0); + emit("elm,state,controlbar_clip,show", "elm"); } } program { name: "prev_btn_hide"; signal: "elm,state,prev_btn,hide"; source: "elm"; script { - emit("elm,state,controlbar_bg,hide", "elm"); - set_state(PART:"elm.swallow.prev_btn", "default", 0.0); + emit("elm,state,controlbar_clip,hide", "elm"); } } program { name: "left_btn_show"; @@ -1284,31 +1320,31 @@ source: "elm"; action: STATE_SET "show" 0.0; script { - emit("elm,state,controlbar_bg,show", "elm"); + emit("elm,state,controlbar_clip,show", "elm"); } } program { name: "controlbar_hide"; signal: "elm,state,elm.swallow.controlbar,hide"; source: "elm"; script { - emit("elm,state,controlbar_bg,hide", "elm"); + emit("elm,state,controlbar_clip,hide", "elm"); } } - program { name: "controlbar_bg_show"; - signal: "elm,state,controlbar_bg,show"; + program { name: "controlbar_clip_show"; + signal: "elm,state,controlbar_clip,show"; source: "elm"; script { - set_state(PART:"controlbar_bg", "show", 0.0); + set_state(PART:"controlbar_clip", "show", 0.0); set_int(cbar_bg, get_int(cbar_bg) + 1); } } - program { name: "controlbar_bg_hide"; - signal: "elm,state,controlbar_bg,hide"; + program { name: "controlbar_clip_hide"; + signal: "elm,state,controlbar_clip,hide"; source: "elm"; script { set_int(cbar_bg, get_int(cbar_bg) - 1); if (get_int(cbar_bg) <= 0) - set_state(PART:"controlbar_bg", "default", 0.0); + set_state(PART:"controlbar_clip", "default", 0.0); } } program { name: "optionheader_show"; @@ -1377,6 +1413,36 @@ set_int(oh_close, 0); } } + program { name: "controlbar_open"; + signal: "elm,state,controlbar,open"; + source: ""; + action: STATE_SET "show" 0.0; + target: "controlbar_clip"; + transition: LINEAR 0.2; + } + program { name: "controlbar_close"; + signal: "elm,state,controlbar,close"; + source: ""; + action: STATE_SET "default" 0.0; + target: "controlbar_clip"; + transition: LINEAR 0.2; + } + program { name: "controlbar_instant_open"; + signal: "elm,state,controlbar,instant_open"; + source: ""; + script { + emit("elm,state,prev_btn,show", "elm"); + emit("elm,state,elm.swallow.controlbar,show", "elm"); + } + } + program { name: "controlbar_instant_close"; + signal: "elm,state,controlbar,instant_close"; + source: ""; + script { + emit("elm,state,prev_btn,hide", "elm"); + emit("elm,state,elm.swallow.controlbar,hide", "elm"); + } + } program { name: "show_finished"; action: SIGNAL_EMIT "elm,action,show,finished" ""; } @@ -1435,7 +1501,7 @@ rel1.relative: 0.0 1.0; rel1.to_y: "title_clip"; rel2.relative: 1.0 0.0; - rel2.to_y: "controlbar_bg"; + rel2.to_y: "controlbar_clip"; } description { state: "left" 0.0; inherit: "default" 0.0; @@ -1633,7 +1699,7 @@ rel2.relative: 0.8 1; } } - part { name: "controlbar_bg"; + part { name: "controlbar_clip"; type: RECT; scale: 1; description { state: "default" 0.0; @@ -1641,7 +1707,6 @@ max: 999999 0; fixed: 0 1; align: 0.5 1; - color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC; visible: 0; rel1.to_x: "elm.swallow.content"; rel2.to_x: "elm.swallow.content"; @@ -1653,26 +1718,31 @@ visible: 1; } } + part { name: "controlbar_bg"; + type: RECT; + description { state: "default" 0.0; + rel1 { to: "controlbar_clip"; } + rel2 { to: "controlbar_clip"; } + color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC; + } + } part { name: "elm.swallow.prev_btn"; type: SWALLOW; scale: 1; + clip_to: "controlbar_clip"; description { state: "default" 0.0; - min: 0 CONTROLBAR_SMALL_HEIGHT_INC; - max: 0 CONTROLBAR_SMALL_HEIGHT_INC; fixed: 1 1; - align: 0 1; + align: 0.0 0.5; rel1.to: "controlbar_bg"; + rel1.relative: 0 0; rel2.to: "controlbar_bg"; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - min: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC; - max: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC; + rel2.relative: 0 1; } } part { name: "elm.swallow.controlbar"; type: SWALLOW; scale: 1; + clip_to: "controlbar_clip"; description { state: "default" 0.0; rel1.to: "elm.swallow.prev_btn"; rel1.relative: 1 0; @@ -1683,6 +1753,7 @@ part { name: "padding_after_controlbar"; type: RECT; scale: 1; + clip_to: "controlbar_clip"; description { state: "default" 0.0; min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC; max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC; @@ -1780,16 +1851,14 @@ signal: "elm,state,prev_btn,show"; source: "elm"; script { - emit("elm,state,controlbar_bg,show", "elm"); - set_state(PART:"elm.swallow.prev_btn", "show", 0.0); + emit("elm,state,controlbar_clip,show", "elm"); } } program { name: "prev_btn_hide"; signal: "elm,state,prev_btn,hide"; source: "elm"; script { - emit("elm,state,controlbar_bg,hide", "elm"); - set_state(PART:"elm.swallow.prev_btn", "default", 0.0); + emit("elm,state,controlbar_clip,hide", "elm"); } } program { name: "left_btn_show"; @@ -1821,31 +1890,61 @@ source: "elm"; action: STATE_SET "show" 0.0; script { - emit("elm,state,controlbar_bg,show", "elm"); + emit("elm,state,controlbar_clip,show", "elm"); } } program { name: "controlbar_hide"; signal: "elm,state,elm.swallow.controlbar,hide"; source: "elm"; script { - emit("elm,state,controlbar_bg,hide", "elm"); + emit("elm,state,controlbar_clip,hide", "elm"); } } - program { name: "controlbar_bg_show"; - signal: "elm,state,controlbar_bg,show"; + program { name: "controlbar_clip_show"; + signal: "elm,state,controlbar_clip,show"; source: "elm"; script { - set_state(PART:"controlbar_bg", "show", 0.0); + set_state(PART:"controlbar_clip", "show", 0.0); set_int(cbar_bg, get_int(cbar_bg) + 1); } } - program { name: "controlbar_bg_hide"; - signal: "elm,state,controlbar_bg,hide"; + program { name: "controlbar_clip_hide"; + signal: "elm,state,controlbar_clip,hide"; source: "elm"; script { set_int(cbar_bg, get_int(cbar_bg) - 1); if (get_int(cbar_bg) <= 0) - set_state(PART:"controlbar_bg", "default", 0.0); + set_state(PART:"controlbar_clip", "default", 0.0); + } + } + program { name: "controlbar_open"; + signal: "elm,state,controlbar,open"; + source: ""; + action: STATE_SET "show" 0.0; + target: "controlbar_clip"; + transition: LINEAR 0.2; + } + program { name: "controlbar_close"; + signal: "elm,state,controlbar,close"; + source: ""; + action: STATE_SET "default" 0.0; + target: "controlbar_clip"; + transition: LINEAR 0.2; + } + program { name: "controlbar_instant_open"; + signal: "elm,state,controlbar,instant_open"; + source: ""; + script { + emit("elm,state,prev_btn,show", "elm"); + emit("elm,state,elm.swallow.controlbar,show", "elm"); + } + } + program { name: "controlbar_instant_close"; + signal: "elm,state,controlbar,instant_close"; + source: ""; + script { + emit("elm,state,prev_btn,hide", "elm"); + emit("elm,state,elm.swallow.controlbar,hide", "elm"); } } program { name: "show_finished"; @@ -1877,7 +1976,7 @@ description { state: "default" 0.0; align: 0.0 0.0; rel2.relative: 1.0 0.0; - rel2.to_y: "controlbar_bg"; + rel2.to_y: "controlbar_clip"; } description { state: "left" 0.0; inherit: "default" 0.0; @@ -1890,7 +1989,7 @@ rel2.relative: 2.0 0.0; } } - part { name: "controlbar_bg"; + part { name: "controlbar_clip"; type: RECT; scale: 1; description { state: "default" 0.0; @@ -1898,7 +1997,6 @@ max: 999999 0; fixed: 0 1; align: 0.5 1; - color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC; visible: 0; rel1.to_x: "elm.swallow.content"; rel2.to_x: "elm.swallow.content"; @@ -1910,26 +2008,31 @@ visible: 1; } } + part { name: "controlbar_bg"; + type: RECT; + description { state: "default" 0.0; + rel1 { to: "controlbar_clip"; } + rel2 { to: "controlbar_clip"; } + color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC; + } + } part { name: "elm.swallow.prev_btn"; type: SWALLOW; scale: 1; + clip_to: "controlbar_clip"; description { state: "default" 0.0; - min: 0 CONTROLBAR_SMALL_HEIGHT_INC; - max: 0 CONTROLBAR_SMALL_HEIGHT_INC; fixed: 1 1; - align: 0 1; + align: 0.0 0.5; rel1.to: "controlbar_bg"; + rel1.relative: 0 0; rel2.to: "controlbar_bg"; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - min: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC; - max: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC; + rel2.relative: 0 1; } } part { name: "elm.swallow.controlbar"; type: SWALLOW; scale: 1; + clip_to: "controlbar_clip"; description { state: "default" 0.0; rel1.to: "elm.swallow.prev_btn"; rel1.relative: 1 0; @@ -1940,6 +2043,7 @@ part { name: "padding_after_controlbar"; type: RECT; scale: 1; + clip_to: "controlbar_clip"; description { state: "default" 0.0; min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC; max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC; @@ -2025,16 +2129,14 @@ signal: "elm,state,prev_btn,show"; source: "elm"; script { - emit("elm,state,controlbar_bg,show", "elm"); - set_state(PART:"elm.swallow.prev_btn", "show", 0.0); + emit("elm,state,controlbar_clip,show", "elm"); } } program { name: "prev_btn_hide"; signal: "elm,state,prev_btn,hide"; source: "elm"; script { - emit("elm,state,controlbar_bg,hide", "elm"); - set_state(PART:"elm.swallow.prev_btn", "default", 0.0); + emit("elm,state,controlbar_clip,hide", "elm"); } } program { name: "controlbar_show"; @@ -2042,31 +2144,61 @@ source: "elm"; action: STATE_SET "show" 0.0; script { - emit("elm,state,controlbar_bg,show", "elm"); + emit("elm,state,controlbar_clip,show", "elm"); } } program { name: "controlbar_hide"; signal: "elm,state,elm.swallow.controlbar,hide"; source: "elm"; script { - emit("elm,state,controlbar_bg,hide", "elm"); + emit("elm,state,controlbar_clip,hide", "elm"); } } - program { name: "controlbar_bg_show"; - signal: "elm,state,controlbar_bg,show"; + program { name: "controlbar_clip_show"; + signal: "elm,state,controlbar_clip,show"; source: "elm"; script { - set_state(PART:"controlbar_bg", "show", 0.0); + set_state(PART:"controlbar_clip", "show", 0.0); set_int(cbar_bg, get_int(cbar_bg) + 1); } } - program { name: "controlbar_bg_hide"; - signal: "elm,state,controlbar_bg,hide"; + program { name: "controlbar_clip_hide"; + signal: "elm,state,controlbar_clip,hide"; source: "elm"; script { set_int(cbar_bg, get_int(cbar_bg) - 1); if (get_int(cbar_bg) <= 0) - set_state(PART:"controlbar_bg", "default", 0.0); + set_state(PART:"controlbar_clip", "default", 0.0); + } + } + program { name: "controlbar_open"; + signal: "elm,state,controlbar,open"; + source: ""; + action: STATE_SET "show" 0.0; + target: "controlbar_clip"; + transition: LINEAR 0.2; + } + program { name: "controlbar_close"; + signal: "elm,state,controlbar,close"; + source: ""; + action: STATE_SET "default" 0.0; + target: "controlbar_clip"; + transition: LINEAR 0.2; + } + program { name: "controlbar_instant_open"; + signal: "elm,state,controlbar,instant_open"; + source: ""; + script { + emit("elm,state,prev_btn,show", "elm"); + emit("elm,state,elm.swallow.controlbar,show", "elm"); + } + } + program { name: "controlbar_instant_close"; + signal: "elm,state,controlbar,instant_close"; + source: ""; + script { + emit("elm,state,prev_btn,hide", "elm"); + emit("elm,state,elm.swallow.controlbar,hide", "elm"); } } program { name: "show_finished"; @@ -2210,7 +2342,7 @@ rel1.relative: 0.0 1.0; rel1.to_y: "optionheader_bg"; rel2.relative: 1.0 0.0; - rel2.to_y: "controlbar_bg"; + rel2.to_y: "controlbar_clip"; } } part { name: "title_base"; @@ -2425,7 +2557,7 @@ color: 255 255 255 255; } } - part { name: "controlbar_bg"; + part { name: "controlbar_clip"; type: RECT; scale: 1; description { state: "default" 0.0; @@ -2433,7 +2565,6 @@ max: 999999 0; fixed: 0 1; align: 0.5 1; - color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC; visible: 0; rel1.to_x: "elm.swallow.content"; rel2.to_x: "elm.swallow.content"; @@ -2445,26 +2576,31 @@ visible: 1; } } + part { name: "controlbar_bg"; + type: RECT; + description { state: "default" 0.0; + rel1 { to: "controlbar_clip"; } + rel2 { to: "controlbar_clip"; } + color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC; + } + } part { name: "elm.swallow.prev_btn"; type: SWALLOW; scale: 1; + clip_to: "controlbar_clip"; description { state: "default" 0.0; - min: 0 CONTROLBAR_SMALL_HEIGHT_INC; - max: 0 CONTROLBAR_SMALL_HEIGHT_INC; fixed: 1 1; - align: 0 1; + align: 0.0 0.5; rel1.to: "controlbar_bg"; + rel1.relative: 0 0; rel2.to: "controlbar_bg"; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - min: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC; - max: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC; + rel2.relative: 0 1; } } part { name: "elm.swallow.controlbar"; type: SWALLOW; scale: 1; + clip_to: "controlbar_clip"; description { state: "default" 0.0; rel1.to: "elm.swallow.prev_btn"; rel1.relative: 1 0; @@ -2475,6 +2611,7 @@ part { name: "padding_after_controlbar"; type: RECT; scale: 1; + clip_to: "controlbar_clip"; description { state: "default" 0.0; min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC; max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC; @@ -2533,16 +2670,14 @@ signal: "elm,state,prev_btn,show"; source: "elm"; script { - emit("elm,state,controlbar_bg,show", "elm"); - set_state(PART:"elm.swallow.prev_btn", "show", 0.0); + emit("elm,state,controlbar_clip,show", "elm"); } } program { name: "prev_btn_hide"; signal: "elm,state,prev_btn,hide"; source: "elm"; script { - emit("elm,state,controlbar_bg,hide", "elm"); - set_state(PART:"elm.swallow.prev_btn", "default", 0.0); + emit("elm,state,controlbar_clip,hide", "elm"); } } program { name: "left_btn_show"; @@ -2588,31 +2723,31 @@ source: "elm"; action: STATE_SET "show" 0.0; script { - emit("elm,state,controlbar_bg,show", "elm"); + emit("elm,state,controlbar_clip,show", "elm"); } } program { name: "controlbar_hide"; signal: "elm,state,elm.swallow.controlbar,hide"; source: "elm"; script { - emit("elm,state,controlbar_bg,hide", "elm"); + emit("elm,state,controlbar_clip,hide", "elm"); } } - program { name: "controlbar_bg_show"; - signal: "elm,state,controlbar_bg,show"; + program { name: "controlbar_clip_show"; + signal: "elm,state,controlbar_clip,show"; source: "elm"; script { - set_state(PART:"controlbar_bg", "show", 0.0); + set_state(PART:"controlbar_clip", "show", 0.0); set_int(cbar_bg, get_int(cbar_bg) + 1); } } - program { name: "controlbar_bg_hide"; - signal: "elm,state,controlbar_bg,hide"; + program { name: "controlbar_clip_hide"; + signal: "elm,state,controlbar_clip,hide"; source: "elm"; script { set_int(cbar_bg, get_int(cbar_bg) - 1); if (get_int(cbar_bg) <= 0) - set_state(PART:"controlbar_bg", "default", 0.0); + set_state(PART:"controlbar_clip", "default", 0.0); } } program { name: "optionheader_show"; @@ -2681,6 +2816,36 @@ set_int(oh_close, 0); } } + program { name: "controlbar_open"; + signal: "elm,state,controlbar,open"; + source: ""; + action: STATE_SET "show" 0.0; + target: "controlbar_clip"; + transition: LINEAR 0.2; + } + program { name: "controlbar_close"; + signal: "elm,state,controlbar,close"; + source: ""; + action: STATE_SET "default" 0.0; + target: "controlbar_clip"; + transition: LINEAR 0.2; + } + program { name: "controlbar_instant_open"; + signal: "elm,state,controlbar,instant_open"; + source: ""; + script { + emit("elm,state,prev_btn,show", "elm"); + emit("elm,state,elm.swallow.controlbar,show", "elm"); + } + } + program { name: "controlbar_instant_close"; + signal: "elm,state,controlbar,instant_close"; + source: ""; + script { + emit("elm,state,prev_btn,hide", "elm"); + emit("elm,state,elm.swallow.controlbar,hide", "elm"); + } + } program { name: "show_finished"; action: SIGNAL_EMIT "elm,action,show,finished" ""; } @@ -2847,7 +3012,7 @@ rel1.relative: 0.0 1.0; rel1.to_y: "optionheader_bg"; rel2.relative: 1.0 0.0; - rel2.to_y: "controlbar_bg"; + rel2.to_y: "controlbar_clip"; } } part { name: "title_base"; @@ -3062,7 +3227,7 @@ color: 255 255 255 255; } } - part { name: "controlbar_bg"; + part { name: "controlbar_clip"; type: RECT; scale: 1; description { state: "default" 0.0; @@ -3070,7 +3235,6 @@ max: 999999 0; fixed: 0 1; align: 0.5 1; - color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC; visible: 0; rel1.to_x: "elm.swallow.content"; rel2.to_x: "elm.swallow.content"; @@ -3082,26 +3246,31 @@ visible: 1; } } + part { name: "controlbar_bg"; + type: RECT; + description { state: "default" 0.0; + rel1 { to: "controlbar_clip"; } + rel2 { to: "controlbar_clip"; } + color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC; + } + } part { name: "elm.swallow.prev_btn"; type: SWALLOW; scale: 1; + clip_to: "controlbar_clip"; description { state: "default" 0.0; - min: 0 CONTROLBAR_SMALL_HEIGHT_INC; - max: 0 CONTROLBAR_SMALL_HEIGHT_INC; fixed: 1 1; - align: 0 1; + align: 0.0 0.5; rel1.to: "controlbar_bg"; + rel1.relative: 0 0; rel2.to: "controlbar_bg"; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - min: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC; - max: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC; + rel2.relative: 0 1; } } part { name: "elm.swallow.controlbar"; type: SWALLOW; scale: 1; + clip_to: "controlbar_clip"; description { state: "default" 0.0; rel1.to: "elm.swallow.prev_btn"; rel1.relative: 1 0; @@ -3112,6 +3281,7 @@ part { name: "padding_after_controlbar"; type: RECT; scale: 1; + clip_to: "controlbar_clip"; description { state: "default" 0.0; min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC; max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC; @@ -3170,16 +3340,14 @@ signal: "elm,state,prev_btn,show"; source: "elm"; script { - emit("elm,state,controlbar_bg,show", "elm"); - set_state(PART:"elm.swallow.prev_btn", "show", 0.0); + emit("elm,state,controlbar_clip,show", "elm"); } } program { name: "prev_btn_hide"; signal: "elm,state,prev_btn,hide"; source: "elm"; script { - emit("elm,state,controlbar_bg,hide", "elm"); - set_state(PART:"elm.swallow.prev_btn", "default", 0.0); + emit("elm,state,controlbar_clip,hide", "elm"); } } program { name: "left_btn_show"; @@ -3225,31 +3393,31 @@ source: "elm"; action: STATE_SET "show" 0.0; script { - emit("elm,state,controlbar_bg,show", "elm"); + emit("elm,state,controlbar_clip,show", "elm"); } } program { name: "controlbar_hide"; signal: "elm,state,elm.swallow.controlbar,hide"; source: "elm"; script { - emit("elm,state,controlbar_bg,hide", "elm"); + emit("elm,state,controlbar_clip,hide", "elm"); } } - program { name: "controlbar_bg_show"; - signal: "elm,state,controlbar_bg,show"; + program { name: "controlbar_clip_show"; + signal: "elm,state,controlbar_clip,show"; source: "elm"; script { - set_state(PART:"controlbar_bg", "show", 0.0); + set_state(PART:"controlbar_clip", "show", 0.0); set_int(cbar_bg, get_int(cbar_bg) + 1); } } - program { name: "controlbar_bg_hide"; - signal: "elm,state,controlbar_bg,hide"; + program { name: "controlbar_clip_hide"; + signal: "elm,state,controlbar_clip,hide"; source: "elm"; script { set_int(cbar_bg, get_int(cbar_bg) - 1); if (get_int(cbar_bg) <= 0) - set_state(PART:"controlbar_bg", "default", 0.0); + set_state(PART:"controlbar_clip", "default", 0.0); } } program { name: "optionheader_show"; @@ -3318,6 +3486,36 @@ set_int(oh_close, 0); } } + program { name: "controlbar_open"; + signal: "elm,state,controlbar,open"; + source: ""; + action: STATE_SET "show" 0.0; + target: "controlbar_clip"; + transition: LINEAR 0.2; + } + program { name: "controlbar_close"; + signal: "elm,state,controlbar,close"; + source: ""; + action: STATE_SET "default" 0.0; + target: "controlbar_clip"; + transition: LINEAR 0.2; + } + program { name: "controlbar_instant_open"; + signal: "elm,state,controlbar,instant_open"; + source: ""; + script { + emit("elm,state,prev_btn,show", "elm"); + emit("elm,state,elm.swallow.controlbar,show", "elm"); + } + } + program { name: "controlbar_instant_close"; + signal: "elm,state,controlbar,instant_close"; + source: ""; + script { + emit("elm,state,prev_btn,hide", "elm"); + emit("elm,state,elm.swallow.controlbar,hide", "elm"); + } + } program { name: "show_finished"; action: SIGNAL_EMIT "elm,action,show,finished" ""; } @@ -3376,7 +3574,7 @@ rel1.relative: 0.0 1.0; rel1.to_y: "title_clip"; rel2.relative: 1.0 0.0; - rel2.to_y: "controlbar_bg"; + rel2.to_y: "controlbar_clip"; } } part { name: "title_base"; @@ -3564,7 +3762,7 @@ rel2.relative: 0.8 1; } } - part { name: "controlbar_bg"; + part { name: "controlbar_clip"; type: RECT; scale: 1; description { state: "default" 0.0; @@ -3572,7 +3770,6 @@ max: 999999 0; fixed: 0 1; align: 0.5 1; - color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC; visible: 0; rel1.to_x: "elm.swallow.content"; rel2.to_x: "elm.swallow.content"; @@ -3584,26 +3781,31 @@ visible: 1; } } + part { name: "controlbar_bg"; + type: RECT; + description { state: "default" 0.0; + rel1 { to: "controlbar_clip"; } + rel2 { to: "controlbar_clip"; } + color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC; + } + } part { name: "elm.swallow.prev_btn"; type: SWALLOW; scale: 1; + clip_to: "controlbar_clip"; description { state: "default" 0.0; - min: 0 CONTROLBAR_SMALL_HEIGHT_INC; - max: 0 CONTROLBAR_SMALL_HEIGHT_INC; fixed: 1 1; - align: 0 1; + align: 0.0 0.5; rel1.to: "controlbar_bg"; + rel1.relative: 0 0; rel2.to: "controlbar_bg"; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - min: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC; - max: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC; + rel2.relative: 0 1; } } part { name: "elm.swallow.controlbar"; type: SWALLOW; scale: 1; + clip_to: "controlbar_clip"; description { state: "default" 0.0; rel1.to: "elm.swallow.prev_btn"; rel1.relative: 1 0; @@ -3614,6 +3816,7 @@ part { name: "padding_after_controlbar"; type: RECT; scale: 1; + clip_to: "controlbar_clip"; description { state: "default" 0.0; min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC; max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC; @@ -3661,16 +3864,14 @@ signal: "elm,state,prev_btn,show"; source: "elm"; script { - emit("elm,state,controlbar_bg,show", "elm"); - set_state(PART:"elm.swallow.prev_btn", "show", 0.0); + emit("elm,state,controlbar_clip,show", "elm"); } } program { name: "prev_btn_hide"; signal: "elm,state,prev_btn,hide"; source: "elm"; script { - emit("elm,state,controlbar_bg,hide", "elm"); - set_state(PART:"elm.swallow.prev_btn", "default", 0.0); + emit("elm,state,controlbar_clip,hide", "elm"); } } program { name: "left_btn_show"; @@ -3702,31 +3903,61 @@ source: "elm"; action: STATE_SET "show" 0.0; script { - emit("elm,state,controlbar_bg,show", "elm"); + emit("elm,state,controlbar_clip,show", "elm"); } } program { name: "controlbar_hide"; signal: "elm,state,elm.swallow.controlbar,hide"; source: "elm"; script { - emit("elm,state,controlbar_bg,hide", "elm"); + emit("elm,state,controlbar_clip,hide", "elm"); } } - program { name: "controlbar_bg_show"; - signal: "elm,state,controlbar_bg,show"; + program { name: "controlbar_clip_show"; + signal: "elm,state,controlbar_clip,show"; source: "elm"; script { - set_state(PART:"controlbar_bg", "show", 0.0); + set_state(PART:"controlbar_clip", "show", 0.0); set_int(cbar_bg, get_int(cbar_bg) + 1); } } - program { name: "controlbar_bg_hide"; - signal: "elm,state,controlbar_bg,hide"; + program { name: "controlbar_clip_hide"; + signal: "elm,state,controlbar_clip,hide"; source: "elm"; script { set_int(cbar_bg, get_int(cbar_bg) - 1); if (get_int(cbar_bg) <= 0) - set_state(PART:"controlbar_bg", "default", 0.0); + set_state(PART:"controlbar_clip", "default", 0.0); + } + } + program { name: "controlbar_open"; + signal: "elm,state,controlbar,open"; + source: ""; + action: STATE_SET "show" 0.0; + target: "controlbar_clip"; + transition: LINEAR 0.2; + } + program { name: "controlbar_close"; + signal: "elm,state,controlbar,close"; + source: ""; + action: STATE_SET "default" 0.0; + target: "controlbar_clip"; + transition: LINEAR 0.2; + } + program { name: "controlbar_instant_open"; + signal: "elm,state,controlbar,instant_open"; + source: ""; + script { + emit("elm,state,prev_btn,show", "elm"); + emit("elm,state,elm.swallow.controlbar,show", "elm"); + } + } + program { name: "controlbar_instant_close"; + signal: "elm,state,controlbar,instant_close"; + source: ""; + script { + emit("elm,state,prev_btn,hide", "elm"); + emit("elm,state,elm.swallow.controlbar,hide", "elm"); } } program { name: "show_finished"; @@ -3758,10 +3989,10 @@ description { state: "default" 0.0; align: 0.0 0.0; rel2.relative: 1.0 0.0; - rel2.to_y: "controlbar_bg"; + rel2.to_y: "controlbar_clip"; } } - part { name: "controlbar_bg"; + part { name: "controlbar_clip"; type: RECT; scale: 1; description { state: "default" 0.0; @@ -3769,7 +4000,6 @@ max: 999999 0; fixed: 0 1; align: 0.5 1; - color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC; visible: 0; rel1.to_x: "elm.swallow.content"; rel2.to_x: "elm.swallow.content"; @@ -3781,26 +4011,31 @@ visible: 1; } } + part { name: "controlbar_bg"; + type: RECT; + description { state: "default" 0.0; + rel1 { to: "controlbar_clip"; } + rel2 { to: "controlbar_clip"; } + color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC; + } + } part { name: "elm.swallow.prev_btn"; type: SWALLOW; scale: 1; + clip_to: "controlbar_clip"; description { state: "default" 0.0; - min: 0 CONTROLBAR_SMALL_HEIGHT_INC; - max: 0 CONTROLBAR_SMALL_HEIGHT_INC; fixed: 1 1; - align: 0 1; + align: 0.0 0.5; rel1.to: "controlbar_bg"; + rel1.relative: 0 0; rel2.to: "controlbar_bg"; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - min: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC; - max: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC; + rel2.relative: 0 1; } } part { name: "elm.swallow.controlbar"; type: SWALLOW; scale: 1; + clip_to: "controlbar_clip"; description { state: "default" 0.0; rel1.to: "elm.swallow.prev_btn"; rel1.relative: 1 0; @@ -3811,6 +4046,7 @@ part { name: "padding_after_controlbar"; type: RECT; scale: 1; + clip_to: "controlbar_clip"; description { state: "default" 0.0; min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC; max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC; @@ -3846,16 +4082,14 @@ signal: "elm,state,prev_btn,show"; source: "elm"; script { - emit("elm,state,controlbar_bg,show", "elm"); - set_state(PART:"elm.swallow.prev_btn", "show", 0.0); + emit("elm,state,controlbar_clip,show", "elm"); } } program { name: "prev_btn_hide"; signal: "elm,state,prev_btn,hide"; source: "elm"; script { - emit("elm,state,controlbar_bg,hide", "elm"); - set_state(PART:"elm.swallow.prev_btn", "default", 0.0); + emit("elm,state,controlbar_clip,hide", "elm"); } } program { name: "controlbar_show"; @@ -3863,31 +4097,61 @@ source: "elm"; action: STATE_SET "show" 0.0; script { - emit("elm,state,controlbar_bg,show", "elm"); + emit("elm,state,controlbar_clip,show", "elm"); } } program { name: "controlbar_hide"; signal: "elm,state,elm.swallow.controlbar,hide"; source: "elm"; script { - emit("elm,state,controlbar_bg,hide", "elm"); + emit("elm,state,controlbar_clip,hide", "elm"); } } - program { name: "controlbar_bg_show"; - signal: "elm,state,controlbar_bg,show"; + program { name: "controlbar_clip_show"; + signal: "elm,state,controlbar_clip,show"; source: "elm"; script { - set_state(PART:"controlbar_bg", "show", 0.0); + set_state(PART:"controlbar_clip", "show", 0.0); set_int(cbar_bg, get_int(cbar_bg) + 1); } } - program { name: "controlbar_bg_hide"; - signal: "elm,state,controlbar_bg,hide"; + program { name: "controlbar_clip_hide"; + signal: "elm,state,controlbar_clip,hide"; source: "elm"; script { set_int(cbar_bg, get_int(cbar_bg) - 1); if (get_int(cbar_bg) <= 0) - set_state(PART:"controlbar_bg", "default", 0.0); + set_state(PART:"controlbar_clip", "default", 0.0); + } + } + program { name: "controlbar_open"; + signal: "elm,state,controlbar,open"; + source: ""; + action: STATE_SET "show" 0.0; + target: "controlbar_clip"; + transition: LINEAR 0.2; + } + program { name: "controlbar_close"; + signal: "elm,state,controlbar,close"; + source: ""; + action: STATE_SET "default" 0.0; + target: "controlbar_clip"; + transition: LINEAR 0.2; + } + program { name: "controlbar_instant_open"; + signal: "elm,state,controlbar,instant_open"; + source: ""; + script { + emit("elm,state,prev_btn,show", "elm"); + emit("elm,state,elm.swallow.controlbar,show", "elm"); + } + } + program { name: "controlbar_instant_close"; + signal: "elm,state,controlbar,instant_close"; + source: ""; + script { + emit("elm,state,prev_btn,hide", "elm"); + emit("elm,state,elm.swallow.controlbar,hide", "elm"); } } program { name: "show_finished"; -- 2.7.4