diff options
author | SangHyeon Lee <sh10233.lee@samsung.com> | 2016-12-29 18:02:32 +0900 |
---|---|---|
committer | SangHyeon Lee <sh10233.lee@samsung.com> | 2016-12-29 19:01:24 +0900 |
commit | 4fcf70a48520857ebc06844e1bd00547e8691142 (patch) | |
tree | 478e36853e0980cc0dd299b28c740a41432c8944 | |
parent | 3cd4e1a72151a6d25691629a13a4c7a236cf5c4c (diff) | |
download | efl-theme-tizen-mobile-4fcf70a48520857ebc06844e1bd00547e8691142.tar.gz efl-theme-tizen-mobile-4fcf70a48520857ebc06844e1bd00547e8691142.tar.bz2 efl-theme-tizen-mobile-4fcf70a48520857ebc06844e1bd00547e8691142.zip |
genlist: refactoring genlist type1/type2 styles to prevent recalc repeatssubmit/tizen_3.0/20170102.015506submit/tizen_3.0.m2/20170104.093756accepted/tizen/3.0/mobile/20170102.094720accepted/tizen/3.0.m2/mobile/20170105.025934tizen_3.0.m2accepted/tizen_3.0.m2_mobile
Change-Id: Id0caa27d6a505b1af33261622c943a8260c1824b
-rw-r--r-- | mobile/widgets/genlist.edc | 183 |
1 files changed, 80 insertions, 103 deletions
diff --git a/mobile/widgets/genlist.edc b/mobile/widgets/genlist.edc index 2710473a..192357c4 100644 --- a/mobile/widgets/genlist.edc +++ b/mobile/widgets/genlist.edc @@ -505,77 +505,13 @@ group { "elm/genlist/item/type1/default"; min: GENLIST_ITEM_TYPE_AD_PADDING_INC 0; } } - // sub text line - textblock { "elm.text.sub.end"; scale; - desc { "default"; - fixed: 1 0; - min: 0 GENLIST_ITEM_SUB_LINE_HEIGHT_INC; - max: GENLIST_ITEM_END_TEXT_WIDTH_INC -1; - align: 1.0 0.5; - rel1 { to_x: "elm.padding.A.D"; to_y: "elm.text"; relative: 0.0 1.0; } - rel2 { to_x: "elm.padding.A.D"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; } - text.style: "list_type1_text_sub_end"; - text.min: 1 1; - text.max: 0 1; - } - desc { "pressed"; inherit: "default"; - text.style: "list_type1_text_sub_end_pressed"; - } - desc { "disabled"; inherit: "default"; - text.style: "list_type1_text_sub_end_disabled"; - } - } - spacer { "elm.padding.sub.text.end"; scale; - desc { "default"; - fixed: 1 0; - min: 0 0; - align: 1.0 0.5; - rel1 { to_x: "elm.text.sub.end"; to_y: "elm.padding.top"; relative: 0.0 1.0; } - rel2 { to_x: "elm.text.sub.end"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; } - } - desc { "icon_visible"; inherit: "default"; - min: GENLIST_ITEM_SUB_LINE_TEXT_END_PADDING_INC 0; - } - desc { "text_visible"; inherit: "default"; - min: GENLIST_ITEM_SUB_LINE_TEXT_END_PADDING_INC 0; - } - } - textblock { "elm.text.sub"; scale; - desc { "default"; - fixed: 0 1; - min: 0 GENLIST_ITEM_SUB_LINE_HEIGHT_INC; - align: 0.5 1.0; - rel1 { to_x: "elm.padding.B.A"; to_y: "elm.padding.bottom"; relative: 1.0 0.0; } - rel2 { to_x: "elm.padding.sub.text.end"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; } - text.style: "list_type1_text_sub"; - text.min: 0 1; - } - desc { "pressed"; inherit: "default"; - text.style: "list_type1_text_sub_pressed"; - } - desc { "disabled"; inherit: "default"; - text.style: "list_type1_text_sub_disabled"; - } - } - // bottom base of main text line - spacer { "base_line"; - desc { "default"; - fixed: 0 1; - rel1 { to: "elm.padding.bottom"; relative: 0.0 0.0; } - rel2 { to: "elm.padding.bottom"; relative: 1.0 0.0; } - } - desc { "sub_text_visible"; inherit: "default"; - rel1 { to_y: "elm.text.sub"; relative: 0.0 0.0; } - rel2 { to_y: "elm.text.sub"; relative: 1.0 0.0; } - } - } // main text line swallow { "elm.swallow.icon.0"; scale; desc { "default"; fixed: 1 0; align: 0.0 0.5; rel1 { to_x: "elm.padding.B.A"; to_y: "elm.padding.top"; relative: 1.0 1.0; } - rel2 { to_x: "elm.padding.B.A"; to_y: "base_line"; relative: 1.0 0.0; } + rel2 { to_x: "elm.padding.B.A"; to_y: "elm.text"; relative: 1.0 1.0; } } } swallow { "elm.swallow.icon.1"; scale; @@ -583,7 +519,7 @@ group { "elm/genlist/item/type1/default"; fixed: 1 0; align: 1.0 0.5; rel1 { to_x: "elm.padding.A.D"; to_y: "elm.padding.top"; relative: 0.0 1.0; } - rel2 { to_x: "elm.padding.A.D"; to_y: "base_line"; relative: 0.0 0.0; } + rel2 { to_x: "elm.padding.A.D"; to_y: "elm.text"; relative: 0.0 1.0; } } } spacer { "elm.padding.main.icon.text"; scale; @@ -605,7 +541,7 @@ group { "elm/genlist/item/type1/default"; max: GENLIST_ITEM_END_TEXT_WIDTH_INC -1; align: 1.0 0.5; rel1 { to_x: "elm.swallow.icon.1"; to_y: "elm.padding.top"; relative: 0.0 1.0; } - rel2 { to_x: "elm.swallow.icon.1"; to_y: "base_line"; relative: 0.0 0.0; } + rel2 { to_x: "elm.swallow.icon.1"; to_y: "elm.text"; relative: 0.0 1.0; } text.style: "list_type1_text_end"; text.min: 1 1; text.max: 0 1; @@ -623,7 +559,7 @@ group { "elm/genlist/item/type1/default"; min: 0 0; align: 1.0 0.5; rel1 { to_x: "elm.text.end"; to_y: "elm.padding.top"; relative: 0.0 1.0; } - rel2 { to_x: "elm.text.end"; to_y: "base_line"; relative: 0.0 0.0; } + rel2 { to_x: "elm.text.end"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; } } desc { "icon_visible"; inherit: "default"; min: GENLIST_ITEM_MAIN_LINE_TEXT_END_PADDING_INC 0; @@ -634,11 +570,11 @@ group { "elm/genlist/item/type1/default"; } textblock { "elm.text"; scale; desc { "default"; - fixed: 1 0; + fixed: 0 1; min: 0 GENLIST_ITEM_MAIN_LINE_HEIGHT_INC; - align: 0.5 0.5; + align: 0.5 0.0; rel1 { to_x: "elm.padding.main.icon.text"; to_y: "elm.padding.top"; relative: 1.0 1.0; } - rel2 { to_x: "elm.padding.main.text.end"; to_y: "base_line"; relative: 0.0 0.0; } + rel2 { to_x: "elm.padding.main.text.end"; to_y: "elm.padding.top"; relative: 0.0 1.0; } text.style: "list_type1_text"; text.min: 0 1; } @@ -649,6 +585,70 @@ group { "elm/genlist/item/type1/default"; text.style: "list_type1_text_disabled"; } } + // sub text line + textblock { "elm.text.sub.end"; scale; + desc { "default"; + fixed: 1 0; + min: 0 GENLIST_ITEM_SUB_LINE_HEIGHT_INC; + max: GENLIST_ITEM_END_TEXT_WIDTH_INC -1; + align: 1.0 0.5; + rel1 { to_x: "elm.padding.A.D"; to_y: "elm.text.sub"; relative: 0.0 0.0; } + rel2 { to_x: "elm.padding.A.D"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; } + text.style: "list_type1_text_sub_end"; + text.min: 1 1; + text.max: 0 1; + } + desc { "pressed"; inherit: "default"; + text.style: "list_type1_text_sub_end_pressed"; + } + desc { "disabled"; inherit: "default"; + text.style: "list_type1_text_sub_end_disabled"; + } + } + spacer { "elm.padding.sub.text.end"; scale; + desc { "default"; + fixed: 1 0; + min: 0 0; + align: 1.0 0.5; + rel1 { to_x: "elm.text.sub.end"; to_y: "elm.padding.top"; relative: 0.0 1.0; } + rel2 { to_x: "elm.text.sub.end"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; } + } + desc { "icon_visible"; inherit: "default"; + min: GENLIST_ITEM_SUB_LINE_TEXT_END_PADDING_INC 0; + } + desc { "text_visible"; inherit: "default"; + min: GENLIST_ITEM_SUB_LINE_TEXT_END_PADDING_INC 0; + } + } + textblock { "elm.text.sub"; scale; + desc { "default"; + fixed: 0 1; + min: 0 GENLIST_ITEM_SUB_LINE_HEIGHT_INC; + align: 0.5 1.0; + rel1 { to_x: "elm.padding.B.A"; to_y: "elm.padding.bottom"; relative: 1.0 0.0; } + rel2 { to_x: "elm.padding.sub.text.end"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; } + text.style: "list_type1_text_sub"; + text.min: 0 1; + } + desc { "pressed"; inherit: "default"; + text.style: "list_type1_text_sub_pressed"; + } + desc { "disabled"; inherit: "default"; + text.style: "list_type1_text_sub_disabled"; + } + } + // bottom base of main text line + spacer { "base_line"; + desc { "default"; + fixed: 0 0; + rel1 { to_y: "elm.text"; relative: 0.0 1.0; } + rel2 { to_y: "elm.padding.bottom"; relative: 1.0 0.0; } + } + desc { "sub_text_visible"; inherit: "default"; + rel1 { to_y: "elm.text"; relative: 0.0 1.0; } + rel2 { to_y: "elm.text.sub"; relative: 1.0 0.0; } + } + } rect { "elm.bottomline"; scale; desc { "default"; vis; @@ -1064,7 +1064,7 @@ group { "elm/genlist/item/type2/default"; desc { "default"; align: 1.0 0.5; rel1 { to_x: "elm.padding.A.D"; to_y: "elm.padding.top"; relative: 0.0 1.0; } - rel2 { to_x: "elm.padding.A.D"; to_y: "elm.text"; relative: 0.0 0.0; } + rel2 { to_x: "elm.padding.A.D"; to_y: "elm.text.sub"; relative: 0.0 1.0; } text.style: "list_type2_text_sub_end"; } desc { "pressed"; inherit: "default"; @@ -1093,39 +1093,30 @@ group { "elm/genlist/item/type2/default"; spacer { "base_line"; desc { "default"; rel1 { to: "elm.padding.top"; relative: 0.0 1.0; } - rel2 { to: "elm.padding.top"; relative: 1.0 1.0; } + rel2 { to: "elm.text"; relative: 1.0 0.0; } } desc { "sub_text_visible"; inherit: "default"; rel1 { to_y: "elm.text.sub"; relative: 0.0 1.0; } - rel2 { to_y: "elm.text.sub"; relative: 1.0 1.0; } + rel2 { to_y: "elm.text"; relative: 1.0 0.0; } } } // main text line swallow { "elm.swallow.icon.0"; scale; desc { "default"; - rel1 { to_x: "elm.padding.B.A"; to_y: "base_line"; relative: 1.0 1.0; } + rel1 { to_x: "elm.padding.B.A"; to_y: "elm.text"; relative: 1.0 0.0; } rel2 { to_x: "elm.padding.B.A"; to_y: "elm.padding.bottom"; relative: 1.0 0.0; } } } swallow { "elm.swallow.icon.1"; scale; desc { "default"; - rel1 { to_x: "elm.padding.A.D"; to_y: "base_line"; relative: 0.0 1.0; } + rel1 { to_x: "elm.padding.A.D"; to_y: "elm.text"; relative: 0.0 0.0; } rel2 { to_x: "elm.padding.A.D"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; } } } - spacer { "elm.padding.main.icon.text"; scale; - desc { "default"; - rel1 { to: "elm.swallow.icon.0"; to_y: "elm.padding.top"; relative: 1.0 1.0; } - rel2 { to: "elm.swallow.icon.0"; to_y: "elm.padding.bottom"; relative: 1.0 0.0; } - } - desc { "icon_visible"; inherit: "default"; - min: GENLIST_ITEM_MAIN_LINE_ICON_TEXT_PADDING_INC 0; - } - } textblock { "elm.text.end"; scale; desc { "default"; - rel1 { to_x: "elm.padding.A.D"; to_y: "base_line"; relative: 0.0 1.0; } - rel2 { to_x: "elm.padding.A.D"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; } + rel1 { to_x: "elm.swallow.icon.1"; to_y: "elm.text"; relative: 0.0 0.0; } + rel2 { to_x: "elm.swallow.icon.1"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; } text.style: "list_type2_text_end"; } desc { "pressed"; inherit: "default"; @@ -1135,24 +1126,10 @@ group { "elm/genlist/item/type2/default"; text.style: "list_type2_text_end_disabled"; } } - spacer { "elm.padding.main.text.end"; scale; - desc { "default"; - rel1 { to_x: "elm.text.end"; to_y: "base_line"; relative: 0.0 1.0; } - rel2 { to_x: "elm.text.end"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; } - } - desc { "icon_visible"; inherit: "default"; - min: GENLIST_ITEM_MAIN_LINE_TEXT_END_PADDING_INC 0; - } - desc { "text_visible"; inherit: "default"; - min: GENLIST_ITEM_MAIN_LINE_TEXT_END_PADDING_INC 0; - } - desc { "sub_text_visible"; inherit: "default"; - min: GENLIST_ITEM_MAIN_LINE_TEXT_END_PADDING_INC 0; - } - } textblock { "elm.text"; scale; desc { "default"; - rel1 { to_x: "elm.padding.main.icon.text"; to_y: "base_line"; relative: 1.0 1.0; } + align: 0.5 1.0; + rel1 { to_x: "elm.padding.main.icon.text"; to_y: "elm.padding.bottom"; relative: 1.0 0.0; } rel2 { to_x: "elm.padding.main.text.end"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; } text.style: "list_type2_text"; } |