Fix 3text.i1con & 3text.1icon.tb

Change-Id: I60924971f4b62ebb91ba258e3fd3d4981deaf73a

diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc
index 1bd0d6b..479fc15 100644 (file)
--- a/themes/widgets/genlist/genlist_macro.edc
+++ b/themes/widgets/genlist/genlist_macro.edc
@@ -531,17 +531,17 @@
             type: RECT; \
             scale: 1; \
             description { state: "default" 0.0; \
-               min: SIZE 0; \
-               fixed: 1 0; \
                visible: 0; \
+               fixed: 1 0; \
+               min: SIZE 0; \
                align: 0 0.5; \
                rel1 { \
-                  relative: 1 0.5; \
-                  to: LEFT; \
+                  relative: 1 0; \
+                  to_x: LEFT; \
                } \
                rel2 { \
-                  relative: 1 0.5; \
-                  to: LEFT; \
+                  relative: 1 1; \
+                  to_x: LEFT; \
                } \
             } \
          }
@@ -567,17 +567,17 @@
             type: RECT; \
             scale: 1; \
             description { state: "default" 0.0; \
-               min: SIZE 0; \
-               fixed: 1 0; \
                visible: 0; \
+               fixed: 1 0; \
+               min: SIZE 0; \
                align: 1 0.5; \
                rel1 { \
-                  relative: 0 0.5; \
-                  to: RIGHT; \
+                  relative: 0 0; \
+                  to_x: RIGHT; \
                } \
                rel2 { \
-                  relative: 0 0.5; \
-                  to: RIGHT; \
+                  relative: 0 1; \
+                  to_x: RIGHT; \
                } \
             } \
          }
@@ -1088,7 +1088,8 @@
          part { name: "elm.flip.content"; \
             type: SWALLOW; \
             scale: 1; \
-            GENLIST_DESCRIPTION_LR("elm.flip.content.left", "elm.flip.icon.left", fixed: 1 1; visible: 0;) \
+            GENLIST_DESCRIPTION_LR("elm.flip.content.left", "elm.flip.icon.left", \
+               aspect: 1 1; visible: 0; ) \
             description { state: "flip_enabled" 0.0; \
                inherit: "default" 0.0; \
                visible: 1; \
@@ -1100,7 +1101,7 @@
             scale: 1; \
             description { state: "default" 0.0; \
                visible: 0; \
-               fixed: 1 1; \
+               aspect: 1 1; \
                align: 1 0.5; \
                max: 132 72; \
                rel1 { \
@@ -1646,6 +1647,7 @@
       mouse_events: 0; \
       GENLIST_DESCRIPTION(LEFT, RIGHT, TOP, BOTTOM, \
          align: 0 0.5; \
+         fixed: 1 0; \
          color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR; \
          text { \
             align: 0 0.5; \
@@ -1666,10 +1668,11 @@
    part { name: NAME; \
       scale: 1; \
       clip_to: "disclip"; \
-      type: TEXT; \
+      type: TEXTBLOCK; \
       mouse_events: 0; \
       GENLIST_DESCRIPTION(LEFT, RIGHT, TOP, BOTTOM, \
          align: 0 0.5; \
+         fixed: 1 0; \
          text { \
             align: 0 0.5; \
             min: 0 1; \
@@ -1770,7 +1773,7 @@
     part { name: NAME; \
       scale: 1; \
       clip_to: "disclip"; \
-      type: TEXT; \
+      type: TEXTBLOCK; \
       mouse_events: 0; \
       GENLIST_DESCRIPTION_LRB("elm.padding.left", "elm.padding.right", "elm.padding.bottom", \
          align: 1 1; \
@@ -1857,7 +1860,7 @@
       clip_to: "disclip"; \
       type: SWALLOW; \
       GENLIST_DESCRIPTION_RTB(RIGHT, TOP, BOTTOM, \
-         fixed: 1 1; \
+         aspect: 1 1; \
          PARAM \
       ) \
    }

diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc
index e30606e..a7e212a 100644 (file)
--- a/themes/widgets/genlist/genlist_normal.edc
+++ b/themes/widgets/genlist/genlist_normal.edc
@@ -554,12 +554,12 @@
                visible: 0;
             )
          }
-         GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon1.left", "elm.icon.1",
-            GENLIST_PADDING_SIZE_DEFAULT)
          GENLIST_PART_ICON_R("elm.icon.1", "elm.padding.right",
             rel1.offset: GENLIST_PADDING_SIZE_DEFAULT 0;
             rel2.offset: GENLIST_PADDING_SIZE_DEFAULT 0;
          )
+         GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon1.left", "elm.icon.1",
+            GENLIST_PADDING_SIZE_DEFAULT)
       }
       programs {
          GENLIST_PROGRAM_DISCLIP
@@ -2285,12 +2285,13 @@
          GENLIST_PART_FLIP
 
          GENLIST_PART_TEXT_MAINITEM1("elm.text.1",
-            "elm.padding.left", "elm.padding.icon.left", "elm.padding.top", "elm.text.2")
+            "elm.padding.left", "elm.padding.icon.left", "elm.padding.top", "elm.text.3")
          GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon.left", "elm.icon",
             GENLIST_PADDING_SIZE_DEFAULT)
          GENLIST_PART_ICON_RTB("elm.icon",
             "elm.padding.right", "elm.padding.top", "elm.text.3",
-            min: 60 60;
+            // FIXME: if this doesnot exist, elm.padding.icon.left will be moved dynamically
+            min: 80 60;
          )
 
          GENLIST_PART_TEXT_SUBITEM1_FROM_LB("elm.text.2",
@@ -2330,10 +2331,13 @@
          GENLIST_PART_FLIP
 
          GENLIST_PART_TEXT_MAINITEM1_TB("elm.text.1",
-            "elm.padding.left", "elm.padding.icon.left", "elm.padding.top", "elm.text.2")
+            "elm.padding.left", "elm.padding.icon.left", "elm.padding.top", "elm.text.3")
          GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon.left", "elm.icon",
             GENLIST_PADDING_SIZE_DEFAULT)
-         GENLIST_PART_ICON_RTB("elm.icon", "elm.padding.right", "elm.padding.top", "elm.text.3", )
+         GENLIST_PART_ICON_RTB("elm.icon",
+            "elm.padding.right", "elm.padding.top", "elm.text.3",
+            min: 80 60;
+         )
 
          GENLIST_PART_TEXT_SUBITEM1_FROM_LB("elm.text.2",
             "elm.padding.left", "elm.padding.text3.left", "elm.padding.bottom")
@@ -13280,7 +13284,7 @@
       }
    }
 
-   // 4.1.19
+   // 4.1.19 (deprecated??)
    group { name: "elm/genlist/item/dialogue/1text.1icon.5/default";
       alias: "elm/genlist/item_odd/dialogue/1text.1icon.5/default";
       alias: "elm/genlist/item_compress/dialogue/1text.1icon.5/default";