From 6ff54271fcb1d0bc751cd4414fbc818073c07b6d Mon Sep 17 00:00:00 2001 From: Jaehyun Cho Date: Wed, 19 Jun 2013 14:34:16 +0900 Subject: [PATCH] [naviframe] Support title/subtitle text slide instead of using label slide Change-Id: Ia2ee18883acdf720c6bd05752c2087ef0262d187 --- themes/widgets/naviframe.edc | 1203 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 1063 insertions(+), 140 deletions(-) diff --git a/themes/widgets/naviframe.edc b/themes/widgets/naviframe.edc index 1705b7c..24aa424 100644 --- a/themes/widgets/naviframe.edc +++ b/themes/widgets/naviframe.edc @@ -18,6 +18,10 @@ #define NAVIFRAME_VIEW_TRANS_TIME 0.3 +#define NAVIFRAME_TITLE_SLIDE_TEXT_GAP 60 +#define NAVIFRAME_SUBTITLE_SLIDE_TEXT_GAP 40 +#define NAVIFRAME_TITLE_SLIDE_MAX_COUNT 3 +#define NAVIFRAME_TITLE_SLIDE_SPEED_WEIGHT 0.01 group { name: "elm/naviframe/item/basic/default"; images { @@ -28,9 +32,263 @@ public tbar_bg = 0; //Toolbar BG Show call count public tbar_close = 0; //Toolbar lastest Open/Close status public title_badge_visible = 0; //Title badge visible/hidden status - public title_slide_visible = 0; //Title slide visible/hidden status public landscape = 0; //Landscape mode status + public subtitle = 0; //Subtitle on/off status + + public title_duration = 0; + public subtitle_duration = 0; + public title_slide_stop; + public subtitle_slide_stop; + public title_slide_anim_id; + public subtitle_slide_anim_id; + public title_text_w; + public subtitle_text_w; + public org_title_text_w; + public org_subtitle_text_w; + public title_slide_count = 0; + public subtitle_slide_count = 0; + + public get_width(val) { + new x, y, w, h; + new buf[128]; + new st[31]; + new Float:vl; + + // Title Text + if (val == 0) { + get_geometry(PART:"elm.text.title", x, y, w, h); + set_int(org_title_text_w, w); + + get_text(PART:"elm.text.title", buf, 127); + set_text(PART:"elm.text.full_title", buf); + get_state(PART:"elm.text.title", st, 30, vl); + set_state(PART:"elm.text.full_title", st, 0.0); + get_geometry(PART:"elm.text.full_title", x, y, w, h); + set_int(title_text_w, w); + } + // Subtitle Text + else { + get_geometry(PART:"elm.text.subtitle", x, y, w, h); + set_int(org_subtitle_text_w, w); + + get_text(PART:"elm.text.subtitle", buf, 127); + set_text(PART:"elm.text.full_subtitle", buf); + get_state(PART:"elm.text.subtitle", st, 30, vl); + set_state(PART:"elm.text.full_subtitle", st, 0.0); + get_geometry(PART:"elm.text.full_subtitle", x, y, w, h); + set_int(subtitle_text_w, w); + } + } + + public slide_end_pending(val, Float:pos) { + if (pos >= 1.0) { + // Title Text + if (val == 0) { + if (get_int(title_slide_count) < NAVIFRAME_TITLE_SLIDE_MAX_COUNT) + start_slide(0); + else + stop_slide(0); + } + // Subtitle Text + else{ + if (get_int(subtitle_slide_count) < NAVIFRAME_TITLE_SLIDE_MAX_COUNT) + start_slide(1); + else + stop_slide(1); + } + } + } + + public slide_to_end_anim(val, Float:pos) { + // Title Text + if (val == 0) { + if (get_int(title_slide_stop)) return; + + if (!get_int(subtitle)) { + set_tween_state(PART:"elm.text.slide_begin_title", pos, "title_slide_begin", 0.0, "title_slide_end", 0.0); + set_tween_state(PART:"elm.text.slide_end_title", pos, "title_slide_begin", 0.0, "title_slide_end", 0.0); + } + else { + if (!get_int(landscape)) { + set_tween_state(PART:"elm.text.slide_begin_title", pos, "maintitle_slide_begin", 0.0, "maintitle_slide_end", 0.0); + set_tween_state(PART:"elm.text.slide_end_title", pos, "maintitle_slide_begin", 0.0, "maintitle_slide_end", 0.0); + } + else { + set_tween_state(PART:"elm.text.slide_begin_title", pos, "maintitle_slide_begin_landscape", 0.0, "maintitle_slide_end_landscape", 0.0); + set_tween_state(PART:"elm.text.slide_end_title", pos, "maintitle_slide_begin_landscape", 0.0, "maintitle_slide_end_landscape", 0.0); + } + } + + if (pos >= 1.0) + anim(1, "slide_end_pending", 0); + } + // Subtitle Text + else { + if (get_int(subtitle_slide_stop)) return; + + if (!get_int(landscape)) { + set_tween_state(PART:"elm.text.slide_begin_subtitle", pos, "slide_begin", 0.0, "slide_end", 0.0); + set_tween_state(PART:"elm.text.slide_end_subtitle", pos, "slide_begin", 0.0, "slide_end", 0.0); + } + else { + set_tween_state(PART:"elm.text.slide_begin_subtitle", pos, "slide_begin_landscape", 0.0, "slide_end_landscape", 0.0); + set_tween_state(PART:"elm.text.slide_end_subtitle", pos, "slide_begin_landscape", 0.0, "slide_end_landscape", 0.0); + } + + if (pos >= 1.0) + anim(1, "slide_end_pending", 1); + } + } + + public slide_to_end(val) { + new slide_anim_id; + new Float:duration; + + // Title Text + if (val == 0) { + if (get_int(title_slide_stop)) return; + + duration = get_float(title_duration); + slide_anim_id = anim(duration, "slide_to_end_anim", 0); + set_int(title_slide_anim_id, slide_anim_id); + } + // Subtitle Text + else { + if (get_int(subtitle_slide_stop)) return; + + duration = get_float(subtitle_duration); + slide_anim_id = anim(duration, "slide_to_end_anim", 1); + set_int(subtitle_slide_anim_id, slide_anim_id); + } + } + + public start_slide(val) { + new Float:len; + new buf[128]; + + // Title Text + if (val == 0) { + set_int(title_slide_count, get_int(title_slide_count) + 1); + + if (get_int(title_slide_count) == 1) { + get_width(0); + + if (get_int(title_text_w) <= get_int(org_title_text_w)) { + set_int(title_slide_count, 0); + return; + } + + len = get_int(title_text_w) + NAVIFRAME_TITLE_SLIDE_TEXT_GAP; + set_float(title_duration, len NAVIFRAME_TITLE_SLIDE_SPEED_WEIGHT); + + set_int(title_slide_stop, 0); + + get_text(PART:"elm.text.title", buf, 127); + set_text(PART:"elm.text.slide_begin_title", buf); + set_text(PART:"elm.text.slide_end_title", buf); + } + + if (!get_int(subtitle)) { + set_state(PART:"elm.text.slide_begin_title", "title_slide_begin", 0.0); + set_state(PART:"elm.text.slide_end_title", "title_slide_begin", 0.0); + } + else { + set_state(PART:"elm.text.slide_begin_title", "maintitle_slide_begin", 0.0); + set_state(PART:"elm.text.slide_end_title", "maintitle_slide_begin", 0.0); + } + + if (get_int(title_slide_count) == 1) { + set_state(PART:"title_text_clip", "slide", 0.0); + set_state(PART:"slide_title_text_clip", "slide", 0.0); + } + + slide_to_end(0); + } + // Subtitle Text + else { + set_int(subtitle_slide_count, get_int(subtitle_slide_count) + 1); + + if (get_int(subtitle_slide_count) == 1) { + get_width(1); + + if (get_int(subtitle_text_w) <= get_int(org_subtitle_text_w)) { + set_int(subtitle_slide_count, 0); + return; + } + + len = get_int(subtitle_text_w) + NAVIFRAME_SUBTITLE_SLIDE_TEXT_GAP; + if (!get_int(landscape)) + set_float(subtitle_duration, len * NAVIFRAME_TITLE_SLIDE_SPEED_WEIGHT); + else + set_float(subtitle_duration, len * NAVIFRAME_TITLE_SLIDE_SPEED_WEIGHT); + + set_int(subtitle_slide_stop, 0); + + get_text(PART:"elm.text.subtitle", buf, 127); + set_text(PART:"elm.text.slide_begin_subtitle", buf); + set_text(PART:"elm.text.slide_end_subtitle", buf); + } + + if (!get_int(landscape)) { + set_state(PART:"elm.text.slide_begin_subtitle", "slide_begin", 0.0); + set_state(PART:"elm.text.slide_end_subtitle", "slide_begin", 0.0); + } + else { + set_state(PART:"elm.text.slide_begin_subtitle", "slide_begin_landscape", 0.0); + set_state(PART:"elm.text.slide_end_subtitle", "slide_begin_landscape", 0.0); + } + + if (get_int(subtitle_slide_count) == 1) { + set_state(PART:"subtitle_text_clip", "slide", 0.0); + set_state(PART:"slide_subtitle_text_clip", "slide", 0.0); + } + + slide_to_end(1); + } + } + + public stop_slide(val) { + new slide_anim_id; + + // Title Text + if (val == 0) { + set_int(title_slide_stop, 1); + set_int(title_slide_count, 0); + + slide_anim_id = get_int(title_slide_anim_id); + cancel_anim(slide_anim_id); + set_int(title_slide_anim_id, 0); + + set_text(PART:"elm.text.slide_begin_title", ""); + set_text(PART:"elm.text.slide_end_title", ""); + + set_state(PART:"elm.text.slide_begin_title", "default", 0.0); + set_state(PART:"elm.text.slide_end_title", "default", 0.0); + + set_state(PART:"title_text_clip", "default", 0.0); + set_state(PART:"slide_title_text_clip", "default", 0.0); + } + // Subtitle Text + else { + set_int(subtitle_slide_stop, 1); + set_int(subtitle_slide_count, 0); + + slide_anim_id = get_int(subtitle_slide_anim_id); + cancel_anim(slide_anim_id); + set_int(subtitle_slide_anim_id, 0); + + set_text(PART:"elm.text.slide_begin_subtitle", ""); + set_text(PART:"elm.text.slide_end_subtitle", ""); + + set_state(PART:"elm.text.slide_begin_subtitle", "default", 0.0); + set_state(PART:"elm.text.slide_end_subtitle", "default", 0.0); + + set_state(PART:"subtitle_text_clip", "default", 0.0); + set_state(PART:"slide_subtitle_text_clip", "default", 0.0); + } + } } + parts { part { name: "clipper"; type: RECT; @@ -173,7 +431,8 @@ } part { name: "title_text_bg"; type: RECT; - repeat_events: 1; + scale: 1; + mouse_events: 0; description { state: "default" 0.0; visible: 0; min: 0 NAVIFRAME_TITLE_TEXT_BG_H_INC; @@ -190,7 +449,7 @@ } part { name: "maintitle_text_bg"; type: RECT; - repeat_events: 1; + mouse_events: 0; description { state: "default" 0.0; visible: 0; rel1 { relative: 0.0 0.0; to: "title_text_bg"; } @@ -202,11 +461,25 @@ rel2 { relative: 0.0 0.0; to_x: "badge_padding"; to_y: "subtitle_top_padding"; } } } + part { name: "title_text_clip"; + type: RECT; + mouse_events: 0; + clip_to: "title_clip"; + description { state: "default" 0.0; + color: NAVIFRAME_TITLE_TEXT_COLOR_INC; + rel1.to: "maintitle_text_bg"; + rel2.to: "maintitle_text_bg"; + } + description { state: "slide" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } part { name: "elm.text.title"; type: TEXT; effect: FAR_SHADOW BOTTOM; scale: 1; - clip_to: "title_clip"; + clip_to: "title_text_clip"; description { state: "default" 0.0; text { font: "Tizen:style=Bold"; size: NAVIFRAME_TITLE_FONT_SIZE_INC; @@ -224,7 +497,6 @@ rel2.to: "maintitle_text_bg"; } description { state: "subtitle_is_set" 0.0; - inherit: "default" 0.0; text { font: "Tizen:style=Bold"; size: NAVIFRAME_TITLE_SMALL_FONT_SIZE_INC; min: 0 0; @@ -232,22 +504,223 @@ align: 0.0 0.5; text_class: "tizen"; } + color: NAVIFRAME_TITLE_TEXT_COLOR_INC; + color3: 0 0 0 255; + align: 0.0 0.5; + rel1.to: "maintitle_text_bg"; + rel2.to: "maintitle_text_bg"; } description { state: "subtitle_is_set_landscape" 0.0; + inherit: "subtitle_is_set" 0.0; + text.size: NAVIFRAME_LANDSCAPE_TITLE_SMALL_FONT_SIZE_INC; + } + } + part { name: "slide_title_text_clip"; + type: RECT; + mouse_events: 0; + clip_to: "title_clip"; + description { state: "default" 0.0; + visible: 0; + color: NAVIFRAME_TITLE_TEXT_COLOR_INC; + rel1.to: "elm.text.title"; + rel2.to: "elm.text.title"; + } + description { state: "slide" 0.0; inherit: "default" 0.0; + visible: 1; + } + } + part { name: "slide_text_gap1"; + type: RECT; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + visible: 0; + fixed: 1 0; + min: NAVIFRAME_TITLE_SLIDE_TEXT_GAP 0; + max: NAVIFRAME_TITLE_SLIDE_TEXT_GAP -1; + align: 1.0 0.5; + rel1 { relative: 0.0 0.0; to: "maintitle_text_bg"; } + rel2 { relative: 0.0 1.0; to: "maintitle_text_bg"; } + } + } + part { name: "elm.text.slide_begin_title"; + type: TEXT; + effect: FAR_SHADOW BOTTOM; + scale: 1; + clip_to: "slide_title_text_clip"; + description { state: "default" 0.0; text { font: "Tizen:style=Bold"; - size: NAVIFRAME_LANDSCAPE_TITLE_SMALL_FONT_SIZE_INC; - min: 0 0; + size: NAVIFRAME_TITLE_FONT_SIZE_INC; + size_range: NAVIFRAME_TITLE_FONT_MIN_SIZE_INC NAVIFRAME_TITLE_FONT_SIZE_INC; + fit: 1 0; + min: 1 0; + max: 1 0; + align: 0.0 0.5; + text_class: "tizen"; + } + color: NAVIFRAME_TITLE_TEXT_COLOR_INC; + color3: 0 0 0 255; + align: 0.0 0.5; + rel1.to: "maintitle_text_bg"; + rel2.to: "maintitle_text_bg"; + } + description { state: "title_slide_begin" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 0.0 1.0; + } + description { state: "title_slide_end" 0.0; + inherit: "default" 0.0; + text.align: 1.0 0.5; + align: 1.0 0.5; + rel1 { relative: 0.0 0.0; to: "slide_text_gap1"; } + rel2 { relative: 0.0 1.0; to: "slide_text_gap1"; } + } + description { state: "maintitle_slide_begin" 0.0; + text { font: "Tizen:style=Bold"; + size: NAVIFRAME_TITLE_SMALL_FONT_SIZE_INC; + min: 1 0; + max: 1 0; + align: 0.0 0.5; + text_class: "tizen"; + } + color: NAVIFRAME_TITLE_TEXT_COLOR_INC; + color3: 0 0 0 255; + align: 0.0 0.5; + rel1 { relative: 0.0 0.0; to: "maintitle_text_bg"; } + rel2 { relative: 0.0 1.0; to: "maintitle_text_bg"; } + } + description { state: "maintitle_slide_end" 0.0; + inherit: "maintitle_slide_begin" 0.0; + text.align: 1.0 0.5; + align: 1.0 0.5; + rel1 { relative: 0.0 0.0; to: "slide_text_gap1"; } + rel2 { relative: 0.0 1.0; to: "slide_text_gap1"; } + } + description { state: "maintitle_slide_begin_landscape" 0.0; + inherit: "maintitle_slide_begin" 0.0; + text.size: NAVIFRAME_LANDSCAPE_TITLE_SMALL_FONT_SIZE_INC; + } + description { state: "maintitle_slide_end_landscape" 0.0; + inherit: "maintitle_slide_end" 0.0; + text.size: NAVIFRAME_LANDSCAPE_TITLE_SMALL_FONT_SIZE_INC; + } + } + part { name: "elm.text.full_title"; + type: TEXT; + scale: 1; + clip_to: "slide_title_text_clip"; + description { state: "default" 0.0; + visible: 0; + text { font: "Tizen:style=Bold"; + size: NAVIFRAME_TITLE_FONT_SIZE_INC; + size_range: NAVIFRAME_TITLE_FONT_MIN_SIZE_INC NAVIFRAME_TITLE_FONT_SIZE_INC; + fit: 1 0; + min: 1 0; + max: 1 0; + align: 0.0 0.5; + text_class: "tizen"; + } + align: 0.0 0.5; + rel1.to: "maintitle_text_bg"; + rel2.to: "maintitle_text_bg"; + } + description { state: "subtitle_is_set" 0.0; + visible: 0; + text { font: "Tizen:style=Bold"; + size: NAVIFRAME_TITLE_SMALL_FONT_SIZE_INC; + min: 1 0; + max: 1 0; + align: 0.0 0.5; + text_class: "tizen"; + } + align: 0.0 0.5; + rel1.to: "maintitle_text_bg"; + rel2.to: "maintitle_text_bg"; + } + description { state: "subtitle_is_set_landscape" 0.0; + inherit: "subtitle_is_set" 0.0; + text.size: NAVIFRAME_LANDSCAPE_TITLE_SMALL_FONT_SIZE_INC; + } + } + part { name: "slide_text_gap2"; + type: RECT; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + visible: 0; + fixed: 1 0; + min: NAVIFRAME_TITLE_SLIDE_TEXT_GAP 0; + max: NAVIFRAME_TITLE_SLIDE_TEXT_GAP -1; + align: 0.0 0.5; + rel1 { relative: 1.0 0.0; to: "elm.text.full_title"; } + rel2 { relative: 1.0 1.0; to: "elm.text.full_title"; } + } + } + part { name: "elm.text.slide_end_title"; + type: TEXT; + effect: FAR_SHADOW BOTTOM; + scale: 1; + clip_to: "slide_title_text_clip"; + description { state: "default" 0.0; + text { font: "Tizen:style=Bold"; + size: NAVIFRAME_TITLE_FONT_SIZE_INC; + size_range: NAVIFRAME_TITLE_FONT_MIN_SIZE_INC NAVIFRAME_TITLE_FONT_SIZE_INC; + fit: 1 0; + min: 1 0; + max: 1 0; + align: 0.0 0.5; + text_class: "tizen"; + } + color: NAVIFRAME_TITLE_TEXT_COLOR_INC; + color3: 0 0 0 255; + align: 0.0 0.5; + rel1.to: "maintitle_text_bg"; + rel2.to: "maintitle_text_bg"; + } + description { state: "title_slide_begin" 0.0; + inherit: "default" 0.0; + rel1 { relative: 1.0 0.0; to: "slide_text_gap2"; } + rel2 { relative: 1.0 1.0; to: "slide_text_gap2"; } + } + description { state: "title_slide_end" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 0.0 1.0; + } + description { state: "maintitle_slide_begin" 0.0; + text { font: "Tizen:style=Bold"; + size: NAVIFRAME_TITLE_SMALL_FONT_SIZE_INC; + min: 1 0; max: 1 0; align: 0.0 0.5; text_class: "tizen"; } + color: NAVIFRAME_TITLE_TEXT_COLOR_INC; + color3: 0 0 0 255; + align: 0.0 0.5; + rel1 { relative: 1.0 0.0; to: "slide_text_gap2"; } + rel2 { relative: 1.0 1.0; to: "slide_text_gap2"; } + } + description { state: "maintitle_slide_end" 0.0; + inherit: "maintitle_slide_begin" 0.0; + rel1 { relative: 0.0 0.0; to: "maintitle_text_bg"; } + rel2 { relative: 0.0 1.0; to: "maintitle_text_bg"; } + } + description { state: "maintitle_slide_begin_landscape" 0.0; + inherit: "maintitle_slide_begin" 0.0; + text.size: NAVIFRAME_LANDSCAPE_TITLE_SMALL_FONT_SIZE_INC; + } + description { state: "maintitle_slide_end_landscape" 0.0; + inherit: "maintitle_slide_end" 0.0; + text.size: NAVIFRAME_LANDSCAPE_TITLE_SMALL_FONT_SIZE_INC; } } part { name: "subtitle_top_padding"; type: RECT; scale: 1; - repeat_events: 1; + mouse_events: 0; description { state: "default" 0.0; visible: 0; min: 0 0; @@ -273,7 +746,7 @@ part { name: "subtitle_text_bg"; type: RECT; scale: 1; - repeat_events: 1; + mouse_events: 0; description { state: "default" 0.0; visible: 0; min: 0 0; @@ -296,10 +769,24 @@ max: -1 NAVIFRAME_LANDSCAPE_SUBTITLE_H_INC; } } + part { name: "subtitle_text_clip"; + type: RECT; + mouse_events: 0; + clip_to: "title_clip"; + description { state: "default" 0.0; + color: NAVIFRAME_SUBTITLE_TEXT_COLOR_INC; + rel1.to: "subtitle_text_bg"; + rel2.to: "subtitle_text_bg"; + } + description { state: "slide" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } part { name: "elm.text.subtitle"; type: TEXT; scale: 1; - clip_to: "title_clip"; + clip_to: "subtitle_text_clip"; description { state: "default" 0.0; text { font: "Tizen:style=Bold"; size: NAVIFRAME_SUBTITLE_FONT_SIZE_INC; @@ -324,6 +811,153 @@ } } } + part { name: "slide_subtitle_text_clip"; + type: RECT; + mouse_events: 0; + clip_to: "title_clip"; + description { state: "default" 0.0; + visible: 0; + color: NAVIFRAME_SUBTITLE_TEXT_COLOR_INC; + rel1.to: "elm.text.subtitle"; + rel2.to: "elm.text.subtitle"; + } + description { state: "slide" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part { name: "slide_subtitle_divider1"; + type: RECT; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + visible: 0; + fixed: 1 0; + min: NAVIFRAME_SUBTITLE_SLIDE_TEXT_GAP 0; + max: NAVIFRAME_SUBTITLE_SLIDE_TEXT_GAP -1; + align: 1.0 0.5; + rel1 { relative: 0.0 0.0; to: "subtitle_text_bg"; } + rel2 { relative: 0.0 1.0; to: "subtitle_text_bg"; } + } + } + part { name: "elm.text.slide_begin_subtitle"; + type: TEXT; + scale: 1; + clip_to: "slide_subtitle_text_clip"; + description { state: "default" 0.0; + text { font: "Tizen:style=Bold"; + size: NAVIFRAME_SUBTITLE_FONT_SIZE_INC; + min: 1 0; + max: 1 0; + align: 0.0 0.5; + text_class: "tizen"; + } + color: NAVIFRAME_SUBTITLE_TEXT_COLOR_INC; + align: 0.0 0.5; + rel1.to: "subtitle_text_bg"; + rel2.to: "subtitle_text_bg"; + } + description { state: "slide_begin" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 0.0 1.0; + } + description { state: "slide_end" 0.0; + inherit: "default" 0.0; + text.align: 1.0 0.5; + align: 1.0 0.5; + rel1 { relative: 0.0 0.0; to: "slide_subtitle_divider1"; } + rel2 { relative: 0.0 1.0; to: "slide_subtitle_divider1"; } + } + description { state: "slide_begin_landscape" 0.0; + inherit: "default" 0.0; + text.size: NAVIFRAME_LANDSCAPE_SUBTITLE_FONT_SIZE_INC; + rel1 { relative: 0.0 0.0; to: "subtitle_text_bg"; } + rel2 { relative: 0.0 1.0; to: "subtitle_text_bg"; } + } + description { state: "slide_end_landscape" 0.0; + inherit: "slide_begin_landscape" 0.0; + text.align: 1.0 0.5; + align: 1.0 0.5; + rel1 { relative: 0.0 0.0; to: "slide_subtitle_divider1"; } + rel2 { relative: 0.0 1.0; to: "slide_subtitle_divider1"; } + } + } + part { name: "elm.text.full_subtitle"; + type: TEXT; + scale: 1; + clip_to: "slide_subtitle_text_clip"; + description { state: "default" 0.0; + visible: 0; + text { font: "Tizen:style=Bold"; + size: NAVIFRAME_SUBTITLE_FONT_SIZE_INC; + min: 1 0; + max: 1 0; + align: 0.0 0.5; + text_class: "tizen"; + } + align: 0.0 0.5; + rel1.to: "subtitle_text_bg"; + rel2.to: "subtitle_text_bg"; + } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + text.size: NAVIFRAME_LANDSCAPE_SUBTITLE_FONT_SIZE_INC; + } + } + part { name: "slide_subtitle_divider2"; + type: RECT; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + visible: 0; + fixed: 1 0; + min: NAVIFRAME_SUBTITLE_SLIDE_TEXT_GAP 0; + max: NAVIFRAME_SUBTITLE_SLIDE_TEXT_GAP -1; + align: 0.0 0.5; + rel1 { relative: 1.0 0.0; to: "elm.text.full_subtitle"; } + rel2 { relative: 1.0 1.0; to: "elm.text.full_subtitle"; } + } + } + part { name: "elm.text.slide_end_subtitle"; + type: TEXT; + scale: 1; + clip_to: "slide_subtitle_text_clip"; + description { state: "default" 0.0; + text { font: "Tizen:style=Bold"; + size: NAVIFRAME_SUBTITLE_FONT_SIZE_INC; + min: 1 0; + max: 1 0; + align: 0.0 0.5; + text_class: "tizen"; + } + color: NAVIFRAME_SUBTITLE_TEXT_COLOR_INC; + align: 0.0 0.5; + rel1.to: "subtitle_text_bg"; + rel2.to: "subtitle_text_bg"; + } + description { state: "slide_begin" 0.0; + inherit: "default" 0.0; + rel1 { relative: 1.0 0.0; to: "slide_subtitle_divider2"; } + rel2 { relative: 1.0 1.0; to: "slide_subtitle_divider2"; } + } + description { state: "slide_end" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 0.0 1.0; + } + description { state: "slide_begin_landscape" 0.0; + inherit: "default" 0.0; + text.size: NAVIFRAME_LANDSCAPE_SUBTITLE_FONT_SIZE_INC; + rel1 { relative: 1.0 0.0; to: "slide_subtitle_divider2"; } + rel2 { relative: 1.0 1.0; to: "slide_subtitle_divider2"; } + } + description { state: "slide_end_landscape" 0.0; + inherit: "slide_begin_landscape" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 0.0 1.0; + } + } part { name: "padding_before_text"; type: RECT; scale: 1; @@ -369,11 +1003,6 @@ inherit: "default" 0.0; min: NAVIFRAME_BADGE_LEFT_PADDING_INC; } - description { state: "title_slide_is_set" 0.0; - inherit: "visible" 0.0; - rel1 { relative: 1.0 1.0; to_x: "elm.swallow.title"; to_y: "badge_top_padding"; } - rel2 { relative: 1.0 0.5; to_x: "elm.swallow.title"; to_y: "title_bg"; } - } } part { name: "left.padding.text"; type: RECT; @@ -478,36 +1107,14 @@ visible: 1; } } - part { name: "click_event_area"; - type: RECT; - ignore_flags: ON_HOLD; - description { state: "default" 0.0; - rel1 { to: "title_bg"; } - rel2 { to: "title_bg"; } - color: 0 0 0 0; - } - } - part { name: "elm.swallow.title"; - type: SWALLOW; - scale: 1; - repeat_events: 1; - clip_to: "title_clip"; - description { state: "default" 0.0; - fixed: 1 1; - rel1 { to: "maintitle_text_bg"; } - rel2 { to: "maintitle_text_bg"; } - } - } - part { name: "elm.swallow.subtitle"; - type: SWALLOW; - scale: 1; - repeat_events: 1; - clip_to: "title_clip"; - description { state: "default" 0.0; - fixed: 1 1; - rel1 { to: "subtitle_text_bg"; } - rel2 { to: "subtitle_text_bg"; } - } + part { name: "click_event_area"; + type: RECT; + ignore_flags: ON_HOLD; + description { state: "default" 0.0; + rel1 { to: "title_bg"; } + rel2 { to: "title_bg"; } + color: 0 0 0 0; + } } part { name: "access.title"; type: RECT; @@ -755,15 +1362,32 @@ program { name: "visible"; signal: "elm,state,visible"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "base"; - target: "clipper"; + script { + set_state(PART:"base", "default", 0.0); + set_state(PART:"clipper", "default", 0.0); + emit("elm,action,title,slide", ""); + } + } + program { name: "title_slide"; + signal: "elm,action,title,slide"; + source: ""; + script { + if (get_int(title_slide_anim_id)) + stop_slide(0); + timer(1.5, "start_slide", 0); + + if (get_int(subtitle)) { + if (get_int(subtitle_slide_anim_id)) + stop_slide(0); + timer(1.5, "start_slide", 1); + } + } } program { name: "title_show"; signal: "elm,state,title,show"; source: "elm"; script { - if (get_int(landscape) == 0) + if (!get_int(landscape)) set_state(PART:"title_bg", "default", 0.0); else set_state(PART:"title_bg", "landscape", 0.0); @@ -782,7 +1406,7 @@ script { set_state(PART:"badge_top_padding", "subtitle_is_set", 0.0); set_state(PART:"maintitle_text_bg", "subtitle_is_set", 0.0); - if (get_int(landscape) == 0) { + if (!get_int(landscape)) { set_state(PART:"elm.text.title", "subtitle_is_set", 0.0); set_state(PART:"subtitle_top_padding", "visible", 0.0); set_state(PART:"subtitle_text_bg", "visible", 0.0); @@ -792,6 +1416,7 @@ set_state(PART:"subtitle_top_padding", "visible_landscape", 0.0); set_state(PART:"subtitle_text_bg", "visible_landscape", 0.0); } + set_int(subtitle, 1); } } program { name: "subtitle_hide"; @@ -803,6 +1428,7 @@ set_state(PART:"subtitle_top_padding", "default", 0.0); set_state(PART:"subtitle_text_bg", "default", 0.0); set_state(PART:"elm.text.title", "default", 0.0); + set_int(subtitle, 0); } } program { name: "icon_show"; @@ -849,7 +1475,7 @@ signal: "elm,state,toolbar,show"; source: "elm"; script { - if (get_int(landscape) == 0) + if (!get_int(landscape)) set_state(PART:"toolbar", "visible", 0.0); else set_state(PART:"toolbar", "visible_landscape", 0.0); @@ -870,7 +1496,7 @@ source: "elm"; script { set_int(tbar_close, 0); - if (get_int(landscape) == 0) + if (!get_int(landscape)) set_state(PART:"toolbar", "visible", 0.0); else set_state(PART:"toolbar", "visible_landscape", 0.0); @@ -888,7 +1514,7 @@ signal: "elm,state,toolbar,open"; source: ""; script { - if (get_int(landscape) == 0) + if (!get_int(landscape)) set_state(PART:"toolbar", "visible", 0.0); else set_state(PART:"toolbar", "visible_landscape", 0.0); @@ -922,26 +1548,44 @@ action: SIGNAL_EMIT "elm,action,show,finished" ""; } program { name: "pushed_finished"; - action: SIGNAL_EMIT "elm,action,pushed,finished" ""; + script { + if (get_int(title_slide_anim_id)) + stop_slide(0); + + if (get_int(subtitle)) { + if (get_int(subtitle_slide_anim_id)) + stop_slide(0); + } + emit("elm,action,pushed,finished", ""); + } } program { name: "popped_finished"; - action: SIGNAL_EMIT "elm,action,popped,finished" ""; + script { + if (get_int(title_slide_anim_id)) + stop_slide(0); + + if (get_int(subtitle)) { + if (get_int(subtitle_slide_anim_id)) + stop_slide(0); + } + emit("elm,action,popped,finished", ""); + } } program { name: "title_clicked"; signal: "mouse,clicked,1"; source: "click_event_area"; - action: SIGNAL_EMIT "elm,action,title,clicked" ""; + script { + emit("elm,action,title,clicked", ""); + emit("elm,action,title,slide", ""); + } } program { name: "title_badge_show"; signal: "elm,state,title_badge,show"; source: "elm"; script { - if (get_int(title_slide_visible) == 0) - set_state(PART:"badge_left_padding", "visible", 0.0); - else - set_state(PART:"badge_left_padding", "title_slide_is_set", 0.0); + set_state(PART:"badge_left_padding", "visible", 0.0); set_state(PART:"badge_padding", "visible", 0.0); set_state(PART:"left.padding.text", "visible", 0.0); set_state(PART:"right.padding.text", "visible", 0.0); @@ -965,59 +1609,11 @@ } } program { - name: "title_slide_show"; - signal: "elm,state,elm.swallow.title,show"; - source: "elm"; - script { - if (get_int(title_badge_visible) == 1) - set_state(PART:"badge_left_padding", "title_slide_is_set", 0.0); - set_int(title_slide_visible, 1); - } - } - program { - name: "title_slide_hide"; - signal: "elm,state,elm.swallow.title,hide"; - source: "elm"; - script { - if (get_int(title_badge_visible) == 1) - set_state(PART:"badge_left_padding", "visible", 0.0); - set_int(title_slide_visible, 0); - } - } - program { - name: "subtitle_slide_show"; - signal: "elm,state,elm.swallow.subtitle,show"; - source: "elm"; - script { - set_state(PART:"badge_top_padding", "subtitle_is_set", 0.0); - set_state(PART:"maintitle_text_bg", "subtitle_is_set", 0.0); - if (get_int(landscape) == 0) { - set_state(PART:"subtitle_top_padding", "visible", 0.0); - set_state(PART:"subtitle_text_bg", "visible", 0.0); - } - else { - set_state(PART:"subtitle_top_padding", "visible_landscape", 0.0); - set_state(PART:"subtitle_text_bg", "visible_landscape", 0.0); - } - } - } - program { - name: "subtitle_slide_hide"; - signal: "elm,state,elm.swallow.subtitle,hide"; - source: "elm"; - script { - set_state(PART:"badge_top_padding", "default", 0.0); - set_state(PART:"maintitle_text_bg", "default", 0.0); - set_state(PART:"subtitle_top_padding", "default", 0.0); - set_state(PART:"subtitle_text_bg", "default", 0.0); - } - } - program { name: "change_to_landscape"; signal: "elm,state,landscape"; source: "elm"; script { - if (get_int(landscape) == 0) { + if (!get_int(landscape)) { set_state(PART:"title_text_bg", "landscape", 0.0); set_state(PART:"elm.text.subtitle", "landscape", 0.0); set_state(PART:"title_left_btn", "landscape", 0.0); @@ -1057,7 +1653,7 @@ signal: "elm,state,portrait"; source: "elm"; script { - if (get_int(landscape) == 1) { + if (get_int(landscape)) { set_state(PART:"title_text_bg", "default", 0.0); set_state(PART:"elm.text.subtitle", "default", 0.0); set_state(PART:"title_left_btn", "default", 0.0); @@ -1123,7 +1719,133 @@ public tbar_bg = 0; //Controlbar BG Show call count public tbar_close = 0; //Toolbar lastest Open/Close status public landscape = 0; //Landscape mode status + + public title_duration = 0; + public title_slide_stop; + public title_slide_anim_id; + public title_text_w; + public org_title_text_w; + public title_slide_count = 0; + + public get_width(val) { + new x, y, w, h; + new buf[128]; + new st[31]; + new Float:vl; + + get_geometry(PART:"elm.text.title", x, y, w, h); + set_int(org_title_text_w, w); + + get_text(PART:"elm.text.title", buf, 127); + set_text(PART:"elm.text.full_title", buf); + get_state(PART:"elm.text.title", st, 30, vl); + set_state(PART:"elm.text.full_title", st, 0.0); + get_geometry(PART:"elm.text.full_title", x, y, w, h); + set_int(title_text_w, w); + } + + public slide_end_pending(val, Float:pos) { + if (pos >= 1.0) { + if (get_int(title_slide_count) < NAVIFRAME_TITLE_SLIDE_MAX_COUNT) + start_slide(0); + else + stop_slide(0); + } + } + + public slide_to_end_anim(val, Float:pos) { + if (get_int(title_slide_stop)) return; + + if (!get_int(landscape)) { + set_tween_state(PART:"elm.text.slide_begin_title", pos, "slide_begin", 0.0, "slide_end", 0.0); + set_tween_state(PART:"elm.text.slide_end_title", pos, "slide_begin", 0.0, "slide_end", 0.0); + } + else { + set_tween_state(PART:"elm.text.slide_begin_title", pos, "slide_begin_landscape", 0.0, "slide_end_landscape", 0.0); + set_tween_state(PART:"elm.text.slide_end_title", pos, "slide_begin_landscape", 0.0, "slide_end_landscape", 0.0); + } + + if (pos >= 1.0) + anim(1, "slide_end_pending", 0); + } + + public slide_to_end(val) { + new slide_anim_id; + new Float:duration; + + if (get_int(title_slide_stop)) return; + + duration = get_float(title_duration); + slide_anim_id = anim(duration, "slide_to_end_anim", 0); + set_int(title_slide_anim_id, slide_anim_id); + } + + public start_slide(val) { + new Float:len; + new buf[128]; + + set_int(title_slide_count, get_int(title_slide_count) + 1); + + if (get_int(title_slide_count) == 1) { + get_width(0); + + if (get_int(title_text_w) <= get_int(org_title_text_w)) { + set_int(title_slide_count, 0); + return; + } + + len = get_int(title_text_w) + NAVIFRAME_TITLE_SLIDE_TEXT_GAP; + + if (get_int(landscape)) + set_float(title_duration, len / NAVIFRAME_TITLE_SLIDE_SPEED_WEIGHT); + else + set_float(title_duration, len / NAVIFRAME_TITLE_SLIDE_SPEED_WEIGHT); + + set_int(title_slide_stop, 0); + + get_text(PART:"elm.text.title", buf, 127); + set_text(PART:"elm.text.slide_begin_title", buf); + set_text(PART:"elm.text.slide_end_title", buf); + } + + if (!get_int(landscape)) { + set_state(PART:"elm.text.slide_begin_title", "slide_begin", 0.0); + set_state(PART:"elm.text.slide_end_title", "slide_begin", 0.0); + } + else { + set_state(PART:"elm.text.slide_begin_title", "slide_begin_landscape", 0.0); + set_state(PART:"elm.text.slide_end_title", "slide_begin_landscape", 0.0); + } + + if (get_int(title_slide_count) == 1) { + set_state(PART:"title_text_clip", "slide", 0.0); + set_state(PART:"slide_title_text_clip", "slide", 0.0); + } + + slide_to_end(0); + } + + public stop_slide(val) { + new slide_anim_id; + + set_int(title_slide_stop, 1); + set_int(title_slide_count, 0); + + slide_anim_id = get_int(title_slide_anim_id); + cancel_timer(slide_anim_id); + set_int(title_slide_anim_id, 0); + + set_text(PART:"elm.text.slide_begin_title", ""); + set_text(PART:"elm.text.slide_end_title", ""); + + set_state(PART:"elm.text.slide_begin_title", "default", 0.0); + set_state(PART:"elm.text.slide_end_title", "default", 0.0); + + set_state(PART:"title_text_clip", "default", 0.0); + set_state(PART:"slide_title_text_clip", "default", 0.0); + } } + parts { part { name: "clipper"; type: RECT; @@ -1238,11 +1960,44 @@ visible: 0; } } + part { name: "title_text_bg"; + type: RECT; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + visible: 0; + min: 0 NAVIFRAME_TITLE_TAB_TEXT_H_INC; + max: -1 NAVIFRAME_TITLE_TAB_TEXT_H_INC; + fixed: 0 1; + align: 0.5 0.0; + rel1 { relative: 1.0 0.0; to_x: "title_left_padding"; to_y: "title_bg"; } + rel2 { relative: 0.0 0.0; to_x: "title_right_padding"; to_y: "title_bg"; } + } + description { state: "subtitle_is_set" 0.0; + inherit: "default" 0.0; + min: 0 NAVIFRAME_LANDSCAPE_TITLE_TAB_TEXT_H_INC; + max: -1 NAVIFRAME_LANDSCAPE_TITLE_TAB_TEXT_H_INC; + } + } + part { name: "title_text_clip"; + type: RECT; + mouse_events: 0; + clip_to: "title_clip"; + description { state: "default" 0.0; + color: NAVIFRAME_TITLE_TEXT_COLOR_INC; + rel1.to: "title_text_bg"; + rel2.to: "title_text_bg"; + } + description { state: "slide" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } part { name: "elm.text.title"; type: TEXT; scale: 1; effect: FAR_SHADOW BOTTOM; - clip_to: "title_clip"; + clip_to: "title_text_clip"; description { state: "default" 0.0; visible: 1; text { font: "Tizen:style=Bold"; @@ -1252,14 +2007,11 @@ align: 0.0 0.5; text_class: "tizen"; } - min: 0 NAVIFRAME_TITLE_TAB_TEXT_H_INC; - max: 999999 NAVIFRAME_TITLE_TAB_TEXT_H_INC; - fixed: 0 1; color: NAVIFRAME_TITLE_TEXT_COLOR_INC; color3: 0 0 0 255; - align: 0.0 0.0; - rel1 { relative: 1.0 0.0; to: "title_left_padding"; } - rel2 { relative: 0.0 1.0; to: "title_right_padding"; } + align: 0.0 0.5; + rel1.to: "title_text_bg"; + rel2.to: "title_text_bg"; } description { state: "landscape" 0.0; inherit: "default" 0.0; @@ -1270,8 +2022,154 @@ align: 0.0 0.5; text_class: "tizen"; } - min: 0 NAVIFRAME_LANDSCAPE_TITLE_TAB_TEXT_H_INC; - max: 999999 NAVIFRAME_LANDSCAPE_TITLE_TAB_TEXT_H_INC; + } + } + part { name: "slide_title_text_clip"; + type: RECT; + mouse_events: 0; + clip_to: "title_clip"; + description { state: "default" 0.0; + visible: 0; + color: NAVIFRAME_TITLE_TEXT_COLOR_INC; + rel1.to: "elm.text.title"; + rel2.to: "elm.text.title"; + } + description { state: "slide" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part { name: "slide_text_gap1"; + type: RECT; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + visible: 0; + fixed: 1 0; + min: NAVIFRAME_TITLE_SLIDE_TEXT_GAP 0; + max: NAVIFRAME_TITLE_SLIDE_TEXT_GAP -1; + align: 1.0 0.5; + rel1 { relative: 0.0 0.0; to: "title_text_bg"; } + rel2 { relative: 0.0 1.0; to: "title_text_bg"; } + } + } + part { name: "elm.text.slide_begin_title"; + type: TEXT; + effect: FAR_SHADOW BOTTOM; + scale: 1; + clip_to: "slide_title_text_clip"; + description { state: "default" 0.0; + visible: 1; + text { font: "Tizen:style=Bold"; + size: NAVIFRAME_TITLE_TAB_FONT_SIZE_INC; + min: 1 0; + max: 1 0; + align: 0.0 0.5; + text_class: "tizen"; + } + color: NAVIFRAME_TITLE_TEXT_COLOR_INC; + color3: 0 0 0 255; + align: 0.0 0.5; + rel1.to: "title_text_bg"; + rel2.to: "title_text_bg"; + } + description { state: "slide_begin" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 0.0 1.0; + } + description { state: "slide_end" 0.0; + inherit: "default" 0.0; + text.align: 1.0 0.5; + align: 1.0 0.5; + rel1 { relative: 0.0 0.0; to: "slide_text_gap1"; } + rel2 { relative: 0.0 1.0; to: "slide_text_gap1"; } + } + description { state: "slide_begin_landscape" 0.0; + inherit: "slide_begin" 0.0; + text.size: NAVIFRAME_LANDSCAPE_TITLE_TAB_FONT_SIZE_INC; + } + description { state: "slide_end_landscape" 0.0; + inherit: "slide_end" 0.0; + text.size: NAVIFRAME_LANDSCAPE_TITLE_TAB_FONT_SIZE_INC; + } + } + part { name: "elm.text.full_title"; + type: TEXT; + scale: 1; + effect: FAR_SHADOW BOTTOM; + clip_to: "slide_title_text_clip"; + description { state: "default" 0.0; + visible: 0; + text { font: "Tizen:style=Bold"; + size: NAVIFRAME_TITLE_TAB_FONT_SIZE_INC; + min: 1 0; + max: 1 0; + align: 0.0 0.5; + text_class: "tizen"; + } + color: NAVIFRAME_TITLE_TEXT_COLOR_INC; + color3: 0 0 0 255; + align: 0.0 0.5; + rel1.to: "title_text_bg"; + rel2.to: "title_text_bg"; + } + description { state: "landscape" 0.0; + inherit: "default" 0.0; + text.size: NAVIFRAME_LANDSCAPE_TITLE_TAB_FONT_SIZE_INC; + } + } + part { name: "slide_text_gap2"; + type: RECT; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + visible: 0; + fixed: 1 0; + min: NAVIFRAME_TITLE_SLIDE_TEXT_GAP 0; + max: NAVIFRAME_TITLE_SLIDE_TEXT_GAP -1; + align: 0.0 0.5; + rel1 { relative: 1.0 0.0; to: "elm.text.full_title"; } + rel2 { relative: 1.0 1.0; to: "elm.text.full_title"; } + } + } + part { name: "elm.text.slide_end_title"; + type: TEXT; + effect: FAR_SHADOW BOTTOM; + scale: 1; + clip_to: "slide_title_text_clip"; + description { state: "default" 0.0; + visible: 1; + text { font: "Tizen:style=Bold"; + size: NAVIFRAME_TITLE_TAB_FONT_SIZE_INC; + min: 1 0; + max: 1 0; + align: 0.0 0.5; + text_class: "tizen"; + } + color: NAVIFRAME_TITLE_TEXT_COLOR_INC; + color3: 0 0 0 255; + align: 0.0 0.5; + rel1.to: "title_text_bg"; + rel2.to: "title_text_bg"; + } + description { state: "slide_begin" 0.0; + inherit: "default" 0.0; + rel1 { relative: 1.0 0.0; to: "slide_text_gap2"; } + rel2 { relative: 1.0 1.0; to: "slide_text_gap2"; } + } + description { state: "slide_end" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 0.0 1.0; + } + description { state: "slide_begin_landscape" 0.0; + inherit: "slide_begin" 0.0; + text.size: NAVIFRAME_LANDSCAPE_TITLE_TAB_FONT_SIZE_INC; + } + description { state: "slide_end_landscape" 0.0; + inherit: "slide_end" 0.0; + text.size: NAVIFRAME_LANDSCAPE_TITLE_TAB_FONT_SIZE_INC; } } part { name: "click_event_area"; @@ -1462,14 +2360,26 @@ program { name: "visible"; signal: "elm,state,visible"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "base"; + script { + set_state(PART:"base", "default", 0.0); + set_state(PART:"clipper", "default", 0.0); + emit("elm,action,title,slide", ""); + } + } + program { name: "title_slide"; + signal: "elm,action,title,slide"; + source: ""; + script { + if (get_int(title_slide_anim_id)) + stop_slide(0); + timer(1.5, "start_slide", 0); + } } program { name: "title_show"; signal: "elm,state,title,show"; source: "elm"; script { - if (get_int(landscape) == 0) + if (!get_int(landscape)) set_state(PART:"title_bg", "default", 0.0); else set_state(PART:"title_bg", "landscape", 0.0); @@ -1486,7 +2396,7 @@ signal: "elm,state,toolbar,show"; source: "elm"; script { - if (get_int(landscape) == 0) + if (!get_int(landscape)) set_state(PART:"toolbar", "visible", 0.0); else set_state(PART:"toolbar", "visible_landscape", 0.0); @@ -1507,7 +2417,7 @@ source: "elm"; script { set_int(tbar_close, 0); - if (get_int(landscape) == 0) + if (!get_int(landscape)) set_state(PART:"toolbar", "visible", 0.0); else set_state(PART:"toolbar", "visible_landscape", 0.0); @@ -1525,7 +2435,7 @@ signal: "elm,state,toolbar,open"; source: ""; script { - if (get_int(landscape) == 0) + if (!get_int(landscape)) set_state(PART:"toolbar", "visible", 0.0); else set_state(PART:"toolbar", "visible_landscape", 0.0); @@ -1559,23 +2469,34 @@ action: SIGNAL_EMIT "elm,action,show,finished" ""; } program { name: "pushed_finished"; - action: SIGNAL_EMIT "elm,action,pushed,finished" ""; + script { + if (get_int(title_slide_anim_id)) + stop_slide(0); + emit("elm,action,pushed,finished", ""); + } } program { name: "popped_finished"; - action: SIGNAL_EMIT "elm,action,popped,finished" ""; + script { + if (get_int(title_slide_anim_id)) + stop_slide(0); + emit("elm,action,popped,finished", ""); + } } program { name: "title_clicked"; signal: "mouse,clicked,1"; source: "click_event_area"; - action: SIGNAL_EMIT "elm,action,title,clicked" ""; + script { + emit("elm,action,title,clicked", ""); + emit("elm,action,title,slide", ""); + } } program { name: "change_to_landscape"; signal: "elm,state,landscape"; source: "elm"; script { - if (get_int(landscape) == 0) { + if (!get_int(landscape)) { set_state(PART:"elm.text.title", "landscape", 0.0); set_state(PART:"toolbar_more_btn", "landscape", 0.0); set_state(PART:"elm.swallow.prev_btn", "landscape", 0.0); @@ -1599,7 +2520,7 @@ signal: "elm,state,portrait"; source: "elm"; script { - if (get_int(landscape) == 1) { + if (get_int(landscape)) { set_state(PART:"elm.text.title", "default", 0.0); set_state(PART:"toolbar_more_btn", "default", 0.0); set_state(PART:"elm.swallow.prev_btn", "default", 0.0); @@ -1893,6 +2814,7 @@ source: "elm"; action: STATE_SET "default" 0.0; target: "base"; + target: "clipper"; } program { name: "title_show"; signal: "elm,state,title,show"; @@ -1912,7 +2834,7 @@ signal: "elm,state,toolbar,show"; source: "elm"; script { - if (get_int(landscape) == 0) + if (!get_int(landscape)) set_state(PART:"toolbar", "visible", 0.0); else set_state(PART:"toolbar", "visible_landscape", 0.0); @@ -1933,7 +2855,7 @@ source: "elm"; script { set_int(tbar_close, 0); - if (get_int(landscape) == 0) + if (!get_int(landscape)) set_state(PART:"toolbar", "visible", 0.0); else set_state(PART:"toolbar", "visible_landscape", 0.0); @@ -1951,7 +2873,7 @@ signal: "elm,state,toolbar,open"; source: ""; script { - if (get_int(landscape) == 0) + if (!get_int(landscape)) set_state(PART:"toolbar", "visible", 0.0); else set_state(PART:"toolbar", "visible_landscape", 0.0); @@ -1995,7 +2917,7 @@ signal: "elm,state,landscape"; source: "elm"; script { - if (get_int(landscape) == 0) { + if (!get_int(landscape)) { set_state(PART:"toolbar_more_btn", "landscape", 0.0); set_state(PART:"elm.swallow.prev_btn", "landscape", 0.0); @@ -2014,7 +2936,7 @@ signal: "elm,state,portrait"; source: "elm"; script { - if (get_int(landscape) == 1) { + if (get_int(landscape)) { set_state(PART:"toolbar_more_btn", "default", 0.0); set_state(PART:"elm.swallow.prev_btn", "default", 0.0); @@ -2297,6 +3219,7 @@ source: "elm"; action: STATE_SET "default" 0.0; target: "base"; + target: "clipper"; } program { name: "title_show"; signal: "elm,state,title,show"; @@ -2318,7 +3241,7 @@ signal: "elm,state,toolbar,show"; source: "elm"; script { - if (get_int(landscape) == 0) + if (!get_int(landscape)) set_state(PART:"toolbar", "visible", 0.0); else set_state(PART:"toolbar", "visible_landscape", 0.0); @@ -2339,7 +3262,7 @@ source: "elm"; script { set_int(tbar_close, 0); - if (get_int(landscape) == 0) + if (!get_int(landscape)) set_state(PART:"toolbar", "visible", 0.0); else set_state(PART:"toolbar", "visible_landscape", 0.0); @@ -2357,7 +3280,7 @@ signal: "elm,state,toolbar,open"; source: ""; script { - if (get_int(landscape) == 0) + if (!get_int(landscape)) set_state(PART:"toolbar", "visible", 0.0); else set_state(PART:"toolbar", "visible_landscape", 0.0); @@ -2401,7 +3324,7 @@ signal: "elm,state,landscape"; source: "elm"; script { - if (get_int(landscape) == 0) { + if (!get_int(landscape)) { set_state(PART:"toolbar_more_btn", "landscape", 0.0); set_state(PART:"elm.swallow.prev_btn", "landscape", 0.0); @@ -2420,7 +3343,7 @@ signal: "elm,state,portrait"; source: "elm"; script { - if (get_int(landscape) == 1) { + if (get_int(landscape)) { set_state(PART:"toolbar_more_btn", "default", 0.0); set_state(PART:"elm.swallow.prev_btn", "default", 0.0); -- 2.7.4