From bbb70f0e9b08a7e5c8ef3a6419d47679b1e8319c Mon Sep 17 00:00:00 2001 From: Woochan Lee Date: Wed, 6 Dec 2017 17:32:45 +0900 Subject: [PATCH] efl_ui_clock: Apply lazy edc. Summary: Apply laze edc for efl widget. Test Plan: elementary_test -> Efl.Ui.Clock sample. Reviewers: jpeg, taxi2se, Jaehyun_Cho Subscribers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D5606 --- data/elementary/themes/edc/efl/uiclock.edc | 138 +++++++++++++++-------------- 1 file changed, 71 insertions(+), 67 deletions(-) diff --git a/data/elementary/themes/edc/efl/uiclock.edc b/data/elementary/themes/edc/efl/uiclock.edc index e0b0586..ac37fdc 100644 --- a/data/elementary/themes/edc/efl/uiclock.edc +++ b/data/elementary/themes/edc/efl/uiclock.edc @@ -1,10 +1,9 @@ #define DATETIME_FIELD(_pos) \ - part { \ - name: "field"#_pos; type: SWALLOW; \ - scale: 1; \ + swallow { "field"#_pos; \ + scale; \ clip_to: "clip"; \ - description { state: "default" 0.0; \ - visible: 0; \ + desc { "default"; \ + hid; \ min: 0 0; \ align: 0.0 0.5; \ fixed: 1 1; \ @@ -13,32 +12,33 @@ rel2.relative: 1.0 1.0; \ rel2.to: "separator"#_pos; \ } \ - description { state: "enable" 0.0; \ - inherit: "default" 0.0; \ - visible: 1; \ + desc { "enable"; \ + inherit: "default"; \ + vis; \ min: 8 10; \ } \ } \ programs{ \ - program { name: "field_"#_pos"enabled"; \ - signal: "field"#_pos",enable"; source: "elm"; \ - action: STATE_SET "enable" 0.0; \ + program { "field_"#_pos"enabled"; \ + signal: "field"#_pos",enable"; \ + source: "elm"; \ + action: STATE_SET "enable"; \ target: "field"#_pos; \ } \ - program { name: "field_"#_pos"disabled"; \ - signal: "field"#_pos",disable"; source: "elm"; \ - action: STATE_SET "default" 0.0; \ + program { "field_"#_pos"disabled"; \ + signal: "field"#_pos",disable"; \ + source: "elm"; \ + action: STATE_SET "default"; \ target: "field"#_pos; \ } \ - } + } #define DATETIME_SEPARATOR(_pos, _after) \ - part { \ - name: "separator"#_pos; type: TEXT; \ - scale: 1; \ + text { "separator"#_pos; \ + scale; \ effect: SHADOW BOTTOM; \ clip_to: "disclip"; \ - description { state: "default" 0.0; \ - visible: 0; \ + desc { "default"; \ + hid; \ min: 0 0; \ align: 0.0 0.5; \ fixed: 1 0; \ @@ -59,19 +59,18 @@ text_class: "datetime_separator_text"; \ } \ } \ - description { state: "enable" 0.0; \ - inherit: "default" 0.0; \ - visible: 1; \ + desc { "enable"; \ + inherit: "default"; \ + vis; \ min: 8 10; \ } \ } \ - part { \ - name: "separator"#_pos"d"; type: TEXT; \ - scale: 1; \ + text { "separator"#_pos"d"; \ + scale; \ effect: SHADOW BOTTOM; \ clip_to: "disclip2"; \ - description { state: "default" 0.0; \ - visible: 0; \ + desc { "default"; \ + hid; \ rel1.to: "separator"#_pos; \ rel2.to: "separator"#_pos; \ color_class: "datetime_separator_text_disabled"; \ @@ -81,21 +80,23 @@ text_class: "datetime_separator_text_disabled"; \ } \ } \ - description { state: "enable" 0.0; \ - inherit: "default" 0.0; \ - visible: 1; \ + desc { "enable"; \ + inherit: "default"; \ + vis; \ } \ } \ programs { \ program { \ - signal: "field"#_after",enable"; source: "elm"; \ - action: STATE_SET "enable" 0.0; \ + signal: "field"#_after",enable"; \ + source: "elm"; \ + action: STATE_SET "enable"; \ target: "separator"#_pos; \ target: "separator"#_pos"d"; \ } \ program { \ - signal: "field"#_after",disable"; source: "elm"; \ - action: STATE_SET "default" 0.0; \ + signal: "field"#_after",disable"; \ + source: "elm"; \ + action: STATE_SET "default"; \ target: "separator"#_pos; \ target: "separator"#_pos"d"; \ } \ @@ -103,43 +104,43 @@ group { "efl/uiclock"; parts { - part { name: "bg"; type: RECT; - description { state: "default" 0.0; + rect { "bg"; + desc { "default"; color_class: "datetime_bg"; } } - part { name: "clip"; type: RECT; - description { state: "default" 0.0; + rect { "clip"; + desc { "default"; rel1.to: "separator0"; rel2.to: "separator7"; } } - part { name: "disclip"; type: RECT; + rect { "disclip"; clip_to: "clip"; - description { state: "default" 0.0; + desc { "default"; rel1.to: "separator0"; rel2.to: "separator7"; } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 0; + desc { "disabled"; + inherit: "default"; + hid; } } - part { name: "disclip2"; type: RECT; + rect { "disclip2";; clip_to: "clip"; - description { state: "default" 0.0; + desc { "default"; rel1.to: "separator0"; rel2.to: "separator7"; - visible: 0; + hid; } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 1; + desc { "disabled"; + inherit: "default"; + vis; } } - part { name: "separator0"; type: SPACER; - scale: 1; - description { state: "default" 0.0; + spacer { "separator0";; + scale; + desc { "default"; min: 8 10; align: 0.0 0.5; fixed: 1 0; @@ -162,42 +163,45 @@ group { "efl/uiclock"; DATETIME_SEPARATOR(7,6) DATETIME_FIELD(7) DATETIME_SEPARATOR(8,7) - part { name: "separator9"; type: SPACER; - description { state: "default" 0.0; + spacer { "separator9";; + desc { "default"; rel1.to: "separator7"; rel1.relative: 1.0 0.0; min: 8 10; } } - part { name: "discover"; type: RECT; - description { state: "default" 0.0; + rect { "discover";; + desc { "default"; rel1.to: "separator0"; rel2.to: "separator7"; - visible: 0; + hid; color: 0 0 0 0; } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 1; + desc { "disabled"; + inherit: "default"; + vis; } } - part { name: "elm.access"; type: RECT; repeat_events: 1; - description { state: "default" 0.0; + rect { "elm.access"; + repeat; + desc { "default"; color: 0 0 0 0; } } } programs { program { - signal: "elm,state,disabled"; source: "elm"; - action: STATE_SET "disabled" 0.0; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "disabled"; target: "disclip"; target: "disclip2"; target: "discover"; } program { - signal: "elm,state,enabled"; source: "elm"; - action: STATE_SET "default" 0.0; + signal: "elm,state,enabled"; + source: "elm"; + action: STATE_SET "default"; target: "disclip"; target: "disclip2"; target: "discover"; -- 2.7.4