From e766d4972b806141eb37e5d2af1fa094b584d699 Mon Sep 17 00:00:00 2001 From: "chuneon.park" Date: Fri, 25 Mar 2011 02:45:27 +0900 Subject: [PATCH] modified navigationbar title section. plese download files then comprare please. --- themes/groups/controlbar.edc | 196 +------------ themes/groups/navigationbar.edc | 472 +++++++++++++++---------------- themes/groups/navigationbar_ex.edc | 553 +++++++++++++++++-------------------- 3 files changed, 471 insertions(+), 750 deletions(-) diff --git a/themes/groups/controlbar.edc b/themes/groups/controlbar.edc index a1ec200..2024f0d 100644 --- a/themes/groups/controlbar.edc +++ b/themes/groups/controlbar.edc @@ -899,82 +899,9 @@ group{ name: "elm/controlbar/background/navigationbar"; - images{ - image: "00_winset_control_top_bg.png" COMP; - image: "00_winset_control_tabbar_bg.png" COMP; - image: "00_winset_control_tabbar_left_bg.png" COMP; - image: "00_winset_control_tabbar_right_bg.png" COMP; - } - parts{ part{ name: "bg_image"; - type: IMAGE; - scale: 1; - mouse_events:0; - description{ - state: "default" 0.0; - rel1 {relative: 0.0 0.0; offset: 0 0;} - rel2 {relative: 1.0 1.0; offset: -1 -1;} - image.normal: "00_winset_control_top_bg.png"; - image.border: 1 1 2 6; - color: 255 255 255 255; - } - description{ - state: "tabbar" 0.0; - inherit: "default" 0.0; - image.normal: "00_winset_control_tabbar_bg.png"; - } - description{ - state: "tabbar_left" 0.0; - inherit: "default" 0.0; - image.normal: "00_winset_control_tabbar_left_bg.png"; - } - description{ - state: "tabbar_right" 0.0; - inherit: "default" 0.0; - image.normal: "00_winset_control_tabbar_right_bg.png"; - } - } - } - programs { - program { - name: "tabbar_bg"; - signal: "elm,state,tabbar"; - source: "elm"; - action: STATE_SET "tabbar" 0.0; - target: "bg_image"; - } - program { - name: "toolbar_bg"; - signal: "elm,state,toolbar"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "bg_image"; - } - program { - name: "tabbar_left_bg"; - signal: "elm,state,tabbar_left"; - source: "elm"; - action: STATE_SET "tabbar_left" 0.0; - target: "bg_image"; - } - program { - name: "tabbar_right_bg"; - signal: "elm,state,tabbar_right"; - source: "elm"; - action: STATE_SET "tabbar_right" 0.0; - target: "bg_image"; - } - } - } - - group{ - name: "elm/controlbar/base/navigationbar_noshadow"; - - parts{ - part{ - name: "bg_rect"; type: RECT; scale: 1; mouse_events:0; @@ -982,140 +909,19 @@ state: "default" 0.0; rel1 {relative: 0.0 0.0; offset: 0 0;} rel2 {relative: 1.0 1.0; offset: -1 -1;} - color: 0 0 0 0; - } - } - part{ - name: "bg_image"; - type: SWALLOW; - scale: 1; - mouse_events:0; - description{ - state: "default" 0.0; - rel1 {relative: 0.0 0.0; offset: 0 0;} - rel2 {relative: 1.0 1.0; offset: -1 -1;} - } - description{ - state: "large" 0.0; - min: 0 CONTROLBAR_LARGE_H; - fixed: 0 1; - align: 0.5 1.0; - rel1 {relative: 0.0 1.0; offset: 0 -1;} - rel2 {relative: 1.0 1.0; offset: -1 -1;} - } - description{ - state: "small" 0.0; - min: 0 CONTROLBAR_SMALL_H; - fixed: 0 1; - align: 0.5 1.0; - rel1 {relative: 0.0 1.0; offset: 0 -1;} - rel2 {relative: 1.0 1.0; offset: -1 -1;} - } - description{ - state: "left" 0.0; - min: CONTROLBAR_W 0; - fixed: 1 0; - align: 0.0 0.5; - rel1 {relative: 0.0 0.0; offset: 0 0;} - rel2 {relative: 0.0 1.0; offset: 0 -1;} - } - description{ - state: "right" 0.0; - min: CONTROLBAR_W 0; - fixed: 1 0; - align: 1.0 0.5; - rel1 {relative: 1.0 0.0; offset: -1 0;} - rel2 {relative: 1.0 1.0; offset: -1 -1;} - } - } - part{ - name: "elm.swallow.items"; - type: SWALLOW; - scale: 1; - description{ - state: "default" 0.0; - rel1 {relative: 0.0 0.0; offset: 5 0; to: "bg_image";} - rel2 {relative: 1.0 1.0; offset: -6 -1; to: "bg_image";} - } - } - } - programs{ - program{ - name: "default"; - signal: "elm,state,default"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "bg_image"; - } - program{ - name: "large"; - signal: "elm,state,large"; - source: "elm"; - action: STATE_SET "large" 0.0; - target: "bg_image"; - } - program{ - name: "small"; - signal: "elm,state,small"; - source: "elm"; - action: STATE_SET "small" 0.0; - target: "bg_image"; - } - program{ - name: "left"; - signal: "elm,state,left"; - source: "elm"; - action: STATE_SET "left" 0.0; - target: "bg_image"; - } - program{ - name: "right"; - signal: "elm,state,right"; - source: "elm"; - action: STATE_SET "right" 0.0; - target: "bg_image"; - } - } - } - - group{ - name: "elm/controlbar/background/navigationbar_noshadow"; - - images{ - image: "00_winset_control_top_noshadow_bg.png" COMP; - image: "00_winset_control_tabbar_bg.png" COMP; - image: "00_winset_control_tabbar_left_bg.png" COMP; - image: "00_winset_control_tabbar_right_bg.png" COMP; - } - - parts{ - part{ - name: "bg_image"; - type: IMAGE; - scale: 1; - mouse_events:0; - description{ - state: "default" 0.0; - rel1 {relative: 0.0 0.0; offset: 0 0;} - rel2 {relative: 1.0 1.0; offset: -1 -1;} - image.normal: "00_winset_control_top_noshadow_bg.png"; - image.border: 1 1 0 0; - color: 255 255 255 255; + color: 255 255 255 0; } description{ state: "tabbar" 0.0; inherit: "default" 0.0; - image.normal: "00_winset_control_tabbar_bg.png"; } description{ state: "tabbar_left" 0.0; inherit: "default" 0.0; - image.normal: "00_winset_control_tabbar_left_bg.png"; } description{ state: "tabbar_right" 0.0; inherit: "default" 0.0; - image.normal: "00_winset_control_tabbar_right_bg.png"; } } } diff --git a/themes/groups/navigationbar.edc b/themes/groups/navigationbar.edc index b49145e..1e6bf66 100644 --- a/themes/groups/navigationbar.edc +++ b/themes/groups/navigationbar.edc @@ -3,15 +3,15 @@ * * Copyright (c) 2000 - 2010 Samsung Electronics Co., Ltd. * - * Contact: Seokjae Jeong , Myoungwoon Roy Kim , Jeonghyun Yun , Jaehwan Kim , - * Chuneon Park , Juyung Seo , Woohyun Jung , Myungjae Lee , Hyoyoung Chang , + * Contact: Seokjae Jeong , Myoungwoon Roy Kim , Jeonghyun Yun , Jaehwan Kim , + * Chuneon Park , Juyung Seo , Woohyun Jung , Myungjae Lee , Hyoyoung Chang , * Hyunsil Park , Sohyun Kim , Seunggyun Kim - * + * * This library is free software; you can redistribute it and/or modify it under * the terms of the GNU Lesser General Public License as published by the * Free Software Foundation; either version 2.1 of the License, or (at your option) * any later version. - * + * * This library is distributed in the hope that it will be useful, but WITHOUT ANY * WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public @@ -23,12 +23,15 @@ * */ -#define PADDING 5 -#define ITEM_HEIGHT 60 -#define ITEM_WIDTH 0 -#define MAX_ITEM_WIDTH 112 -#define NAVI_BAR_EXTENDED_FNBTN_TOP_HEIGHT 110 -#define NAVI_BAR_EXTENDED_HEIGHT 115 +#define NAVIBAR_PADDING 5 +#define NAVIBAR_TITLE_ITEM_H 67 //TODO: SHOULD BE 64 +#define NAVIBAR_TITLE_ITEM_W 0 +#define NAVIBAR_TITLE_ITEM_MAX_W 112 +#define NAVIBAR_EXTENDED_FNBTN_TOP_HEIGHT 110 +#define NAVIBAR_EXTENDED_H 115 +#define NAVIBAR_TITLE_SEPARATOR_H 5 +#define NAVIBAR_TITLE_SEPARATOR_SHADOW_H 5 +#define NAVIBAR_EXTENDED_COLOR 219 201 174 255 //////////////////////////////////////////////////////////////////////////////////////// // NavigationBar @@ -36,218 +39,183 @@ group { name: "elm/navigationbar/base/default"; - images { - image: "00_winset_title_bg.png" COMP; image: "00_winset_control_top_arrow.png" COMP; + image: "navibar_item_separator.png" COMP; } - parts { part { name: "base"; - type: RECT; - scale : 1; - mouse_events: 0; - repeat_events: 1; - description { state: "default" 0.0; - min: 1 NAVI_BAR_H; - fixed: 1 1; - color: 0 0 0 0; - rel1.relative: 0.0 0.0; - rel2.relative: 1.0 0.0; - align: 0.0 0.0; - } - description { - state: "top" 0.0; - inherit: "default" 0.0; - min: 1 0; - } - description { - state: "extended" 0.0; - inherit: "default" 0.0; - min: 1 NAVI_BAR_EXTENDED_HEIGHT; - } - } - part { - name: "clip_title"; - type: RECT; - mouse_events: 0; - scale: 1; - description { - state: "default" 0.0; - align: 0.0 0.0; - rel1.to: "base"; - rel2.to: "base"; - } - } - part { - name: "navigationitem"; - type: IMAGE; - mouse_events: 0; - clip_to: "clip_title"; - scale: 1; - description { - state: "default" 0.0; - min: 1 NAVI_BAR_H; - fixed: 0 1; - rel1 { relative: 0.0 0.0; to:"base"; } - rel2 { relative: 1.0 0.0; to:"base"; } - align: 0.0 0.0; - image { - normal: "00_winset_title_bg.png"; - } - } - } - part { - name: "elm.swallow.btn1"; - type: SWALLOW; - clip_to: "clip_title"; - scale: 1; - description { - fixed: 1 1; - state: "default" 0.0; - rel1 { relative: 0.0 0.0; to: "navigationitem"; } - rel2 { relative: 0.0 1.0; to: "navigationitem"; } - align: 0.0 0.5; - } - } - part { - name: "elm.rect.pada"; - type: RECT; - mouse_events: 0; - clip_to: "clip_title"; - scale: 1; - description { - state: "default" 0.0; - min: 67 0; - fixed: 1 0; - rel1 { relative: 0.0 0.0; to: "navigationitem"; } - rel2 { relative: 0.0 1.0; to: "navigationitem"; } - align: 0.0 0.5; - color: 0 0 0 0; - } - } - part { - name: "elm.rect.padb"; - type: RECT; - mouse_events: 0; - clip_to: "clip_title"; - scale: 1; - description { - state: "default" 0.0; - min: 82 0; - fixed: 1 0; - rel1 { relative: 1.0 0.0; to: "navigationitem"; } - rel2 { relative: 1.0 1.0; to: "navigationitem"; } - align: 1.0 0.5; - color: 0 0 0 0; - } - } - part { - name: "elm.text"; - type: TEXT; - scale:1; - clip_to: "clip_title"; - description { - state: "default" 0.0; - text { - font: "SLP:style=Medium"; - size: 22; - min: 0 0; - align: 0.5 0.5; - max: 1 0; - } - color: NAVIGATIONBAR_TITLE_TEXT_COLOR; - rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; } - rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; } - align: 0.5 0.5; - } - } - part { - name: "events"; + mouse_events: 0; + repeat_events: 1; + description { state: "default" 0.0; + min: 1 (NAVI_BAR_H + NAVIBAR_TITLE_SEPARATOR_SHADOW_H); + align: 0.0 0.0; + fixed: 1 1; + rel2.relative: 1.0 0.0; + } + description { state: "top" 0.0; + inherit: "default" 0.0; + min: 1 0; + } + description { state: "extended" 0.0; + inherit: "default" 0.0; + min: 1 (NAVIBAR_EXTENDED_H + NAVIBAR_TITLE_SEPARATOR_SHADOW_H); + } + } + part { name: "clip_title"; + mouse_events: 0; + description { state: "default" 0.0; + rel1.to: "base"; + rel2.to: "base"; + } + } + part { name: "navigationitem"; type: RECT; + mouse_events: 0; + clip_to: "clip_title"; + description { state: "default" 0.0; + min: 1 (NAVI_BAR_H - NAVIBAR_TITLE_SEPARATOR_H); + fixed: 0 1; + rel1 { relative: 0.0 0.0; to:"base"; } + rel2 { relative: 1.0 0.0; to:"base"; } + align: 0.5 0; + color: NAVIBAR_EXTENDED_COLOR; + } + } + part { name: "elm.swallow.btn1"; + type: SWALLOW; + clip_to: "clip_title"; + scale: 1; + description { state: "default" 0.0; + fixed: 1 1; + align: 0.0 0.5; + rel1 { relative: 0.0 0.0; to: "navigationitem"; } + rel2 { relative: 0.0 1.0; to: "navigationitem"; } + } + } + part { name: "elm.rect.pada"; + mouse_events: 0; + description { state: "default" 0.0; + min: 67 0; + fixed: 1 0; + align: 0.0 0.5; + rel1 { relative: 0.0 0.0; to: "navigationitem"; } + rel2 { relative: 0.0 1.0; to: "navigationitem"; } + } + } + part { name: "elm.rect.padb"; + mouse_events: 0; + description { state: "default" 0.0; + min: 82 0; + fixed: 1 0; + align: 1.0 0.5; + rel1 { relative: 1.0 0.0; to: "navigationitem"; } + rel2 { relative: 1.0 1.0; to: "navigationitem"; } + } + } + part { name: "elm.text"; + type: TEXT; + scale: 1; clip_to: "clip_title"; - ignore_flags: ON_HOLD; - description { - state: "default" 0.0; - rel1 { to: "elm.rect.pada"; relative: 1.0 0.0; } - rel2 { to: "elm.rect.padb"; relative: 0.0 1.0; } + description { state: "default" 0.0; + text { font: "SLP:style=Medium"; + size: 22; + min: 0 0; + align: 0.5 0.5; + max: 1 0; + } + color: NAVIGATIONBAR_TITLE_TEXT_COLOR; + align: 0.5 0.5; + rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; } + rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; } + } + } + part { + name: "events"; + ignore_flags: ON_HOLD; + description { state: "default" 0.0; + rel1 { to: "elm.rect.pada"; relative: 1.0 0.0; } + rel2 { to: "elm.rect.padb"; relative: 0.0 1.0; } + } + } + part { + name: "elm.swallow.content"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.0; + rel1 { relative: 0.0 1.0; to_y: "base"; offset: 0 -NAVIBAR_TITLE_SHADOW_H; } + rel2 { relative: 1.0 1.0; } + } + description { state: "top" 0.0; + rel1 { relative: 0.0 0.0; } + rel2 { relative: 1.0 1.0; } + } + } + part { name: "navigationitem_separator"; + type: IMAGE; + mouse_events: 0; + description { state: "default" 0.0; + min: 1 (NAVIBAR_TITLE_SEPARATOR_H + NAVIBAR_TITLE_SEPARATOR_SHADOW_H); + fixed: 0 1; + align: 0.5 1; + rel1 { to: "navigationitem"; relative: 0 1; } + rel2 { to: "base"; relative: 1 1; } + image { normal: "navibar_item_separator.png"; + border: 0 0 1 5; + border_scale: 1; + } + } + } + part { name: "naviarrow"; + type: IMAGE; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + min: 15 11; + max: 15 11; + fixed: 1 1; + align: 0.5 1; + visible: 0; + rel1 { relative: 0 0; to: "navigationitem_separator"; offset: 0 1; } + rel2 { relative: 1 0; to: "navigationitem_separator"; offset: -1 0; } + image { + normal: "00_winset_control_top_arrow.png"; + } + } + description { state: "extended" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part { name: "elm.swallow.title"; + type: SWALLOW; + scale: 1; + clip_to: "clip_title"; + description { state: "default" 0.0; + min: 0 NAVIBAR_TITLE_ITEM_H; + max: 999999 NAVIBAR_TITLE_ITEM_H; + fixed: 0 1; + align: 0.5 0; + rel1 { to: "navigationitem_separator"; } + rel2 { to: "navigationitem_separator"; } + visible: 0; + } + description { state: "extended" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part { name: "elm.rect.blocker"; + type: RECT; + description { state: "default" 0.0; + visible: 0; + } + description { state: "enabled" 0.0; color: 0 0 0 0; - } - } - part { - name: "naviarrow"; - type: IMAGE; - mouse_events: 1; - clip_to: "clip_title"; - scale: 1; - description { - state: "default" 0.0; - min: 15 11; - max: 15 11; - visible: 0; - fixed: 1 1; - rel1 { relative: 0.0 0.0; to: "elm.text"; } - rel2 { relative: 1.0 1.0; to: "elm.text"; } - align: 0.5 1.0; - image { - normal: "00_winset_control_top_arrow.png"; - } - } - description { - state: "extended" 0.0; - inherit: "default" 0.0; - visible:1; - } - } - part { - name: "elm.swallow.title"; - type: SWALLOW; - scale:1; - clip_to: "clip_title"; - description { - fixed: 0 1; - min: 0 ITEM_HEIGHT; - visible: 0; - state: "default" 0.0; - rel1 { relative: 0.0 1.0; to_y: "navigationitem"; to_x: "base";} - rel2 { relative: 1.0 1.0; to: "base"; } - align: 0.0 0.0; - } - description { - state: "extended" 0.0; - inherit: "default" 0.0; - visible:1; - } - } - part { - name: "elm.swallow.content"; - type: SWALLOW; - scale: 1; - description { - state: "default" 0.0; - align: 0.0 0.0; - rel1 { relative: 0.0 1.0; to_y: "base"; } - rel2 { relative: 1.0 1.0; } - } - description { - state: "top" 0.0; - rel1 { relative: 0.0 0.0; } - rel2 { relative: 1.0 1.0; } - } - } - part { - name: "elm.rect.blocker"; - type: RECT; - description { - state: "default" 0.0; - visible: 0; - } - description { - state: "enabled" 0.0; - color: 0 0 0 0; - visible: 1; - } - } + visible: 1; + } + } } /* end of parts */ programs { @@ -340,13 +308,13 @@ group { scale: 1; description { fixed: 1 1; - min: 0 ITEM_HEIGHT; + min: 0 NAVIBAR_TITLE_ITEM_H; state: "default" 0.0; rel1 { relative: 0.0 0.0; } rel2 { relative: 0.0 1.0; } align: 0.0 0.5; } - } + } part { name: "elm.rect.pad1"; type: RECT; @@ -360,7 +328,7 @@ group { } description { state: "visible" 0.0; - min: PADDING 0; + min: NAVIBAR_PADDING 0; fixed: 1 0; rel1 { relative: 1.0 0.0; to: "elm.swallow.title1"; } rel2 { relative: 1.0 1.0; to: "elm.swallow.title1"; } @@ -374,12 +342,12 @@ group { scale: 1; description { fixed: 1 1; - min: 0 ITEM_HEIGHT; + min: 0 NAVIBAR_TITLE_ITEM_H; state: "default" 0.0; rel1 { relative: 1.0 0.0; to: "elm.rect.pad1"; } rel2 { relative: 1.0 1.0; to: "elm.rect.pad1"; } align: 0.0 0.5; - } + } } part { name: "elm.rect.pad2"; @@ -394,7 +362,7 @@ group { } description { state: "visible" 0.0; - min: PADDING 0; + min: NAVIBAR_PADDING 0; fixed: 1 0; rel1 { relative: 1.0 0.0; to: "elm.swallow.title2"; } rel2 { relative: 1.0 1.0; to: "elm.swallow.title2"; } @@ -408,13 +376,13 @@ group { scale: 1; description { fixed: 1 1; - min: 0 ITEM_HEIGHT; + min: 0 NAVIBAR_TITLE_ITEM_H; state: "default" 0.0; rel1 { relative: 1.0 0.0; to: "elm.rect.pad2"; } rel2 { relative: 1.0 1.0; to: "elm.rect.pad2"; } align: 0.0 0.5; } - } + } part { name: "elm.rect.pad3"; type: RECT; @@ -428,7 +396,7 @@ group { } description { state: "visible" 0.0; - min: PADDING 0; + min: NAVIBAR_PADDING 0; fixed: 1 0; rel1 { relative: 1.0 0.0; to: "elm.swallow.title3"; } rel2 { relative: 1.0 1.0; to: "elm.swallow.title3"; } @@ -442,7 +410,7 @@ group { scale: 1; description { fixed: 1 1; - min: 0 ITEM_HEIGHT; + min: 0 NAVIBAR_TITLE_ITEM_H; state: "default" 0.0; rel1 { relative: 1.0 0.0; to: "elm.rect.pad3"; } rel2 { relative: 1.0 1.0; to: "elm.rect.pad3"; } @@ -462,7 +430,7 @@ group { } description { state: "visible" 0.0; - min: PADDING 0; + min: NAVIBAR_PADDING 0; fixed: 1 0; rel1 { relative: 1.0 0.0; to: "elm.swallow.title4"; } rel2 { relative: 1.0 1.0; to: "elm.swallow.title4"; } @@ -476,13 +444,13 @@ group { scale: 1; description { fixed: 1 1; - min: 0 ITEM_HEIGHT; + min: 0 NAVIBAR_TITLE_ITEM_H; state: "default" 0.0; rel1 { relative: 1.0 0.0; to: "elm.rect.pad4"; } rel2 { relative: 1.0 1.0; to: "elm.rect.pad4"; } align: 0.0 0.5; } - } + } } /* end of parts */ programs { @@ -521,49 +489,49 @@ group { /////////////////////////////////////////////////////////////////////////////// group { name: "elm/pager/base/navigationbar"; parts { - part { + part { name: "clip"; type: RECT; mouse_events: 0; - description { + description { state: "default" 0.0; - rel1 { + rel1 { to: "base"; offset: -9999 -9999; } - rel2 { + rel2 { to: "base"; offset: 9999 9999; } color: 255 255 255 255; } - description { + description { state: "visible" 0.0; inherit: "default" 0.0; } - description { + description { state: "hidden" 0.0; inherit: "default" 0.0; color: 255 255 255 0; visible: 0; } - description { + description { state: "hidden2" 0.0; inherit: "default" 0.0; color: 255 255 255 0; visible: 0; } } - part { + part { name: "base"; type: RECT; mouse_events: 0; clip_to: "clip"; - description { + description { state: "default" 0.0; color: 0 0 0 0; } - description { + description { state: "hidden" 0.0; color: 0 0 0 0; rel1.relative: -1.0 0.0; @@ -575,18 +543,18 @@ group { rel1.relative: 1.0 0.0; rel2.relative: 2.0 1.0; } - description { + description { state: "visible" 0.0; color: 0 0 0 0; rel1.relative: 0.0 0.0; rel2.relative: 1.0 1.0; } } - part { + part { name: "elm.swallow.content"; type: SWALLOW; clip_to: "clip"; - description { + description { state: "default" 0.0; rel1.to: "base"; rel2.to: "base"; @@ -594,7 +562,7 @@ group { } } programs { - program { + program { name: "push_start"; signal: "elm,action,push"; source: "elm"; @@ -603,7 +571,7 @@ group { target: "clip"; after: "show_start2"; } - program { + program { name: "show_start"; signal: "elm,action,show"; source: "elm"; @@ -612,7 +580,7 @@ group { target: "clip"; after: "show_start2"; } - program { + program { name: "show_start2"; action: STATE_SET "visible" 0.0; transition: DECELERATE 0.5; @@ -620,11 +588,11 @@ group { target: "clip"; after: "show_end"; } - program { + program { name: "show_end"; action: SIGNAL_EMIT "elm,action,show,finished" ""; } - program { + program { name: "pop_start"; signal: "elm,action,pop"; source: "elm"; @@ -633,7 +601,7 @@ group { target: "clip"; after: "pop_start2"; } - program { + program { name: "pop_start2"; action: STATE_SET "hidden2" 0.0; transition: DECELERATE 0.5; @@ -641,7 +609,7 @@ group { target: "clip"; after: "hide_end"; } - program { + program { name: "hide_start"; signal: "elm,action,hide"; source: "elm"; @@ -650,7 +618,7 @@ group { target: "clip"; after: "hide_start2"; } - program { + program { name: "hide_start2"; action: STATE_SET "hidden" 0.0; transition: DECELERATE 0.5; @@ -658,11 +626,11 @@ group { target: "clip"; after: "hide_end"; } - program { + program { name: "hide_end"; action: SIGNAL_EMIT "elm,action,hide,finished" ""; } - program { + program { name: "reset"; signal: "elm,action,reset"; source: "elm"; @@ -670,7 +638,7 @@ group { target: "base"; target: "clip"; } - program { + program { name: "show_firstpage"; /*avoid effect in first page*/ signal: "elm,action,show,noanimate"; source: "elm"; @@ -679,7 +647,7 @@ group { target: "clip"; after: "show_end"; } - program { + program { name: "hide_firstpage"; /*avoid effect in first page*/ signal: "elm,action,hide,noanimate"; source: "elm"; diff --git a/themes/groups/navigationbar_ex.edc b/themes/groups/navigationbar_ex.edc index b34bb12..472d858 100644 --- a/themes/groups/navigationbar_ex.edc +++ b/themes/groups/navigationbar_ex.edc @@ -1,5 +1,15 @@ -#define NAVI_BAR_EXTENDED_HEIGHT2 176 -/////////////////////////////////////////////////////////////////////////////// +#define NAVIBAR_EX_EXTENDED_H 115 +#define NAVIBAR_EX_EXTENDED_H2 186 +#define NAVIBAR_EX_TITLE_SEPARATOR_H 5 +#define NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H 5 +#define NAVIBAR_EX_EXTENDED_COLOR 219 201 174 255 +#define NAVIBAR_EX_TITLE_ITEM_H 67 //TODO: SHOULD BE 59 +#define NAVIBAR_EX_TITLE_ITEM_MAX_W 112 +#define NAVIBAR_EX_TITLE_SEPARATOR_H 5 + +//////////////////////////////////////////////////////////////////////////////////////// +// NavigationBar_ex +//////////////////////////////////////////////////////////////////////////////////////// group { name: "elm/navigationbar_ex/content/default"; parts { part { name: "clip"; @@ -150,147 +160,126 @@ group { name: "elm/navigationbar_ex/content/default"; group { name: "elm/navigationbar_ex/item/title/default"; images { - image: "00_winset_title_bg.png" COMP; + image: "navibar_item_separator.png" COMP; } parts { part { name: "base"; - type: RECT; - scale : 1; mouse_events: 0; repeat_events: 1; description { state: "default" 0.0; - min: 1 NAVI_BAR_H; + min: 1 (NAVI_BAR_H + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H); fixed: 1 1; - color: 0 0 0 0; - rel1.relative: 0.0 0.0; rel2.relative: 1.0 0.0; align: 0.0 0.0; } - description { - state: "top" 0.0; + description { state: "top" 0.0; inherit: "default" 0.0; min: 1 0; } - description { - state: "extended" 0.0; + description { state: "extended" 0.0; inherit: "default" 0.0; - min: 1 NAVI_BAR_EXTENDED_HEIGHT; + min: 1 (NAVIBAR_EX_EXTENDED_H + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H); } } - part { - name: "navigationitem"; - type: IMAGE; + part { name: "navigationitem"; + type: RECT; mouse_events: 0; clip_to: "clip_title"; - scale: 1; - description { - state: "default" 0.0; - min: 1 NAVI_BAR_H; + description { state: "default" 0.0; + min: 1 (NAVI_BAR_H - NAVIBAR_EX_TITLE_SEPARATOR_H); fixed: 0 1; rel1 { relative: 0.0 0.0; to: "base";} rel2 { relative: 1.0 0.0; to: "base";} - align: 0.0 0.0; - image { - normal: "00_winset_title_bg.png"; - } + align: 0.5 0.0; + color: NAVIBAR_EX_EXTENDED_COLOR; } } - part { - name: "clip_title"; - type: RECT; + part { name: "clip_title"; mouse_events: 0; - scale: 1; - description { - state: "default" 0.0; - align: 0.0 0.0; - rel1 { relative: 0.0 0.0; to: "base"; } - rel2 { relative: 1.0 1.0; to: "base"; } + description { state: "default" 0.0; + rel1 { to: "base"; } + rel2 { to: "base"; } } } - part { - name: "elm.swallow.back"; + part { name: "elm.swallow.back"; type: SWALLOW; clip_to: "clip_title"; scale: 1; - description { + description { state: "default" 0.0; fixed: 1 1; min: 0 40; - max: MAX_ITEM_WIDTH 40; - state: "default" 0.0; + max: NAVIBAR_EX_TITLE_ITEM_MAX_W 40; + align: 0.0 0.5; rel1 { relative: 0.0 0.0; to: "navigationitem"; } rel2 { relative: 0.0 1.0; to: "navigationitem"; } - align: 0.0 0.5; } } - part { - name: "elm.rect.pada"; - type: RECT; + part { name: "elm.rect.pada"; mouse_events: 0; - clip_to: "clip_title"; - scale: 1; - description { - state: "default" 0.0; - min: PADDING 0; + description { state: "default" 0.0; + min: 67 0; fixed: 1 0; + align: 0.0 0.5; rel1 { relative: 0.0 0.0; to: "navigationitem"; } rel2 { relative: 0.0 1.0; to: "navigationitem"; } - align: 0.0 0.5; - color: 0 0 0 0; } - } - part { - name: "elm.rect.padb"; - type: RECT; + } + part { name: "elm.rect.padb"; mouse_events: 0; - clip_to: "clip_title"; - scale: 1; - description { - state: "default" 0.0; - min: 1 0; + description { state: "default" 0.0; + min: 82 0; fixed: 1 0; + align: 1.0 0.5; rel1 { relative: 1.0 0.0; to: "navigationitem"; } rel2 { relative: 1.0 1.0; to: "navigationitem"; } - align: 1.0 0.5; - color: 0 0 0 0; } } - part { - name: "elm.text"; + part { name: "elm.text"; type: TEXT; clip_to: "clip_title"; - scale:1; - description { - state: "default" 0.0; - text - { + scale:1; + description { state: "default" 0.0; + text { font: "SLP:style=Medium"; size: 22; min: 0 0; align: 0.5 0.5; max: 1 0; - } + } color: NAVIGATIONBAR_TITLE_TEXT_COLOR; - rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; } //1.0 0.0 - rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; } align: 0.5 0.5; + rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; } + rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; } } } - part { - name: "elm.swallow.content"; + part { name: "elm.swallow.content"; type: SWALLOW; scale: 1; - description { - state: "default" 0.0; + description { state: "default" 0.0; align: 0.0 0.0; - rel1 { relative: 0.0 1.0; to: "base"; } + rel1 { relative: 0.0 1.0; to: "base"; offset: 0 -NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H; } rel2 { relative: 1.0 1.0; } } - description { - state: "top" 0.0; + description { state: "top" 0.0; rel1 { relative: 0.0 0.0; } rel2 { relative: 1.0 1.0; } } } + part { name: "navigationitem_separator"; + type: IMAGE; + mouse_events: 0; + description { state: "default" 0.0; + min: 1 (NAVIBAR_EX_TITLE_SEPARATOR_H + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H); + fixed: 0 1; + align: 0.5 1; + rel1 { to: "navigationitem"; relative: 0 1; } + rel2 { to: "base"; relative: 1 1; } + image { normal: "navibar_item_separator.png"; + border: 0 0 1 6; + border_scale: 1; + } + } + } } programs { program { @@ -330,144 +319,136 @@ group { name: "elm/navigationbar_ex/item/title/default"; group { name: "elm/navigationbar_ex/item/title_option_header/default"; images { - image: "00_winset_title_bg.png" COMP; + image: "navibar_item_separator.png" COMP; } parts { part { name: "base"; - type: RECT; - scale : 1; mouse_events: 0; repeat_events: 1; description { state: "default" 0.0; - min: 1 NAVI_BAR_H; + min: 1 (NAVI_BAR_H + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H); fixed: 1 1; - color: 0 0 0 0; - rel1.relative: 0.0 0.0; rel2.relative: 1.0 0.0; align: 0.0 0.0; } - description { - state: "top" 0.0; + description { state: "top" 0.0; inherit: "default" 0.0; min: 1 0; } - description { - state: "extended" 0.0; + description { state: "extended" 0.0; inherit: "default" 0.0; - min: 1 NAVI_BAR_EXTENDED_HEIGHT; + min: 1 (NAVIBAR_EX_EXTENDED_H + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H); } } - part { - name: "navigationitem"; - type: IMAGE; + part { name: "navigationitem"; + type: RECT; mouse_events: 0; clip_to: "clip_title"; - scale: 1; - description { - state: "default" 0.0; - min: 1 NAVI_BAR_H; + description { state: "default" 0.0; + min: 1 (NAVI_BAR_H - NAVIBAR_EX_TITLE_SEPARATOR_H); fixed: 0 1; - rel1 { relative: 0.0 0.0; to: "base"; } - rel2 { relative: 1.0 0.0; to: "base"; } - align: 0.0 0.0; - image { - normal: "00_winset_title_bg.png"; - } + rel1 { relative: 0.0 0.0; to: "base";} + rel2 { relative: 1.0 0.0; to: "base";} + align: 0.5 0.0; + color: NAVIBAR_EX_EXTENDED_COLOR; } } - part { - name: "clip_title"; - type: RECT; + part { name: "clip_title"; mouse_events: 0; - scale: 1; - description { - state: "default" 0.0; - align: 0.0 0.0; - rel1 { relative: 0.0 0.0; to: "base"; } - rel2 { relative: 1.0 1.0; to: "base"; } + description { state: "default" 0.0; + rel1 { to: "base"; } + rel2 { to: "base"; } } } - part { - name: "elm.swallow.back"; + part { name: "elm.swallow.back"; type: SWALLOW; clip_to: "clip_title"; scale: 1; - description { + description { state: "default" 0.0; fixed: 1 1; min: 0 40; - max: MAX_ITEM_WIDTH 40; - state: "default" 0.0; + max: NAVIBAR_EX_TITLE_ITEM_MAX_W 40; + align: 0.0 0.5; rel1 { relative: 0.0 0.0; to: "navigationitem"; } rel2 { relative: 0.0 1.0; to: "navigationitem"; } - align: 0.0 0.5; } } - part { - name: "elm.rect.pada"; - type: RECT; + part { name: "elm.rect.pada"; mouse_events: 0; - clip_to: "clip_title"; - scale: 1; - description { - state: "default" 0.0; - min: PADDING 0; + description { state: "default" 0.0; + min: 67 0; fixed: 1 0; + align: 0.0 0.5; rel1 { relative: 0.0 0.0; to: "navigationitem"; } rel2 { relative: 0.0 1.0; to: "navigationitem"; } - align: 0.0 0.5; - color: 0 0 0 0; } } - part { - name: "elm.rect.padb"; - type: RECT; + part { name: "elm.rect.padb"; mouse_events: 0; - clip_to: "clip_title"; - scale: 1; - description { - state: "default" 0.0; - min: 1 0; + description { state: "default" 0.0; + min: 82 0; fixed: 1 0; + align: 1.0 0.5; rel1 { relative: 1.0 0.0; to: "navigationitem"; } rel2 { relative: 1.0 1.0; to: "navigationitem"; } - align: 1.0 0.5; - color: 0 0 0 0; } } - part { - name: "elm.text"; + part { name: "elm.text"; type: TEXT; clip_to: "clip_title"; - scale:1; - description { - state: "default" 0.0; - text - { + scale:1; + description { state: "default" 0.0; + text { font: "SLP:style=Medium"; size: 22; min: 0 0; align: 0.5 0.5; max: 1 0; - } + } color: NAVIGATIONBAR_TITLE_TEXT_COLOR; - rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; } //1.0 0.0 - rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; } align: 0.5 0.5; + rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; } + rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; } + } + } + part { + name: "events"; + ignore_flags: ON_HOLD; + description { + state: "default" 0.0; + rel1 { to: "elm.rect.pada"; relative: 1 0; } + rel2 { to: "elm.rect.padb"; relative: 0 1; } } } - part { - name: "events"; - type: RECT; - clip_to: "clip_title"; - ignore_flags: ON_HOLD; - description { - state: "default" 0.0; - rel1 { to: "elm.text"; } - rel2 { to: "elm.text"; } - color: 0 0 0 0; + part { name: "elm.swallow.content"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.0; + rel1 { relative: 0.0 1.0; to: "base"; offset: 0 -NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H; } + rel2 { relative: 1.0 1.0; } + } + description { state: "top" 0.0; + rel1 { relative: 0.0 0.0; } + rel2 { relative: 1.0 1.0; } + } + } + part { name: "navigationitem_separator"; + type: IMAGE; + mouse_events: 0; + description { state: "default" 0.0; + min: 1 (NAVIBAR_EX_TITLE_SEPARATOR_H + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H); + fixed: 0 1; + align: 0.5 1; + rel1 { to: "navigationitem"; relative: 0 1; } + rel2 { to: "base"; relative: 1 1; } + image { normal: "navibar_item_separator.png"; + border: 0 0 1 6; + border_scale: 1; } } - part { + } + part { name: "naviarrow"; type: IMAGE; mouse_events: 1; @@ -478,42 +459,30 @@ group { name: "elm/navigationbar_ex/item/title_option_header/default"; min: 15 11; max: 15 11; fixed: 1 1; - rel1 { relative: 0.0 0.0; to: "elm.text"; } - rel2 { relative: 1.0 1.0; to: "elm.text"; } align: 0.5 1.0; + rel1 { relative: 0 0; to: "navigationitem_separator"; offset: 0 1; } + rel2 { relative: 1 0; to: "navigationitem_separator"; offset: -1 0; } image { normal: "00_winset_control_top_arrow.png"; } } } - part { - name: "elm.swallow.title"; + part { name: "elm.swallow.title"; type: SWALLOW; - scale:1; + scale: 1; clip_to: "clip_title"; - description { + description { state: "default" 0.0; + min: 0 NAVIBAR_EX_TITLE_ITEM_H; + max: 999999 NAVIBAR_EX_TITLE_ITEM_H; fixed: 0 1; - min: 0 ITEM_HEIGHT; - state: "default" 0.0; - rel1 { relative: 0.0 1.0; to_y: "navigationitem"; } - rel2 { relative: 1.0 1.0; to: "base"; } - align: 0.0 0.0; - } - } - part { - name: "elm.swallow.content"; - type: SWALLOW; - scale: 1; - description { - state: "default" 0.0; - align: 0.0 0.0; - rel1 { relative: 0.0 1.0; to: "base"; } - rel2 { relative: 1.0 1.0; } + align: 0.5 0.0; + rel1 { to: "navigationitem_separator"; } + rel2 { to: "navigationitem_separator"; } + visible: 0; } - description { - state: "top" 0.0; - rel1 { relative: 0.0 0.0; } - rel2 { relative: 1.0 1.0; } + description { state: "extended" 0.0; + inherit: "default" 0.0; + visible: 1; } } } @@ -546,6 +515,7 @@ group { name: "elm/navigationbar_ex/item/title_option_header/default"; source: "elm"; action: STATE_SET "extended" 0.0; target: "base"; + target: "elm.swallow.title"; transition: LINEAR 0.2; } program { @@ -554,6 +524,7 @@ group { name: "elm/navigationbar_ex/item/title_option_header/default"; source: "elm"; action: STATE_SET "default" 0.0; target: "base"; + target: "elm.swallow.title"; transition: LINEAR 0.2; } } @@ -561,144 +532,136 @@ group { name: "elm/navigationbar_ex/item/title_option_header/default"; group { name: "elm/navigationbar_ex/item/title_option_header2/default"; images { - image: "00_winset_title_bg.png" COMP; + image: "navibar_item_separator.png" COMP; } parts { part { name: "base"; - type: RECT; - scale : 1; mouse_events: 0; repeat_events: 1; description { state: "default" 0.0; - min: 1 NAVI_BAR_H; + min: 1 (NAVI_BAR_H + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H); fixed: 1 1; - color: 0 0 0 0; - rel1.relative: 0.0 0.0; rel2.relative: 1.0 0.0; align: 0.0 0.0; } - description { - state: "top" 0.0; + description { state: "top" 0.0; inherit: "default" 0.0; min: 1 0; } - description { - state: "extended" 0.0; + description { state: "extended" 0.0; inherit: "default" 0.0; - min: 1 NAVI_BAR_EXTENDED_HEIGHT2; + min: 1 (NAVIBAR_EX_EXTENDED_H2 + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H); } } - part { - name: "navigationitem"; - type: IMAGE; + part { name: "navigationitem"; + type: RECT; mouse_events: 0; clip_to: "clip_title"; - scale: 1; - description { - state: "default" 0.0; - min: 1 NAVI_BAR_H; + description { state: "default" 0.0; + min: 1 (NAVI_BAR_H - NAVIBAR_EX_TITLE_SEPARATOR_H); fixed: 0 1; - rel1 { relative: 0.0 0.0; to: "base"; } - rel2 { relative: 1.0 0.0; to: "base"; } - align: 0.0 0.0; - image { - normal: "00_winset_title_bg.png"; - } + rel1 { relative: 0.0 0.0; to: "base";} + rel2 { relative: 1.0 0.0; to: "base";} + align: 0.5 0.0; + color: NAVIBAR_EX_EXTENDED_COLOR; } } - part { - name: "clip_title"; - type: RECT; + part { name: "clip_title"; mouse_events: 0; - scale: 1; - description { - state: "default" 0.0; - align: 0.0 0.0; - rel1 { relative: 0.0 0.0; to: "base"; } - rel2 { relative: 1.0 1.0; to: "base"; } + description { state: "default" 0.0; + rel1 { to: "base"; } + rel2 { to: "base"; } } } - part { - name: "elm.swallow.back"; + part { name: "elm.swallow.back"; type: SWALLOW; clip_to: "clip_title"; scale: 1; - description { + description { state: "default" 0.0; fixed: 1 1; min: 0 40; - max: MAX_ITEM_WIDTH 40; - state: "default" 0.0; + max: NAVIBAR_EX_TITLE_ITEM_MAX_W 40; + align: 0.0 0.5; rel1 { relative: 0.0 0.0; to: "navigationitem"; } rel2 { relative: 0.0 1.0; to: "navigationitem"; } - align: 0.0 0.5; } } - part { - name: "elm.rect.pada"; - type: RECT; + part { name: "elm.rect.pada"; mouse_events: 0; - clip_to: "clip_title"; - scale: 1; - description { - state: "default" 0.0; - min: PADDING 0; + description { state: "default" 0.0; + min: 67 0; fixed: 1 0; + align: 0.0 0.5; rel1 { relative: 0.0 0.0; to: "navigationitem"; } rel2 { relative: 0.0 1.0; to: "navigationitem"; } - align: 0.0 0.5; - color: 0 0 0 0; } } - part { - name: "elm.rect.padb"; - type: RECT; + part { name: "elm.rect.padb"; mouse_events: 0; - clip_to: "clip_title"; - scale: 1; - description { - state: "default" 0.0; - min: 1 0; + description { state: "default" 0.0; + min: 82 0; fixed: 1 0; + align: 1.0 0.5; rel1 { relative: 1.0 0.0; to: "navigationitem"; } rel2 { relative: 1.0 1.0; to: "navigationitem"; } - align: 1.0 0.5; - color: 0 0 0 0; } } - part { - name: "elm.text"; + part { name: "elm.text"; type: TEXT; clip_to: "clip_title"; - scale:1; - description { - state: "default" 0.0; - text - { + scale:1; + description { state: "default" 0.0; + text { font: "SLP:style=Medium"; size: 22; min: 0 0; align: 0.5 0.5; max: 1 0; - } + } color: NAVIGATIONBAR_TITLE_TEXT_COLOR; - rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; } //1.0 0.0 - rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; } align: 0.5 0.5; + rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; } + rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; } + } + } + part { + name: "events"; + ignore_flags: ON_HOLD; + description { + state: "default" 0.0; + rel1 { to: "elm.rect.pada"; relative: 1 0; } + rel2 { to: "elm.rect.padb"; relative: 0 1; } + } + } + part { name: "elm.swallow.content"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.0; + rel1 { relative: 0.0 1.0; to: "base"; offset: 0 -NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H; } + rel2 { relative: 1.0 1.0; } + } + description { state: "top" 0.0; + rel1 { relative: 0.0 0.0; } + rel2 { relative: 1.0 1.0; } } } - part { - name: "events"; - type: RECT; - clip_to: "clip_title"; - ignore_flags: ON_HOLD; - description { - state: "default" 0.0; - rel1 { to: "elm.text"; } - rel2 { to: "elm.text"; } - color: 0 0 0 0; + part { name: "navigationitem_separator"; + type: IMAGE; + mouse_events: 0; + description { state: "default" 0.0; + min: 1 (NAVIBAR_EX_TITLE_SEPARATOR_H + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H); + fixed: 0 1; + align: 0.5 1; + rel1 { to: "navigationitem"; relative: 0 1; } + rel2 { to: "base"; relative: 1 1; } + image { normal: "navibar_item_separator.png"; + border: 0 0 0 6; + border_scale: 1; } } - part { + } + part { name: "naviarrow"; type: IMAGE; mouse_events: 1; @@ -709,42 +672,30 @@ group { name: "elm/navigationbar_ex/item/title_option_header2/default"; min: 15 11; max: 15 11; fixed: 1 1; - rel1 { relative: 0.0 0.0; to: "elm.text"; } - rel2 { relative: 1.0 1.0; to: "elm.text"; } align: 0.5 1.0; + rel1 { relative: 0 0; to: "navigationitem_separator"; offset: 0 1; } + rel2 { relative: 1 0; to: "navigationitem_separator"; offset: -1 0; } image { normal: "00_winset_control_top_arrow.png"; } } } - part { - name: "elm.swallow.title"; + part { name: "elm.swallow.title"; type: SWALLOW; - scale:1; + scale: 1; clip_to: "clip_title"; - description { + description { state: "default" 0.0; + min: 0 (NAVIBAR_EX_TITLE_ITEM_H * 2); + max: 999999 (NAVIBAR_EX_TITLE_ITEM_H * 2); fixed: 0 1; - min: 0 ITEM_HEIGHT; - state: "default" 0.0; - rel1 { relative: 0.0 1.0; to_y: "navigationitem"; } - rel2 { relative: 1.0 1.0; to: "base"; } - align: 0.0 0.0; - } - } - part { - name: "elm.swallow.content"; - type: SWALLOW; - scale: 1; - description { - state: "default" 0.0; - align: 0.0 0.0; - rel1 { relative: 0.0 1.0; to: "base"; } - rel2 { relative: 1.0 1.0; } + align: 0.5 0.0; + rel1 { to: "navigationitem_separator"; } + rel2 { to: "navigationitem_separator"; } + visible: 0; } - description { - state: "top" 0.0; - rel1 { relative: 0.0 0.0; } - rel2 { relative: 1.0 1.0; } + description { state: "extended" 0.0; + inherit: "default" 0.0; + visible: 1; } } } @@ -777,6 +728,7 @@ group { name: "elm/navigationbar_ex/item/title_option_header2/default"; source: "elm"; action: STATE_SET "extended" 0.0; target: "base"; + target: "elm.swallow.title"; transition: LINEAR 0.2; } program { @@ -785,6 +737,7 @@ group { name: "elm/navigationbar_ex/item/title_option_header2/default"; source: "elm"; action: STATE_SET "default" 0.0; target: "base"; + target: "elm.swallow.title"; transition: LINEAR 0.2; } } @@ -792,13 +745,11 @@ group { name: "elm/navigationbar_ex/item/title_option_header2/default"; group { name: "elm/standard/navigationbar_ex/title_obj2"; parts { - part { - name: "title_obj1"; + part { name: "title_obj1"; type: SWALLOW; scale: 1; - description { - state: "default" 0.0; - min: 0 55; + description { state: "default" 0.0; + min: 0 NAVIBAR_EX_TITLE_ITEM_H; fixed: 0 1; rel1 { relative: 0.0 0.0; } rel2 { relative: 1.0 0.0; } @@ -808,24 +759,20 @@ group { name: "elm/standard/navigationbar_ex/title_obj2"; part { name: "padding"; type: RECT; - scale: 1; - description { - state: "default" 0.0; + description { state: "default" 0.0; min: 0 1; fixed: 0 1; rel1 { relative: 0.0 1.0; to_y: "title_obj1"; } - rel2 { relative: 1.0 0.0; } + rel2 { relative: 1.0 1.0; to_y: "title_obj1"; } align: 0.0 0.0; color: 207 128 19 255; } } - part { - name: "title_obj2"; + part { name: "title_obj2"; type: SWALLOW; scale: 1; - description { - state: "default" 0.0; - min: 0 65; + description { state: "default" 0.0; + min: 0 NAVIBAR_EX_TITLE_ITEM_H; fixed: 0 1; rel1 { relative: 0.0 1.0; to_y: "padding"; } rel2 { relative: 1.0 1.0; } -- 2.7.4