[GENLIST] implementation 2.4.4.3, 2.4.4.4 v.1.1 GUI for white theme

Change-Id: I78438c530b0b2f79b1449c3f35c7387d2cd1103a

diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index 5f3fbb8..5d7137a 100644 (file)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -118,6 +118,7 @@
 #define GENGRID_PART_TEXTBLOCK_STYLE_COLOR_INC "#F9F9F9"
 
 #define GENLIST_ICON_BIG_SIZE     64
+#define GENLIST_ICON_SIZE_64 64
 
 #define GENLIST_DIALOGUE_SEPARATOR_DEFAULT_HEIGHT 40
 
@@ -145,6 +146,7 @@
 #define GENLIST_HEIGHT_93_INC 93
 #define GENLIST_HEIGHT_97_INC 97
 #define GENLIST_HEIGHT_129_INC 129
+#define GENLIST_HEIGHT_142_INC 142
 #define GENLIST_HEIGHT_161_INC 161
 #define GENLIST_HEIGHT_163_INC 163
 #define GENLIST_HEIGHT_164_INC 164

diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc
index c308b8f..980e3f7 100644 (file)
--- a/themes/widgets/genlist/genlist_normal.edc
+++ b/themes/widgets/genlist/genlist_normal.edc
@@ -21241,24 +21241,44 @@
           image: "00_list_thumbnail_bg.png" COMP;
       }
       parts {
-         GENLIST_PART_DIALOGUE_BASE( GENLIST_HEIGHT_190_INC )
-         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
+         GENLIST_PART_DIALOGUE_BASE( GENLIST_HEIGHT_142_INC )
+         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_8_INC )
+         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_8_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
          GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.padding.icon.bottom";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 1;
+               fixed: 0 1;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+               }
+               align: 1.0 1.0;
+               visible: 0;
+            }
+         }
          part { name: "elm.icon1.bg";
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_128_INC GENLIST_SIZE_128_INC;
+               min: GENLIST_SIZE_141_INC GENLIST_SIZE_141_INC;
                fixed: 1 1;
-               align: 0.0 0.52;
+               align: 1.0 0.0;
                rel1 {
-                  relative: 1.0 0.5;
-                  to_x: "elm.padding.left";
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
                }
                rel2 {
-                  relative: 1.0 0.5;
-                  to_x: "elm.padding.left";
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.icon.bottom";
                }
                image {
                   normal: "00_list_thumbnail_bg.png";
@@ -21275,18 +21295,21 @@
                rel2.to: "elm.icon1.bg";
             }
          }
-         part { name: "elm.padding.icon1.right";
+         part { name: "elm.padding.icon1.left";
             type: RECT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_PADDING_24_INC 0;
+               min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
                rel1 {
-                   relative: 1.0 0.0;
+                   relative: 0.0 0.0;
+                   to_x: "elm.icon1.bg";
+               }
+               rel2 {
+                   relative: 0.0 1.0;
                    to_x: "elm.icon1.bg";
                }
-               rel2.to_x: "elm.icon1.bg";
                visible: 0;
                align: 0.0 0.5;
             }
@@ -21295,21 +21318,21 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               min: GENLIST_ICON_SIZE_64 GENLIST_ICON_SIZE_64;
+               max: GENLIST_ICON_SIZE_64 GENLIST_ICON_SIZE_64;
                fixed: 1 1;
                rel1 {
                   relative: 0.0 0.5;
-                  to_x: "elm.padding.right";
+                  to_x: "elm.padding.icon1.left";
                }
                rel2 {
                   relative: 0.0 0.5;
-                  to_x: "elm.padding.right";
+                  to_x: "elm.padding.icon1.left";
                }
                align: 1.0 0.5;
             }
          }
-         part { name: "elm.padding.icon2.right";
+         part { name: "elm.padding.icon2.left";
             type: RECT;
             mouse_events: 0;
             scale: 1;
@@ -21337,12 +21360,12 @@
                align: 0 0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
+                  to_x: "elm.padding.left";
                   to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.icon2.right";
+                  to_x: "elm.padding.icon2.left";
                   to_y: "elm.padding.top";
                }
                color: GENLIST_DIALOGUE_FONT_DETAIL_TEXT_MAIN_COLOR_INC;
@@ -21378,12 +21401,12 @@
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
+                  to_x: "elm.padding.left";
                   to_y: "elm.padding.text.1.bottom";
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to_x: "elm.padding.icon2.right";
+                  to_x: "elm.padding.icon2.left";
                   to_y: "elm.text.3";
                }
                color: GENLIST_DIALOGUE_FONT_DETAIL_TEXT_SUB_COLOR_INC;
@@ -21406,12 +21429,12 @@
                align: 0 1;
                rel1 {
                   relative: 1.0 0.0;
-                  to_x: "elm.padding.icon1.right";
+                  to_x: "elm.padding.left";
                   to_y: "elm.padding.bottom";
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to_x: "elm.padding.icon2.right";
+                  to_x: "elm.padding.icon2.left";
                   to_y: "elm.padding.bottom";
                }
                color: GENLIST_DIALOGUE_FONT_DETAIL_TEXT_SUB_COLOR_INC;
@@ -25670,24 +25693,44 @@
           image: "00_list_thumbnail_bg.png" COMP;
       }
       parts {
-         GENLIST_PART_DIALOGUE_BASE( GENLIST_HEIGHT_190_INC )
-         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_46_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_48_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
+         GENLIST_PART_DIALOGUE_BASE( GENLIST_HEIGHT_142_INC )
+         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_24_INC )
+         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_24_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
          GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.padding.icon.bottom";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 1;
+               fixed: 0 1;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+               }
+               align: 1.0 1.0;
+               visible: 0;
+            }
+         }
          part { name: "elm.icon.bg";
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_128_INC GENLIST_SIZE_128_INC;
+               min: GENLIST_SIZE_141_INC GENLIST_SIZE_141_INC;
                fixed: 1 1;
-               align: 0.0 0.5;
+               align: 1.0 0.0;
                rel1 {
-                  relative: 1.0 0.5;
-                  to_x: "elm.padding.left";
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
                }
                rel2 {
-                  relative: 1.0 0.5;
-                  to_x: "elm.padding.left";
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.icon.bottom";
                }
                image {
                   normal: "00_list_thumbnail_bg.png";
@@ -25704,18 +25747,21 @@
                rel2.to: "elm.icon.bg";
             }
          }
-         part { name: "elm.padding.icon.right";
+         part { name: "elm.padding.icon.left";
             type: RECT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_PADDING_24_INC 0;
+               min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
                rel1 {
-                   relative: 1.0 0.0;
+                   relative: 0.0 0.0;
+                   to_x: "elm.icon.bg";
+               }
+               rel2 {
+                   relative: 0.0 1.0;
                    to_x: "elm.icon.bg";
                }
-               rel2.to_x: "elm.icon.bg";
                visible: 0;
                align: 0.0 0.5;
             }
@@ -25731,23 +25777,39 @@
                align: 0 0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.right";
+                  to_x: "elm.padding.left";
                   to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  to_x: "elm.padding.icon.left";
                   to_y: "elm.padding.top";
                }
                color: GENLIST_DIALOGUE_FONT_DETAIL_TEXT_MAIN_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
                   size: GENLIST_FONT_48_INC;
-                  align: 0.0 0.0;
+                  align: 0.0 0.5;
                   text_class: "list_item";
                }
             }
          }
+         part { name: "elm.padding.text.1.bottom";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 GENLIST_PADDING_8_INC;
+               fixed: 0 1;
+               rel1 {
+                   relative: 0.0 1.0;
+                   to_y: "elm.text.1";
+               }
+               rel2.to_y: "elm.text.1";
+               visible: 0;
+               align: 0.0 0.0;
+            }
+         }
          part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXT;
@@ -25756,19 +25818,19 @@
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.right";
-                  to_y: "elm.text.1";
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.text.1.bottom";
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
+                  to_x: "elm.padding.icon.left";
                   to_y: "elm.padding.bottom";
                }
                color: GENLIST_DIALOGUE_FONT_DETAIL_TEXT_SUB_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
-                  align: 0.0 1.0;
+                  align: 0.0 0.5;
                   text_class: "slp_medium";
                }
             }