genlist : refactroing type1 type2 style to prevent overlap issuesubmit/tizen_3.0/20161228.012505submit/tizen_3.0/20161227.025004accepted/tizen/3.0/mobile/20161228.091654

Change-Id: I2880c37540cff881cb8306748b689841ab578ea7
Signed-off-by: SangHyeon Lee <sh10233.lee@samsung.com>

1 files changed, 16 insertions, 31 deletions

diff --git a/mobile/widgets/genlist.edc b/mobile/widgets/genlist.edc
index 4951ffe6..2710473a 100644
--- a/mobile/widgets/genlist.edc
+++ b/mobile/widgets/genlist.edc
@@ -508,11 +508,11 @@ group { "elm/genlist/item/type1/default";
       // sub text line
       textblock { "elm.text.sub.end"; scale;
          desc { "default";
-            fixed: 1 1;
+            fixed: 1 0;
             min: 0 GENLIST_ITEM_SUB_LINE_HEIGHT_INC;
             max: GENLIST_ITEM_END_TEXT_WIDTH_INC -1;
-            align: 1.0 1.0;
-            rel1 { to_x: "elm.padding.A.D"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; }
+            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;
@@ -530,21 +530,19 @@ group { "elm/genlist/item/type1/default";
             fixed: 1 0;
             min: 0 0;
             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: "elm.padding.bottom"; relative: 0.0 0.0; }
+            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;
-            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; }
          }
       }
       textblock { "elm.text.sub"; scale;
          desc { "default";
-            fixed: 1 1;
+            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; }
@@ -594,7 +592,7 @@ group { "elm/genlist/item/type1/default";
             min: 0 0;
             align: 0.0 0.5;
             rel1 { to: "elm.swallow.icon.0"; to_y: "elm.padding.top"; relative: 1.0 1.0; }
-            rel2 { to: "elm.swallow.icon.0"; to_y: "base_line"; relative: 1.0 0.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;
@@ -606,8 +604,8 @@ group { "elm/genlist/item/type1/default";
             min: 0 GENLIST_ITEM_MAIN_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.padding.top"; relative: 0.0 1.0; }
-            rel2 { to_x: "elm.padding.A.D"; to_y: "base_line"; relative: 0.0 0.0; }
+            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; }
             text.style: "list_type1_text_end";
             text.min: 1 1;
             text.max: 0 1;
@@ -624,21 +622,14 @@ group { "elm/genlist/item/type1/default";
             fixed: 1 0;
             min: 0 0;
             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; }
+            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; }
          }
          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;
-            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; }
-         }
-         desc { "sub_text_visible"; inherit: "default";
-            min: GENLIST_ITEM_MAIN_LINE_TEXT_END_PADDING_INC 0;
-            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: "base_line"; relative: 0.0 0.0; }
          }
       }
       textblock { "elm.text"; scale;
@@ -809,7 +800,6 @@ group { "elm/genlist/item/type1/default";
          script {
             set_int(sub_end_text_visible, 1);
             set_state(PART:"elm.padding.sub.text.end", "text_visible", 0.0);
-            set_state(PART:"elm.swallow.icon.1", "text_visible", 0.0);
          }
       }
       program {
@@ -818,7 +808,6 @@ group { "elm/genlist/item/type1/default";
          script {
             set_int(sub_end_text_visible, 0);
             set_state(PART:"elm.padding.sub.text.end", "default", 0.0);
-            set_state(PART:"elm.swallow.icon.1", "default", 0.0);
          }
       }
       program { "default";
@@ -1073,9 +1062,9 @@ group { "elm/genlist/item/type2/default";
       // sub text line
       textblock { "elm.text.sub.end"; scale;
          desc { "default";
-            align: 1.0 0.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: "elm.padding.top"; relative: 0.0 1.0; }
+            rel2 { to_x: "elm.padding.A.D"; to_y: "elm.text"; relative: 0.0 0.0; }
             text.style: "list_type2_text_sub_end";
          }
          desc { "pressed"; inherit: "default";
@@ -1126,7 +1115,7 @@ group { "elm/genlist/item/type2/default";
       }
       spacer { "elm.padding.main.icon.text"; scale;
          desc { "default";
-            rel1 { to: "elm.swallow.icon.0"; to_y: "base_line"; relative: 1.0 1.0; }
+            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";
@@ -1148,21 +1137,17 @@ group { "elm/genlist/item/type2/default";
       }
       spacer { "elm.padding.main.text.end"; scale;
          desc { "default";
-            rel1 { to_x: "elm.swallow.icon.1"; to_y: "base_line"; relative: 0.0 1.0; }
-            rel2 { to_x: "elm.swallow.icon.1"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; }
+            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;
-            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 { "sub_text_visible"; inherit: "default";
             min: GENLIST_ITEM_MAIN_LINE_TEXT_END_PADDING_INC 0;
-            rel1 { to_x: "elm.text.sub.end"; to_y: "base_line"; relative: 0.0 1.0; }
-            rel2 { to_x: "elm.text.sub.end"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; }
          }
       }
       textblock { "elm.text"; scale;