[Genlist] Fix genlist icon styles and Add icon/no_padding_line style

Change-Id: If3233e40554fb1ff13d1629c7dc496795d183118

diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc
index b1b515c..b8bb735 100644 (file)
--- a/themes/widgets/genlist/genlist_macro.edc
+++ b/themes/widgets/genlist/genlist_macro.edc
@@ -28,7 +28,7 @@
 //**************************************************************************//
 // if size is different for each theme, split it into each theme inc.
 
-#define GENLIST_HEIGHT_1LINE              112
+#define GENLIST_HEIGHT_1LINE              110  // (114 - top/bottom padding)
 #define GENLIST_HEIGHT_2LINE_MAIN         54
 #define GENLIST_HEIGHT_2LINE_SUB          42
 #define GENLIST_HEIGHT_MULTILINE_SUB      38
@@ -990,31 +990,31 @@
          GENLIST_PART_RECT("bottom_line", \
             mouse_events: 0; \
             description { state: "default" 0.0; \
-               visible: 0; \
+               color: 0 0 0 0; \
             } \
             description { state: "selected" 0.0; \
-               visible: 0; \
+               color: 0 0 0 0; \
             } \
             description { state: "disabled" 0.0; \
-               visible: 0; \
+               color: 0 0 0 0; \
             } \
             description { state: "decorate" 0.0; \
-               visible: 0; \
+               color: 0 0 0 0; \
             } \
          ) \
          GENLIST_PART_RECT("bottom_line2", \
             mouse_events: 0; \
             description { state: "default" 0.0; \
-               visible: 0; \
+               color: 0 0 0 0; \
             } \
             description { state: "selected" 0.0; \
-               visible: 0; \
+               color: 0 0 0 0; \
             } \
             description { state: "disabled" 0.0; \
-               visible: 0; \
+               color: 0 0 0 0; \
             } \
             description { state: "decorate" 0.0; \
-               visible: 0; \
+               color: 0 0 0 0; \
             } \
          )
 
@@ -2533,7 +2533,6 @@
 #define GENLIST_PART_TEXT(NAME, DESCRIPION) \
     part { name: NAME; \
       scale: 1; \
-      mouse_events: 0; \
       type: TEXT; \
       DESCRIPION \
    }
@@ -2541,7 +2540,6 @@
 #define GENLIST_PART_TEXTBLOCK(NAME, DESCRIPION) \
     part { name: NAME; \
       scale: 1; \
-      mouse_events: 0; \
       type: TEXTBLOCK; \
       DESCRIPION \
    }

diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc
index 0078404..883e882 100644 (file)
--- a/themes/widgets/genlist/genlist_normal.edc
+++ b/themes/widgets/genlist/genlist_normal.edc
@@ -232,27 +232,38 @@
          )
          GENLIST_PART_FLIP
       }
-      GENLIST_PROGRAMS_NORMAL( target: "elm.icon"; )
+      GENLIST_PROGRAM_DEFAULT( target: "elm.icon"; )
+      GENLIST_PROGRAM_DISABLED( target: "elm.icon"; )
+      GENLIST_PROGRAM_SELECT( target: "elm.icon"; )
+      GENLIST_PROGRAM_SOUND( "elm.icon" )
+      GENLIST_PROGRAM_FLIP
    }
 
    group { GENLIST_NAME("1icon/with_no_line/default")
       inherit: "elm/genlist/item/1icon/default";
 
       parts {
-         part { name: "bottom_line";
-            description { state: "default" 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "bottom_line2";
+         GENLIST_PART_BOTTOM_LINE_OFF
+      }
+   }
+
+   group { GENLIST_NAME("1icon/no_padding/default")
+      inherit: "elm/genlist/item/1icon/default";
+
+      parts {
+         GENLIST_PART_PADDING_LEFT_SIZE(0)
+         GENLIST_PART_PADDING_RIGHT_SIZE(0)
+         GENLIST_PART_PADDING_TOP_SIZE(0)
+         GENLIST_PART_PADDING_BOTTOM_SIZE(0)
+         part { name: "elm.icon";
             description { state: "default" 0.0;
-               visible: 0;
+               min: 0 (GENLIST_HEIGHT_1LINE+4);
             }
          }
       }
    }
 
-   group { GENLIST_NAME("1icon/no_padding/default")
+   group { GENLIST_NAME("1icon/no_padding_line/default")
       inherit: "elm/genlist/item/1icon/default";
 
       parts {
@@ -260,6 +271,12 @@
          GENLIST_PART_PADDING_RIGHT_SIZE(0)
          GENLIST_PART_PADDING_TOP_SIZE(0)
          GENLIST_PART_PADDING_BOTTOM_SIZE(0)
+         GENLIST_PART_BOTTOM_LINE_OFF
+         part { name: "elm.icon";
+            description { state: "default" 0.0;
+               min: 0 (GENLIST_HEIGHT_1LINE + GENLIST_PADDING_SIZE_TOP + GENLIST_PADDING_SIZE_BOTTOM);
+            }
+         }
       }
    }