diff options
Diffstat (limited to 'mobile/widgets_default')
-rw-r--r-- | mobile/widgets_default/border.edc | 2 | ||||
-rw-r--r-- | mobile/widgets_default/button.edc | 2 | ||||
-rw-r--r-- | mobile/widgets_default/ews.edc | 4 | ||||
-rw-r--r-- | mobile/widgets_default/genlist.edc | 24 | ||||
-rw-r--r-- | mobile/widgets_default/hover.edc | 42 | ||||
-rw-r--r-- | mobile/widgets_default/layout.edc | 25 | ||||
-rw-r--r-- | mobile/widgets_default/menu.edc | 4 | ||||
-rw-r--r-- | mobile/widgets_default/progressbar.edc | 2 |
8 files changed, 42 insertions, 63 deletions
diff --git a/mobile/widgets_default/border.edc b/mobile/widgets_default/border.edc index a21aa9b3..82587016 100644 --- a/mobile/widgets_default/border.edc +++ b/mobile/widgets_default/border.edc @@ -255,7 +255,6 @@ group { action: STATE_SET "focused" 0.0; transition: LINEAR 0.2; target: "elm.text.title"; - target: "base"; } program { name: "focus_out"; @@ -264,7 +263,6 @@ group { action: STATE_SET "default" 0.0; transition: LINEAR 0.2; target: "elm.text.title"; - target: "base"; } program { name: "move_start"; diff --git a/mobile/widgets_default/button.edc b/mobile/widgets_default/button.edc index 6fe3d24c..8d1f70c2 100644 --- a/mobile/widgets_default/button.edc +++ b/mobile/widgets_default/button.edc @@ -196,7 +196,6 @@ group { name: "elm/button/base/anchor"; source: "over"; action: STATE_SET "visible" 0.0; target: "button_image"; - target: "elm.text"; } program { name: "button_mouse_out"; signal: "mouse,out"; @@ -210,7 +209,6 @@ group { name: "elm/button/base/anchor"; source: "over"; action: STATE_SET "visible" 0.0; target: "button_image"; - target: "elm.text"; } program { name: "button_click2"; signal: "mouse,down,1"; diff --git a/mobile/widgets_default/ews.edc b/mobile/widgets_default/ews.edc index b00e3770..14cb720b 100644 --- a/mobile/widgets_default/ews.edc +++ b/mobile/widgets_default/ews.edc @@ -53,7 +53,7 @@ group { name: "elm/ews/decoration/borderless"; } program { signal: "elm,state,alpha,off"; source: "elm"; - action: STATE_SET "visible" 0.0; + action: STATE_SET "default"; target: "shadow"; } } @@ -415,7 +415,7 @@ group { name: "elm/ews/decoration/default"; } program { signal: "elm,state,alpha,off"; source: "elm"; - action: STATE_SET "visible" 0.0; + action: STATE_SET "default"; target: "shadow"; } } diff --git a/mobile/widgets_default/genlist.edc b/mobile/widgets_default/genlist.edc index a394caa9..634e70c8 100644 --- a/mobile/widgets_default/genlist.edc +++ b/mobile/widgets_default/genlist.edc @@ -120,6 +120,9 @@ group { name: "elm/genlist/item/default/default"; inherit: "default" 0.0; text.style: "list_text_main_dim"; } + desc { "reorder"; + inherit: "default"; + } ) PART(RECT, "elm.bottomline", DSC_FROM_B("default" 0.0, @@ -298,6 +301,9 @@ group { name: "elm/genlist/item/double_label/default"; inherit: "default" 0.0; text.style: "list_text_main_dim"; } + desc { "reorder"; + inherit: "default"; + } ) PART(TEXTBLOCK, "elm.text.sub", DSC_LRTB("default" 0.0, @@ -315,6 +321,9 @@ group { name: "elm/genlist/item/double_label/default"; inherit: "default" 0.0; text.style: "list_text_sub_01_dim"; } + desc { "reorder"; + inherit: "default"; + } ) PART(RECT, "elm.bottomline", DSC_FROM_B("default" 0.0, @@ -424,6 +433,9 @@ group { name: "elm/genlist/item/one_icon/default"; inherit: "default" 0.0; text.style: "list_text_main_dim"; } + desc { "reorder"; + inherit: "default"; + } ) PART(RECT, "elm.bottomline", DSC_FROM_B("default" 0.0, @@ -501,6 +513,9 @@ group { name: "elm/genlist/item/end_icon/default"; inherit: "default" 0.0; text.style: "list_text_main_dim"; } + desc { "reorder"; + inherit: "default"; + } ) PART(RECT, "elm.bottomline", DSC_FROM_B("default" 0.0, @@ -565,6 +580,9 @@ group { name: "elm/genlist/item/message/default"; inherit: "default" 0.0; text.style: "list_text_main_dim"; } + desc { "reorder"; + inherit: "default"; + } ) PART(TEXTBLOCK, "elm.title.1", DSC_LRT("default" 0.0, @@ -582,6 +600,9 @@ group { name: "elm/genlist/item/message/default"; inherit: "default" 0.0; text.style: "list_text_main_dim"; } + desc { "reorder"; + inherit: "default"; + } ) PART(TEXTBLOCK, "elm.title.2", DSC_LRTB("default" 0.0, @@ -599,6 +620,9 @@ group { name: "elm/genlist/item/message/default"; inherit: "default" 0.0; text.style: "list_text_main_dim"; } + desc { "reorder"; + inherit: "default"; + } ) PART(RECT, "elm.bottomline", DSC_FROM_B("default" 0.0, diff --git a/mobile/widgets_default/hover.edc b/mobile/widgets_default/hover.edc index 5cc87b9a..a28da0f9 100644 --- a/mobile/widgets_default/hover.edc +++ b/mobile/widgets_default/hover.edc @@ -103,7 +103,7 @@ group { name: "elm/hover/base/default"; rel2 { to: "elm.padding.slot.left"; relative: 0.0 1.0; - } + } } } part { name: "elm.swallow.slot.top-left"; @@ -257,15 +257,14 @@ group { name: "elm/hover/base/popout"; type: RECT; scale: 1; mouse_events: 1; - description { state: "default" 0.0; + desc { "default"; color: 0 0 0 0; } - description { state: "visible" 0.0; - inherit: "default" 1.0; + desc { "visible"; + inherit: "default"; color: HOVER_DEFAULT_DIM_COLOR; } } - part { name: "elm.padding.pop.left"; type: SPACER; scale: 1; @@ -280,7 +279,6 @@ group { name: "elm/hover/base/popout"; } } } - part { name: "leftclip"; type: RECT; scale: 1; @@ -764,11 +762,11 @@ group { name: "elm/hover/base/menu"; part { name: "base"; type: RECT; mouse_events: 1; - description { state: "default" 0.0; + desc { "default"; color: HOVER_COLOR_TRANSPARENT; } - description { state: "visible" 0.0; - inherit: "default" 1.0; + desc { "visible"; + inherit: "default"; color: HOVER_DEFAULT_DIM_COLOR; } } @@ -1019,6 +1017,9 @@ group { name: "elm/hover/base/submenu"; color: HOVER_COLOR_TRANSPARENT; visible: 0; } + desc { "visible"; + inherit: "default"; + } } part { name: "elm.swallow.slot.left"; type: SWALLOW; @@ -1178,7 +1179,7 @@ group { name: "elm/hover/base/submenu"; fixed: 1 1; align: 0 0; min: HOVER_MENU_SLOT_MIDDLE_PADDING_LEFT_TOP; - rel1.to: "elm.swallow.size"; + rel1.to: "elm.swallow.size"; rel2 { to: "elm.swallow.size"; relative: 0 0; @@ -1305,7 +1306,7 @@ group { name: "elm/hover/base/hoversel_horizontal/default"; rel1.to: "elm.swallow.slot.left"; rel2 { to: "elm.swallow.slot.left"; - relative: 0 0; + relative: 0 0; } } } @@ -1329,11 +1330,11 @@ group { name: "elm/hover/base/hoversel_horizontal/default"; type: RECT; scale: 1; mouse_events: 1; - description { state: "default" 0.0; + desc { "default"; color: 0 0 0 0; } - description { state: "visible" 0.0; - inherit: "default" 1.0; + desc { "visible"; + inherit: "default"; color: HOVER_DEFAULT_DIM_COLOR; } } @@ -1501,12 +1502,6 @@ group { name: "elm/hover/base/hoversel_horizontal/default"; action: STATE_SET "visible" 0.0; transition: DECELERATE 0.5; target: "edge_left"; - after: "leftshow2"; - } - program { name: "leftshow2"; - action: STATE_SET "visible" 0.0; - transition: DECELERATE 0.5; - target: "elm.swallow.slot.left"; } program { name: "leftshow3"; signal: "elm,action,slot,left,show"; @@ -1534,18 +1529,13 @@ group { name: "elm/hover/base/hoversel_horizontal/default"; source: "elm"; action: STATE_SET "visible" 0.0; target: "edge_right"; - after: "rightshow2"; - } - program { name: "rightshow2"; - action: STATE_SET "visible" 0.0; - target: "elm.swallow.slot.right"; } program { name: "rightshow3"; signal: "elm,action,slot,right,show"; source: "elm"; action: STATE_SET "right" 0.0; target: "button_image"; - } + } program { name: "righthide"; signal: "elm,action,slot,right,hide"; source: "elm"; diff --git a/mobile/widgets_default/layout.edc b/mobile/widgets_default/layout.edc index 15219ebd..4036413a 100644 --- a/mobile/widgets_default/layout.edc +++ b/mobile/widgets_default/layout.edc @@ -923,31 +923,6 @@ group { name: "elm/layout/application/content-back"; source: "back"; action: SIGNAL_EMIT "elm,action,back" ""; } - program { - signal: "elm,back,hide"; - source: "elm"; - action: STATE_SET "hidden" 0.0; - target: "back"; - } - program { - signal: "elm,back,show"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "back"; - } - program { - signal: "elm,title,hide"; - source: "elm"; - action: STATE_SET "hidden" 0.0; - transition: LINEAR 0.1; - target: "elm.text.title"; - } - program { - signal: "elm,title,show"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text.title"; - } } } } diff --git a/mobile/widgets_default/menu.edc b/mobile/widgets_default/menu.edc index 7e07f8c4..c4cb9487 100644 --- a/mobile/widgets_default/menu.edc +++ b/mobile/widgets_default/menu.edc @@ -219,7 +219,6 @@ group { name: "elm/menu/item/default"; source: "elm"; action: STATE_SET "disabled" 0.0; target: "item_image"; - target: "over"; target: "disabler"; after: "disable_text"; } @@ -249,7 +248,6 @@ group { name: "elm/menu/item/default"; source: "elm"; action: STATE_SET "default" 0.0; target: "item_image"; - target: "over"; target: "disabler"; after: "enable_text"; } @@ -539,7 +537,6 @@ group { name: "elm/menu/item_with_submenu/default"; source: "elm"; action: STATE_SET "disabled" 0.0; target: "item_image"; - target: "over"; target: "disabler"; after: "disable_text"; } @@ -559,7 +556,6 @@ group { name: "elm/menu/item_with_submenu/default"; source: "elm"; action: STATE_SET "default" 0.0; target: "item_image"; - target: "over"; target: "disabler"; after: "enable_text"; } diff --git a/mobile/widgets_default/progressbar.edc b/mobile/widgets_default/progressbar.edc index 22586fca..9be59043 100644 --- a/mobile/widgets_default/progressbar.edc +++ b/mobile/widgets_default/progressbar.edc @@ -317,14 +317,12 @@ group { name: "elm/progressbar/vertical/default"; source: "elm"; action: STATE_SET "invert" 0.0; target: "elm.progress.progressbar"; - target: "elm.cur.progressbar"; } program { name: "set_invert_off"; signal: "elm,state,inverted,off"; source: "elm"; action: STATE_SET "default" 0.0; target: "elm.progress.progressbar"; - target: "elm.cur.progressbar"; } } } |