X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=themes%2Fwidgets%2Fpopup.edc;h=789e21bc1413d3b1c10db7548cb9ef3698db80dd;hb=ef912d467647af72b27658db6bab1d3fdb24bca1;hp=9a51c80f6fe3c10fa91cb2d918a62329b95c3580;hpb=ed61ae4f438d0448fb8d1886da7a9e874656ffe4;p=platform%2Fcore%2Fuifw%2Fefl-theme-tizen.git diff --git a/themes/widgets/popup.edc b/themes/widgets/popup.edc index 9a51c80..789e21b 100644 --- a/themes/widgets/popup.edc +++ b/themes/widgets/popup.edc @@ -20,12 +20,6 @@ #define POPUP_ITEM_STATE_ENABLED 0 #define POPUP_ITEM_STATE_DISABLED 1 -sounds { - sample { name: "touch_sound" RAW; - source: "button-pressed.wav"; - } -} - /*popup widget specific notify style style*/ group { name: "elm/notify/center/popup"; alias: "elm/notify/center/verticalbuttonstyle"; @@ -39,6 +33,7 @@ group { name: "elm/notify/center/popup"; alias: "elm/notify/center/content_expand"; alias: "elm/notify/center/content_no_vhpad"; alias: "elm/notify/center/dimrect"; + alias: "elm/notify/center/indicator_norepeatevent"; parts { part { name: "base"; type: RECT; @@ -80,13 +75,11 @@ group { name: "elm/notify/center/popup"; part { name: "elm.swallow.content"; type: SWALLOW; scale: 1; - clip_to: "clipper"; description { state: "default" 0.0; rel1.to: "base"; rel2.to: "base"; map { on: 1; - backface_cull: 1; perspective: "persp"; smooth: 0; } @@ -96,7 +89,6 @@ group { name: "elm/notify/center/popup"; rel2.to: "base"; map { on: 1; - backface_cull: 1; perspective: "persp1"; smooth: 0; } @@ -110,26 +102,6 @@ group { name: "elm/notify/center/popup"; } } } - part { name: "clipper"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - min: 1280 1280; - max: 1280 1280; - fixed: 1 1; - rel1.to: "base"; - rel2.to: "base"; - color: 255 255 255 0; - } - description { state: "visible" 0.0; - inherit: "default"; - color: 255 255 255 255; - } - description { state: "end" 0.0; - inherit: "default"; - color: 255 255 255 255; - } - } } programs { program { name: "show"; @@ -142,9 +114,7 @@ group { name: "elm/notify/center/popup"; signal: "show"; action: STATE_SET "default" 0.0; target: "elm.swallow.content"; - target: "clipper"; after: "end"; - after: "end1"; } program { name: "end"; action: STATE_SET "visible" 0.0; @@ -152,16 +122,6 @@ group { name: "elm/notify/center/popup"; transition: SIN_FAC 0.33 1.4; after: "end2"; } - program { name: "end1"; - action: STATE_SET "visible" 0.0; - target: "clipper"; - transition: SIN_FAC 0.33 0.5; - after: "end3"; - } - program { name: "end3"; - action: STATE_SET "end" 0.0; - target: "clipper"; - } program { name: "end2"; action: STATE_SET "end" 0.0; target: "elm.swallow.content"; @@ -186,6 +146,7 @@ group { name: "elm/notify/center/transparent"; alias: "elm/notify/center/volumebarstyle_transparent"; alias: "elm/notify/center/volumebarstyle_text_transparent"; alias: "elm/notify/center/content_expand_transparent"; + alias: "elm/notify/center/content_no_vhpad_transparent"; parts { part { name: "elm.swallow.content"; type: SWALLOW; @@ -214,24 +175,7 @@ group { name: "elm/notify/block_events/popup"; alias: "elm/notify/block_events/volumebarstyle_text"; alias: "elm/notify/block_events/content_expand"; alias: "elm/notify/block_events/content_no_vhpad"; - images { - image: "00_popup_dim_lighting_v.png" COMP; - image: "00_popup_dim_lighting_h.png" COMP; - } parts { - part { name: "block_events"; - type: IMAGE; - scale: 1; - repeat_events: 1; - description { state: "default" 0.0; - image.normal: "00_popup_dim_lighting_v.png"; - fill.smooth: 0; - } - description { state: "landscape" 0.0; - image.normal: "00_popup_dim_lighting_h.png"; - fill.smooth: 0; - } - } part {name: "popup_indicator"; type: RECT; scale: 1; @@ -249,7 +193,7 @@ group { name: "elm/notify/block_events/popup"; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: POPUP_DIM_BG_COLOR_INC; + color: POPUP_DIM_BG_CLICKED_COLOR_INC; } } part { name: "block_events_color"; @@ -268,7 +212,7 @@ group { name: "elm/notify/block_events/popup"; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: POPUP_DIM_BG_COLOR_INC; + color: POPUP_DIM_BG_CLICKED_COLOR_INC; } } } @@ -277,7 +221,6 @@ group { name: "elm/notify/block_events/popup"; signal: "elm,action,show"; source: "elm"; action: STATE_SET "default" 0.0; - target: "block_events"; target: "block_events_color"; target: "popup_indicator"; } @@ -315,29 +258,31 @@ group { name: "elm/notify/block_events/popup"; target: "popup_indicator"; transition: LINEAR 0.2; } - program { name: "landscape_mode"; - source: "elm"; - signal: "elm,state,orient,90"; - action: STATE_SET "landscape" 0.0; - target: "block_events"; - } - program { name: "landscape_mode2"; - source: "elm"; - signal: "elm,state,orient,270"; - action: STATE_SET "landscape" 0.0; - target: "block_events"; - } - program { name: "portrait_mode"; - source: "elm"; - signal: "elm,state,orient,0"; - action: STATE_SET "default" 0.0; - target: "block_events"; - } - program { name: "portrait_mode2"; - source: "elm"; - signal: "elm,state,orient,180"; - action: STATE_SET "default" 0.0; - target: "block_events"; + } +} + +group { name: "elm/notify/block_events/indicator_norepeatevent"; + inherit: "elm/notify/block_events/popup"; + parts { + part { name: "popup_indicator"; + type: RECT; + scale: 1; + repeat_events: 0; + description { state: "default" 0.0; + fixed: 0 1; + align: 0.5 0.0; + min: 0 LAYOUT_INDICATOR_HEIGHT_INC; + rel2.relative: 1.0 0.0; + color: POPUP_DIM_BG_DEFAULT_COLOR_INC; + } + description { state: "show" 0.0; + inherit: "default" 0.0; + color: POPUP_DIM_BG_COLOR_INC; + } + description { state: "clicked" 0.0; + inherit: "default" 0.0; + color: POPUP_DIM_BG_CLICKED_COLOR_INC; + } } } } @@ -352,6 +297,7 @@ group { name: "elm/notify/block_events/transparent"; alias: "elm/notify/block_events/volumebarstyle_transparent"; alias: "elm/notify/block_events/volumebarstyle_text_transparent"; alias: "elm/notify/block_events/content_expand_transparent"; + alias: "elm/notify/block_events/content_no_vhpad_transparent"; parts { part {name: "popup_indicator"; type: RECT; @@ -378,6 +324,24 @@ group { name: "elm/notify/block_events/transparent"; } } +group { name: "elm/notify/block_events/indicator_norepeatevent_transparent"; + inherit: "elm/notify/block_events/transparent"; + parts { + part {name: "popup_indicator"; + type: RECT; + scale: 1; + repeat_events: 0; + description { state: "default" 0.0; + fixed: 0 1; + align: 0.5 0.0; + min: 0 LAYOUT_INDICATOR_HEIGHT_INC; + rel2.relative: 1.0 0.0; + color: POPUP_DIM_BG_TRANS_COLOR_INC; + } + } + } +} + group { name: "elm/notify/block_events/dimrect"; inherit: "elm/notify/block_events/transparent"; parts { @@ -392,6 +356,10 @@ group { name: "elm/notify/block_events/dimrect"; rel2.relative: 1.0 0.0; color: POPUP_DIM_BG_COLOR_INC; } + description { state: "clicked" 0.0; + inherit: "default" 0.0; + color: POPUP_DIM_BG_CLICKED_COLOR_INC; + } } part { name: "block_events"; type: RECT; @@ -402,6 +370,10 @@ group { name: "elm/notify/block_events/dimrect"; } color: POPUP_DIM_BG_COLOR_INC; } + description { state: "clicked" 0.0; + inherit: "default" 0.0; + color: POPUP_DIM_BG_CLICKED_COLOR_INC; + } } } } @@ -424,11 +396,10 @@ group { name: "elm/label/base/popup/default"; mouse_events: 0; scale: 1; description { state: "default" 0.0; - min: POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC; - max: POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC; + fixed: 1 0; text { style: "popup_desc_style"; - min: 0 0; + min: 0 1; } } } @@ -437,18 +408,19 @@ group { name: "elm/label/base/popup/default"; group { name: "elm/popup/base/default"; alias: "elm/popup/base/transparent"; - alias: "elm/popup/base/verticalbuttonstyle"; - alias: "elm/popup/base/verticalbuttonstyle_transparent"; alias: "elm/popup/base/customstyle"; alias: "elm/popup/base/customstyle_transparent"; alias: "elm/popup/base/liststyle"; alias: "elm/popup/base/menustyle"; + alias: "elm/popup/base/indicator_norepeatevent"; images { image: "00_popup_bg.png" COMP; + image: "00_popup_button_bg.png" COMP; + image: "00_popup_title_bg.png" COMP; } styles { style { name: "popup_title_style"; - base: "font=Tizen:style=Medium align=left font_size="POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC" color="POPUP_DEFAULT_TITLE_TEXT_COLOR_INC" style="POPUP_DEFAULT_TITLE_TEXT_SHADOW_STYLE" shadow_color="POPUP_DEFAULT_TITLE_TEXT_SHADOW_COLOR" wrap=mixed ellipsis=1.0 text_class=tizen"; + base: "font=Tizen:style=Bold align=left font_size="POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC" color="POPUP_DEFAULT_TITLE_TEXT_COLOR_INC" style="POPUP_DEFAULT_TITLE_TEXT_SHADOW_STYLE" shadow_color="POPUP_DEFAULT_TITLE_TEXT_SHADOW_COLOR" wrap=mixed ellipsis=1.0 text_class=tizen"; tag: "br" "\n"; tag: "tab" "\t"; } @@ -487,7 +459,6 @@ group { name: "elm/popup/base/default"; border_scale: 1; } fill.smooth: 0; - align: 0.5 0.5; } description { state: "landscape" 0.0; inherit: "default" 0.0; @@ -496,24 +467,32 @@ group { name: "elm/popup/base/default"; } } part { name: "elm.bg.title"; - type: SPACER; scale: 1; description { state: "default" 0.0; min: POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC; max: POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC; fixed: 1 1; + visible: 0; align: 0.5 0.0; + image { + normal: "00_popup_title_bg.png"; + border: POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC; + border_scale: 1; + } rel1 { - relative: 0.5 1.0; - to_y: "shadow_left_top_padding"; + relative: 1.0 1.0; + to: "shadow_left_top_padding"; } rel2 { - relative: 0.5 1.0; + relative: 0.0 1.0; + to_x: "shadow_right_bottom_padding"; to_y: "shadow_left_top_padding"; } + fill.smooth: 0; } description { state: "visible" 0.0; inherit: "default" 0.0; + visible: 1; } description { state: "landscape" 0.0; inherit: "default" 0.0; @@ -522,6 +501,7 @@ group { name: "elm/popup/base/default"; } description { state: "landscape_visible" 0.0; inherit: "landscape" 0.0; + visible: 1; } } part { name: "action_top_padding"; @@ -585,8 +565,8 @@ group { name: "elm/popup/base/default"; align: 0.0 0.0; rel1.to: "elm.bg.title"; fixed: 1 1; - min: 0 POPUP_TITLE_TOP_PADDING; - max: 0 POPUP_TITLE_TOP_PADDING; + min: POPUP_TITLE_LEFT_PADDING POPUP_TITLE_TOP_PADDING; + max: POPUP_TITLE_LEFT_PADDING POPUP_TITLE_TOP_PADDING; } } part { name: "title_right_bottom_padding"; @@ -596,8 +576,8 @@ group { name: "elm/popup/base/default"; align: 1.0 1.0; rel2.to: "elm.bg.title"; fixed: 1 1; - min: 0 POPUP_TITLE_BOTTOM_PADDING; - max: 0 POPUP_TITLE_BOTTOM_PADDING; + min: POPUP_TITLE_RIGHT_PADDING POPUP_TITLE_BOTTOM_PADDING; + max: POPUP_TITLE_RIGHT_PADDING POPUP_TITLE_BOTTOM_PADDING; } } part { name: "icon_rect"; @@ -662,7 +642,7 @@ group { name: "elm/popup/base/default"; size_range: POPUP_BASE_DEFAULT_TEXT_MIN_FONT_SIZE_INC POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC; fit: 1 0; min: 0 1; - align: 0.0 0.0; + align: 0.0 0.5; } rel1 { relative: 1.0 0.0; @@ -679,17 +659,8 @@ group { name: "elm/popup/base/default"; type: RECT; repeat_events: 1; description { state: "default" 0.0; - fixed: 1 1; - rel1 { - relative: 1.0 0.0; - to_x: "shadow_left_top_padding"; - to_y: "elm.bg.title"; - } - rel2 { - relative: 0.0 1.0; - to_x: "shadow_right_bottom_padding"; - to_y: "elm.bg.title"; - } + rel1.to: "elm.bg.title"; + rel2.to: "elm.bg.title"; color: 0 0 0 0; } } @@ -698,7 +669,7 @@ group { name: "elm/popup/base/default"; scale: 1; description { state: "default" 0.0; min: POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC; - max: POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC; + max: POPUP_BASE_DEFAULT_CONTENT_LANDSCAPE_MIN_MAX_INC; fixed: 1 0; rel1 { relative: 0.0 1.0; @@ -779,33 +750,53 @@ group { name: "elm/popup/base/default"; color: 0 0 0 0; } } - part { name: "access.base"; - type: RECT; - repeat_events: 1; + part { name: "left_part"; + type: SPACER; + scale: 1; description { state: "default" 0.0; - fixed: 1 1; + min: POPUP_DESC_LEFT_PADDING 0; + fixed: 1 0; + align: 0.0 0.0; rel1.to: "base"; - rel2.to: "base"; - color: 0 0 0 0; + rel2 { + to: "base"; + relative: 0.0 1.0; + } } } - part { name: "elm.swallow.action_area"; - type: SWALLOW;; + part { name: "right_part"; + type: SPACER; scale: 1; description { state: "default" 0.0; + min: POPUP_DESC_RIGHT_PADDING 0; + fixed: 1 0; + align: 1.0 1.0; + rel1 { + relative: 1.0 0.0; + to: "base"; + } + rel2.to: "base"; + } + } + part { name: "elm.bg.action_area"; + scale : 1; + description { state: "default" 0.0; min: POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC; - fixed: 1 1; + fixed : 0 1; align: 0.5 1.0; visible: 0; + image { + normal: "00_popup_button_bg.png"; + border: POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC; + border_scale: 1; + } rel1 { - relative: 0.0 0.0; - to_x: "base"; - to_y: "shadow_right_bottom_padding"; + relative: 1.0 1.0; + to: "left_part"; } rel2 { - relative: 1.0 0.0; - to_x: "base"; - to_y: "shadow_right_bottom_padding"; + relative: 0.0 1.0; + to: "right_part"; } } description { state: "visible" 0.0; @@ -813,9 +804,19 @@ group { name: "elm/popup/base/default"; visible: 1; } } + part { name: "elm.swallow.action_area"; + type: SWALLOW; + scale : 1; + description { state: "default" 0.0; + fixed: 0 1; + align: 0.0 0.0; + rel1.to: "elm.bg.action_area"; + rel2.to: "elm.bg.action_area"; + } + } } programs { - program { name: show_title_icon; + program { name: show_title_icon; signal: "elm,state,title,icon,visible"; source: "elm"; action: STATE_SET "visible" 0.0; @@ -877,7 +878,7 @@ group { name: "elm/popup/base/default"; set_state(PART:"elm.swallow.content", "show_action_title_area", 0.0); else set_state(PART:"elm.swallow.content", "show_action_area", 0.0); - set_state(PART:"elm.swallow.action_area", "visible", 0.0); + set_state(PART:"elm.bg.action_area", "visible", 0.0); } } program { name: hide_action_area; @@ -892,15 +893,22 @@ group { name: "elm/popup/base/default"; set_state(PART:"elm.swallow.content", "show_title_area", 0.0); else set_state(PART:"elm.swallow.content", "default", 0.0); - set_state(PART:"elm.swallow.action_area", "default", 0.0); + set_state(PART:"elm.bg.action_area", "default", 0.0); } } program { name: "change_to_landscape"; signal: "elm,state,landscape"; source: "elm"; - action: STATE_SET "landscape" 0.0; - target: "base"; - target: "elm.bg.title"; + script { + new st[31]; + new Float:vl; + set_state(PART:"base", "landscape", 0.0); + get_state(PART:"elm.bg.title", st, 30, vl); + if ((!strcmp(st, "visible")) || (!strcmp(st, "landscape_visible"))) + set_state(PART:"elm.bg.title", "landscape_visible", 0.0); + else + set_state(PART:"elm.bg.title", "landscape", 0.0); + } after: "orientation_change"; } program { name: "orientation_change"; @@ -909,9 +917,16 @@ group { name: "elm/popup/base/default"; program { name: "change_to_portrait"; signal: "elm,state,portrait"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "base"; - target: "elm.bg.title"; + script { + new st[31]; + new Float:vl; + set_state(PART:"base", "default", 0.0); + get_state(PART:"elm.bg.title", st, 30, vl); + if ((!strcmp(st, "visible")) || (!strcmp(st, "landscape_visible"))) + set_state(PART:"elm.bg.title", "visible", 0.0); + else + set_state(PART:"elm.bg.title", "default", 0.0); + } after: "orientation_change"; } program { name: "landscape_mode"; @@ -937,9 +952,37 @@ group { name: "elm/popup/base/default"; } /* end of programs */ } +group { name: "elm/popup/base/verticalbuttonstyle"; + alias: "elm/popup/base/verticalbuttonstyle_transparent"; + inherit: "elm/popup/base/default"; + parts { + part { name: "elm.swallow.action_area"; + type: SWALLOW; + scale : 1; + description { state: "default" 0.0; + align: 0.5 1.0; + fixed: 0 1; + min: POPUP_BASE_VERTICAL_BUTTON_BUTTONAREA_DEFAULT_MIN_INC; + rel1 { + relative: 1.0 0.0; + to_x: "left_part"; + to_y: "shadow_right_bottom_padding"; + } + rel2 { + relative: 0.0 0.0; + to_x: "right_part"; + to_y: "shadow_right_bottom_padding"; + } + } + } + } +} + + group { name: "elm/popup/base/content_no_vhpad"; inherit: "elm/popup/base/default"; alias: "elm/popup/base/min_menustyle"; + alias: "elm/popup/base/content_no_vhpad_transparent"; parts { part { name: "label_top_padding"; type: SPACER; @@ -984,6 +1027,7 @@ group { name: "elm/popup/content/default"; alias: "elm/popup/content/transparent"; alias: "elm/popup/content/customstyle"; alias: "elm/popup/content/customstyle_transparent"; + alias: "elm/popup/content/indicator_norepeatevent"; parts{ part { name: "pad_t"; type: SPACER; @@ -1064,6 +1108,7 @@ group { name: "elm/popup/content/default"; group { name: "elm/popup/content/content_no_vhpad"; inherit: "elm/popup/content/default"; alias: "elm/popup/content/min_menustyle"; + alias: "elm/popup/content/content_no_vhpad_transparent"; parts { part { name: "pad_t"; type: SPACER; @@ -1071,8 +1116,8 @@ group { name: "elm/popup/content/content_no_vhpad"; mouse_events: 0; description { state: "default" 0.0; align: 0.5 0.0; - min: 0 POPUP_ACTION_DESC_TOP_PADDING; - max: 0 POPUP_ACTION_DESC_TOP_PADDING; + min: 0 0; + max: 0 0; fixed: 0 1; rel1 { relative: 1.0 0.0; @@ -1111,8 +1156,8 @@ group { name: "elm/popup/content/content_no_vhpad"; scale: 1; description { state: "default" 0.0; align: 0.5 1.0; - min: 0 POPUP_ACTION_DESC_TOP_PADDING; - max: 0 POPUP_ACTION_DESC_TOP_PADDING; + min: 0 0; + max: 0 0; fixed: 0 1; rel1 { relative: 0.0 1.0; @@ -1121,6 +1166,23 @@ group { name: "elm/popup/content/content_no_vhpad"; rel2.to_x: "pad_r"; } } + part { name:"elm.swallow.content"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + fixed: 1 0; + rel1 { + relative: 1.0 1.0; + to_x: "pad_l"; + to_y: "pad_t"; + } + rel2 { + relative: 0.0 0.0; + to_x: "pad_r"; + to_y: "pad_b"; + } + } + } } } @@ -1475,7 +1537,7 @@ group { name: "elm/label/base/popup/verticalbuttonstyle"; styles { style { name: "popup_desc_style_center"; - base: "font=Tizen:style=Medium font_size="POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC" align=center color="POPUP_DEFAULT_DESCRIPTION_TEXT_COLOR_INC" text_class=tizen"; + base: "font=Tizen:style=Regular font_size="POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC" align=center color="POPUP_DEFAULT_DESCRIPTION_TEXT_COLOR_INC" text_class=tizen"; tag: "br" "\n"; tag: "ps" "ps"; tag: "whitecolor" "+ color=#ffffff"; @@ -1498,29 +1560,28 @@ group { name: "elm/label/base/popup/verticalbuttonstyle"; } } - group { name: "elm/popup/buttons3/verticalbuttonstyle"; alias: "elm/popup/buttons3/verticalbuttonstyle_transparent"; - data.item: "action_area_height" POPUP_BUTTON_VERTICAL_ACTION_AREA_HEIGHT; + data.item: "action_area_height" POPUP_BUTTON3_VERTICAL_ACTION_AREA_HEIGHT; parts { part { name: "bg"; - type: SPACER; - scale: 1; + scale : 1; description { state: "default" 0.0; - min: POPUP_BASE_VERTICAL_BUTTON_BUTTONAREA_DEFAULT_MIN_INC; - fixed: 1 0; + align: 0.5 0.0; + image { + normal: "00_popup_button_bg.png"; + border: POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC; + border_scale: 1; + } } } part { name: "elm.rect.pad_btn_top"; type: SPACER; - scale: 1; + scale : 1; description { state: "default" 0.0; min: POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_TOP_MIN_INC; fixed: 0 1; align: 0.0 0.0; - rel1 { - relative: 0.0 0.0; - } rel2 { relative: 1.0 0.0; } @@ -1535,7 +1596,8 @@ group { name: "elm/popup/buttons3/verticalbuttonstyle"; fixed: 1 1; align: 0.5 0.0; rel1 { - relative: 0.0 1.0; to_y: "elm.rect.pad_btn_top"; + relative: 0.0 1.0; + to_y: "elm.rect.pad_btn_top"; } } } @@ -1548,10 +1610,12 @@ group { name: "elm/popup/buttons3/verticalbuttonstyle"; fixed: 1 1; align: 0.5 0.0; rel1 { - relative: 0.0 1.0; to: "actionbtn1"; + relative: 0.0 1.0; + to: "actionbtn1"; } rel2 { - relative: 1.0 1.0; to: "actionbtn1"; + relative: 1.0 1.0; + to: "actionbtn1"; } } } @@ -1563,7 +1627,9 @@ group { name: "elm/popup/buttons3/verticalbuttonstyle"; max: POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC; fixed: 1 1; align: 0.5 0.0; - rel1 { relative: 0 1.0; to_y: "elm.rect.pad_btn"; } + rel1 { relative: 0 1.0; + to_y: "elm.rect.pad_btn"; + } } } part { name: "elm.rect.pad_btn2"; @@ -1575,10 +1641,12 @@ group { name: "elm/popup/buttons3/verticalbuttonstyle"; fixed: 1 1; align: 0.5 0.0; rel1 { - relative: 0.0 1.0; to: "actionbtn2"; + relative: 0.0 1.0; + to: "actionbtn2"; } rel2 { - relative: 1.0 1.0; to: "actionbtn2"; + relative: 1.0 1.0; + to: "actionbtn2"; } } } @@ -1675,6 +1743,7 @@ group { name: "elm/popup/content/min_menustyle"; scale: 1; description { state: "default" 0.0; min: POPUP_CONTENT_MINSTYLE_CONTENT_DEFAULT_MIN_INC; + max: POPUP_CONTENT_MINSTYLE_CONTENT_DEFAULT_MIN_INC; align: 0.5 0.5; fixed: 1 0; rel1 { @@ -1772,6 +1841,7 @@ group { name: "elm/popup/content/min_liststyle"; scale: 1; description { state: "default" 0.0; min: POPUP_CONTENT_MINSTYLE_CONTENT_DEFAULT_MIN_INC; + max: POPUP_CONTENT_MINSTYLE_CONTENT_DEFAULT_MIN_INC; align: 0.5 0.5; fixed: 1 0; rel1 { @@ -2145,56 +2215,66 @@ group { name: "elm/popup/base/content_expand"; alias: "elm/popup/base/content_expand_transparent"; images { image: "00_popup_bg.png" COMP; + image: "00_popup_button_bg.png" COMP; + image: "00_popup_title_bg.png" COMP; } parts { - part { - name: "shadow_right_bottom_padding"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: POPUP_DESC_RIGHT_PADDING POPUP_DESC_BOTTOM_PADDING; - max: POPUP_DESC_RIGHT_PADDING POPUP_DESC_BOTTOM_PADDING; - align: 1.0 1.0; - fixed: 1 1; - } - } part { name: "base"; - type: IMAGE; - scale: 1; + scale : 1; description { state: "default" 0.0; rel1.to_x: "elm.swallow.content"; - rel2.to_x: "elm.bg.action_area"; + rel2.to_x: "elm.swallow.content"; image { normal: "00_popup_bg.png"; border: POPUP_BASE_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC; border_scale: 1; } - fill.smooth: 0; align: 0.0 0.0; } } - part { name: "access.base"; - type: RECT; + part { + name:"shadow_left_top_padding"; + type: SPACER; + scale: 1; description { state: "default" 0.0; + min: POPUP_DESC_LEFT_PADDING POPUP_DESC_TOP_PADDING; + max: POPUP_DESC_LEFT_PADDING POPUP_DESC_TOP_PADDING; + align: 0 0; fixed: 1 1; - rel1.to: "base"; - rel2.to: "base"; - color: 0 0 0 0; } } - part { name: "elm.bg.title"; - type: RECT; + part { + name:"shadow_right_bottom_padding"; + type: SPACER; scale: 1; description { state: "default" 0.0; + min: POPUP_DESC_RIGHT_PADDING POPUP_DESC_BOTTOM_PADDING; + max: POPUP_DESC_RIGHT_PADDING POPUP_DESC_BOTTOM_PADDING; + align: 1 1; + fixed: 1 1; + } + } + part { name: "elm.bg.title"; + scale : 1; + description { state: "default" 0.0; min: POPUP_BASE_CONTENT_EXPAND_TITLE_DEFAULT_MIN_INC; - fixed: 0 1; + fixed : 0 1; align: 0.5 0.0; visible: 0; - color: 0 0 0 0; - rel1.to_x: "base"; - rel2 { + image { + normal: "00_popup_title_bg.png"; + border: POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC; + border_scale: 1; + } + rel1 { relative: 1.0 0.0; - to_x: "base"; + to_x: "shadow_left_top_padding"; + to_y: "base"; + } + rel2 { + relative: 0.0 0.0; + to_x: "shadow_right_bottom_padding"; + to_y: "base"; } } description { state: "visible" 0.0; @@ -2234,7 +2314,7 @@ group { name: "elm/popup/base/content_expand"; align: 0.0 0.5; rel1 { to: "left_pad"; - relative: 1.0 0.0; + relative: 1.0 1.0; } rel2 { to: "right_pad"; @@ -2257,17 +2337,18 @@ group { name: "elm/popup/base/content_expand"; size_range: POPUP_BASE_DEFAULT_TEXT_MIN_FONT_SIZE_INC POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC; fit: 1 0; min: 0 1; - align: 0.0 0.0; + align: 0.0 0.5; } visible: 0; rel1 { - relative: 1.0 1.0; to: "left_pad"; + relative: 1.0 1.0; } rel2 { - relative: 0.0 1.0; to: "right_pad"; + relative: 0.0 1.0; } + align: 0.0 0.5; } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -2310,22 +2391,27 @@ group { name: "elm/popup/base/content_expand"; } } part { name: "elm.bg.action_area"; - type: RECT; scale: 1; description { state: "default" 0.0; min: POPUP_BASE_CONTENT_EXPAND_BG_DEFAULT_MIN_INC; - fixed: 0 1; + fixed : 0 1; align: 0.5 1.0; visible: 0; + image { + normal: "00_popup_button_bg.png"; + border: POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC; + border_scale: 1; + } rel1 { - relative: 0.0 0.0; - to_y: "shadow_right_bottom_padding"; + relative: 1.0 1.0; + to_x: "shadow_left_top_padding"; + to_y: "base"; } rel2 { - relative: 1.0 0.0; - to_y: "shadow_right_bottom_padding"; + relative: 0.0 1.0; + to_x: "shadow_right_bottom_padding"; + to_y: "base"; } - color: 0 0 0 0; } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -2334,7 +2420,7 @@ group { name: "elm/popup/base/content_expand"; } part { name: "elm.swallow.action_area"; type: SWALLOW; - scale: 1; + scale : 1; description { state: "default" 0.0; rel1.to: "elm.bg.action_area"; rel2.to: "elm.bg.action_area";