From: shilpa singh Date: Mon, 30 Apr 2012 10:45:17 +0000 (+0530) Subject: [progressbar]: progressbar "pending_list" style optimization. X-Git-Tag: 2.0_alpha~145^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f1378a17c156d71f82f5b3574eafcb079dcc0b6f;p=framework%2Fuifw%2Fefl-theme-tizen.git [progressbar]: progressbar "pending_list" style optimization. --- diff --git a/themes/widgets/progressbar.edc b/themes/widgets/progressbar.edc index 0aee2c0..7d354c6 100644 --- a/themes/widgets/progressbar.edc +++ b/themes/widgets/progressbar.edc @@ -2040,50 +2040,13 @@ } } } + group { name: "elm/progressbar/horizontal/pending_list"; images { image: "00_winset_progress_pending_01.png" COMP; image: "00_winset_progress_pending_02.png" COMP; } parts { - part { name: "elm.padding.left"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - min: 0 0; - fixed: 1 0; - rel1 { - relative: 0.0 0.0; - offset: 0 0; - } - rel2 { - relative: 0.0 1.0; - offset: 0 0; - } - color: 0 0 0 0; - align: 0.0 0.0; - } - } - part { name: "elm.padding.right"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - min: 0 0; - fixed: 1 0; - rel1 { - relative: 1.0 0.0; - offset: 0 0; - } - rel2 { - relative: 1.0 1.0; - offset: 0 0; - } - color: 0 0 0 0; - align: 1.0 0.0; - } - } part { name: "elm.background.progressbar"; type: RECT; mouse_events: 0; @@ -2091,14 +2054,11 @@ description { state: "default" 0.0; rel1 { - to_x: "elm.padding.left"; - relative: 1.0 0.0; + relative: 0.0 0.0; offset: 0 0; } rel2 { - to_x: "elm.padding.right"; - relative: 0.0 1.0; - offset: 0 0; + relative: 1.0 1.0; } } } @@ -2120,80 +2080,6 @@ } } } - part { name: "elm.swallow.content"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; - visible: 0; - align: 0.0 0.5; - rel1 { - offset: 0 0; - to_y: "elm.background.progressbar"; - } - rel2 { - offset: 0 -1; - relative: 0.0 1.0; - to_y: "elm.background.progressbar"; - } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - aspect: 1.0 1.0; - aspect_preference: VERTICAL; - rel2.offset: 4 -1; - } - } - part { name: "elm.text"; - type: TEXT; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - visible: 0; - fixed: 1 1; - align: 0.0 0.5; - rel1.to_x: "elm.swallow.content"; - rel1.relative: 1.0 0.0; - rel1.offset: -1 4; - rel2.to_x: "elm.swallow.content"; - rel2.relative: 1.0 1.0; - rel2.offset: -1 -5; - color: PROGRESSBAR_LIST_PROGRESS_STYLE_TEXT_COLOR_INC; - text { - font: "SLP:style=Roman"; - size: 10; - min: 0 0; - align: 0.0 0.5; - } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 0; - text.min: 1 1; - rel1.offset: 0 4; - rel2.offset: 0 -5; - } - } - part { name: "background"; - mouse_events: 0; - scale: 1; - clip_to: "elm.background.progressbar"; - description { state: "default" 0.0; - rel1 { - to: "elm.swallow.bar"; - relative: 0.0 0.0; - } - rel2 { - to: "elm.swallow.bar"; - relative: 1.0 1.0; - offset: -1 -1; - } - image { - normal: "00_winset_progress_pending_01.png"; - border: 0 0 0 0; - } - } - } part { name: "elm.progress.progressbar"; mouse_events: 0; scale: 1; @@ -2207,8 +2093,8 @@ relative: 0.0 0.0; } rel2 { - to_y: "elm.swallow.bar"; - to_x: "elm.cur.progressbar"; + to: "elm.swallow.bar"; + relative: 1.0 1.0; offset: -1 -1; } image { @@ -2217,103 +2103,23 @@ } } description { - state: "invert" 0.0; - inherit: "default" 0.0; - rel1 { - to_y: "elm.swallow.bar"; - to_x: "elm.cur.progressbar"; - } - rel2 { - to: "elm.swallow.bar"; - relative: 1.0 1.0; - } - } - description { state: "state_begin" 0.0; inherit: "default" 0.0; - rel1 { - to: "elm.swallow.bar"; - relative: 0.0 0.0; - } - rel2 { - to: "elm.swallow.bar"; - relative: 1.0 1.0; - } } description { state: "state_end" 0.0; inherit: "default" 0.0; - rel1 { - to: "elm.swallow.bar"; - relative: 0.0 0.0; - } - rel2 { - to: "elm.swallow.bar"; - relative: 1.0 1.0; - } image { normal: "00_winset_progress_pending_02.png"; border: 0 0 0 0; } } } - part { name: "elm.cur.progressbar"; - mouse_events: 0; - scale: 1; - dragable { - confine: "background"; - x: 1 1 1; - y: 0 0 0; - } - description { state: "default" 0.0; - min: 0 28; - fixed: 1 1; - visible: 0; - rel1 { - to: "background"; - relative: 0 0; - } - rel2.to: "background"; - } - } - part { name: "progress-rect"; - mouse_events: 0; - scale: 1; - description { - state: "default" 0.0; - rel1.to: "elm.progress.progressbar"; - rel2.to: "elm.progress.progressbar"; - } - } } programs { - program { name: "label_show"; - signal: "elm,state,text,visible"; - source: "elm"; - action: STATE_SET "visible" 0.0; - target: "elm.text"; - } - program { name: "label_hide"; - signal: "elm,state,text,hidden"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text"; - } - program { name: "icon_show"; - signal: "elm,state,icon,visible"; - source: "elm"; - action: STATE_SET "visible" 0.0; - target: "elm.swallow.content"; - } - program { name: "icon_hide"; - signal: "elm,state,icon,hidden"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.swallow.content"; - } program { name: "slide_to_end"; action: STATE_SET "state_end" 0.0; - transition: LINEAR 0.3; + in: 0.3 0.0; target: "elm.progress.progressbar"; after: "slide_to_begin"; } @@ -2321,7 +2127,7 @@ signal: "elm,state,slide,begin"; action: STATE_SET "state_begin" 0.0; target: "elm.progress.progressbar"; - transition: LINEAR 0.3; + in: 0.3 0.0; after: "slide_to_end"; } program { name: "start_pulse"; @@ -2336,38 +2142,15 @@ target: "slide_to_begin"; target: "slide_to_end"; target: "start_pulse"; - after: "state_pulse"; - } - program { name: "state_pulse"; - signal: "elm,state,pulse"; - source: "elm"; - action: STATE_SET "state_begin" 0.0; - target: "elm.progress.progressbar"; + after: "init_pulse"; } - program { name: "state_fraction"; - signal: "elm,state,fraction"; - source: "elm"; - action: ACTION_STOP; - target: "slide_to_begin"; - target: "slide_to_end"; - target: "start_pulse"; + program { name: "init_pulse"; action: STATE_SET "default" 0.0; target: "elm.progress.progressbar"; } - program { name: "set_invert_on"; - signal: "elm,state,inverted,on"; - source: "elm"; - action: STATE_SET "invert" 0.0; - target: "elm.progress.progressbar"; - } - program { name: "set_invert_off"; - signal: "elm,state,inverted,off"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.progress.progressbar"; - } } } + group { name: "elm/progressbar/horizontal/UIProgressViewStyleDefault"; images { image: "progress_slider_bg01.9.png" COMP;