diff options
author | Hermet Park <hermetpark@gmail.com> | 2019-02-07 15:31:34 +0900 |
---|---|---|
committer | Hermet Park <hermetpark@gmail.com> | 2019-02-07 15:33:31 +0900 |
commit | 404ebad94bdefd519d1bfccdec6b7e95b590dd1e (patch) | |
tree | 4d3b10ad00ccad11f3c9ddea650f4e3bb837b119 | |
parent | 75da895fb1cda118b0f6863ae06aeada7b37de95 (diff) | |
download | efl-theme-tizen-mobile-404ebad94bdefd519d1bfccdec6b7e95b590dd1e.tar.gz efl-theme-tizen-mobile-404ebad94bdefd519d1bfccdec6b7e95b590dd1e.tar.bz2 efl-theme-tizen-mobile-404ebad94bdefd519d1bfccdec6b7e95b590dd1e.zip |
fix wrong edc usage.submit/tizen/20190213.062652submit/tizen/20190213.060634submit/tizen/20190213.001307submit/tizen/20190211.061543accepted/tizen/unified/20190214.060620
There are invalid part, state, etc references.
They are catched by edje_cc, removed abnormal usages all.
Change-Id: Ic0bf7b1ac12a5f2d425fe06011643533e29340b7
-rw-r--r-- | mobile/widgets/ctxpopup.edc | 5 | ||||
-rw-r--r-- | mobile/widgets/focus_highlight.edc | 4 | ||||
-rw-r--r-- | mobile/widgets/hover.edc | 6 | ||||
-rw-r--r-- | mobile/widgets/list.edc | 1 | ||||
-rw-r--r-- | mobile/widgets/popup.edc | 12 | ||||
-rw-r--r-- | mobile/widgets/scroller.edc | 10 | ||||
-rw-r--r-- | mobile/widgets/slider.edc | 2 | ||||
-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 |
15 files changed, 66 insertions, 79 deletions
diff --git a/mobile/widgets/ctxpopup.edc b/mobile/widgets/ctxpopup.edc index 536b8df2..a9f1d698 100644 --- a/mobile/widgets/ctxpopup.edc +++ b/mobile/widgets/ctxpopup.edc @@ -1170,7 +1170,6 @@ group { "elm/ctxpopup/layout/dropdown/list"; program { "on_hide_down"; action: STATE_SET "show_down"; target: "swallow"; - target: "padding_bottom"; transition: SIN_FAC 0.5 1.7; after: "be_default"; } @@ -1238,7 +1237,7 @@ group { "elm/ctxpopup/bg/default"; desc { "default"; } } - image { "bg"; + rect { "bg"; desc { "default"; rel.to: "base"; color: 0 0 0 0; @@ -1295,7 +1294,7 @@ group { "elm/ctxpopup/bg/copypaste"; desc { "default"; } } - image { "bg"; + rect { "bg"; desc { "default"; rel.to: "base"; color: 0 0 0 0; diff --git a/mobile/widgets/focus_highlight.edc b/mobile/widgets/focus_highlight.edc index 3f73491f..78a96482 100644 --- a/mobile/widgets/focus_highlight.edc +++ b/mobile/widgets/focus_highlight.edc @@ -15,7 +15,7 @@ group { name: "elm/focus_highlight/top/default"; visible: 0; } } - part { name: "padding_top_left"; + spacer { "padding_top_left"; scale: 1; description { state: "default" 0.0; rel.to: "base"; @@ -25,7 +25,7 @@ group { name: "elm/focus_highlight/top/default"; fixed: 1 1; } } - part { name: "padding_bottom_right"; + spacer { "padding_bottom_right"; scale: 1; description { state: "default" 0.0; rel.to: "base"; diff --git a/mobile/widgets/hover.edc b/mobile/widgets/hover.edc index 51f09dbe..a15ece9b 100644 --- a/mobile/widgets/hover.edc +++ b/mobile/widgets/hover.edc @@ -296,7 +296,8 @@ group { name: "elm/hover/base/default"; group { name: "bg_top_real"; parts { - image { scale; + image { "content"; + scale; desc { "default"; image.normal: "core_dropdown_label_bg.#"; rel2.offset: -1 -2; @@ -308,7 +309,8 @@ group { name: "bg_top_real"; group { name: "border_top_real"; parts { - image { scale; + image { "content"; + scale; desc { "default"; image.normal: "core_dropdown_label_bg_stroke.#"; color_class: "hoversel/default/bg_popup_border"; diff --git a/mobile/widgets/list.edc b/mobile/widgets/list.edc index edcfec74..dac609c9 100644 --- a/mobile/widgets/list.edc +++ b/mobile/widgets/list.edc @@ -195,7 +195,6 @@ group { name: "elm/list/item/default"; target: "bg"; ) LIST_PROGRAM_REORDER( - target: "elm.text"; target: "bg"; ) program { name: "play_sound"; diff --git a/mobile/widgets/popup.edc b/mobile/widgets/popup.edc index 0340ba0e..bfcab460 100644 --- a/mobile/widgets/popup.edc +++ b/mobile/widgets/popup.edc @@ -84,7 +84,7 @@ group { "elm/notify/block_events/event/default"; inherit_only: 1; parts { - image { "event"; + rect { "event"; mouse; desc { "default"; color: 0 0 0 0; @@ -973,8 +973,11 @@ group { "elm/notify/block_events/popup/default"; color: 255 255 255 255; } } - image { "event"; + rect { "event"; after: "clipper_block_events_color"; + desc { "default"; + color: 0 0 0 0; + } } } @@ -1051,8 +1054,11 @@ group { "elm/notify/block_events/popup/transparent"; color: 0 0 0 0; } } - image { "event"; + rect { "event"; after: "block_events"; + desc { "default"; + color: 0 0 0 0; + } } } diff --git a/mobile/widgets/scroller.edc b/mobile/widgets/scroller.edc index 73526135..1d88a856 100644 --- a/mobile/widgets/scroller.edc +++ b/mobile/widgets/scroller.edc @@ -775,14 +775,16 @@ group { "elm/scroller/ctxpopup/more/default"; inherit: "elm/scroller/ctxpopup/default"; parts { - image { "elm.dragable.hbar"; + rect { "elm.dragable.hbar"; desc { "default"; color_class: "ctxpopup/more/default/scrollbar"; + color: 0 0 0 0; } } - image { "elm.dragable.vbar"; + rect { "elm.dragable.vbar"; desc { "default"; color_class: "ctxpopup/more/default/scrollbar"; + color: 0 0 0 0; } } } @@ -975,7 +977,7 @@ group { "elm/scroller/base/handler"; } } } - image { "elm.dragable.vbar"; + rect { "elm.dragable.vbar"; clip: "sb_vbar_clip"; mouse; scale; @@ -1126,7 +1128,7 @@ group { "elm/scroller/base/handler"; } } } - image { "elm.dragable.hbar"; + rect { "elm.dragable.hbar"; clip: "sb_hbar_clip"; mouse; scale; diff --git a/mobile/widgets/slider.edc b/mobile/widgets/slider.edc index 2bf062cf..269f8c6f 100644 --- a/mobile/widgets/slider.edc +++ b/mobile/widgets/slider.edc @@ -2765,7 +2765,7 @@ group { "elm/slider/vertical/warning"; program { "center_point_enable"; signal: "slider,center,point,show"; source: "elm"; - action: STATE_SET "visible"; + action: STATE_SET "default"; target: "center_point"; } program { "center_point_disable"; 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"; } } } |