Fix dialogue group password style

Change-Id: I74e71e173d6b842642c96f173196b4ff404899b8

diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc
index 1e8948b..1e14bf7 100644 (file)
--- a/themes/widgets/genlist/genlist_macro.edc
+++ b/themes/widgets/genlist/genlist_macro.edc
@@ -30,6 +30,8 @@
 
 #define GENLIST_TEXT2_WIDTH_MIN 150
 
+#define GENLIST_SIZE_PASSWORD_ICON 114
+
 #define GENLIST_TEXT_BTN_HEIGHT   72
 #define GENLIST_ICON_SMALL_SIZE   32
 #define GENLIST_ICON_BIG_SIZE     64
@@ -288,7 +290,10 @@
                min: 1 0; \
                fixed: 1 0; \
                visible: 1; \
-               rel1.relative: 1.0  0.0; \
+               rel1 { \
+                  relative: 1.0  0.0; \
+                  offset: -1 0; \
+               } \
                align: 1.0 0.0; \
                color: GENLIST_PART_LIST_LINE_COLOR_INC; \
             } \

diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc
index 4bd342f..1956230 100644 (file)
--- a/themes/widgets/genlist/genlist_normal.edc
+++ b/themes/widgets/genlist/genlist_normal.edc
@@ -16062,7 +16062,7 @@
       }
    }
 
-   /* password style 4.2.13 */
+   /* password style 2.4.2.13 */
    /* on landscape mode, 4 swallow parts will be placed left-align basis with having padding on the right side. */
    group { name: "elm/genlist/item/dialogue/1text.4icon/default";
       alias: "elm/genlist/item_odd/dialogue/1text.4icon/default";
@@ -16074,15 +16074,15 @@
       data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4";
       data.item: "texts" "elm.text.1";
       images {
-         image : "00_input_bg.png" COMP;
+         image : "00_search_input_field_bg.png" COMP;
       }
       parts {
          GENLIST_PART_BASE( GENLIST_HEIGHT_207_INC )
          GENLIST_PART_DIALOGUE_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_24_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
+         GENLIST_PART_PADDING_BOTTOM( 23 )
+         GENLIST_PART_PADDING_LEFT( 24 )
          GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
@@ -16094,21 +16094,22 @@
             description { state: "default" 0.0;
                fixed: 1 1;
                rel1 {
-                  relative: 1.0 0.0;
+                  relative: 1.0 1.0;
                   to_x: "elm.padding.left";
-                  to_y: "elm.icon.1";
+                  to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 1.0;
+                  relative: 0.0 0.0;
+                  offset: 0 -10;
                   to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
+                  to_y: "elm.icon1.bg";
                }
                color: GENLIST_DIALOGUE_FONT_PASSWORD_TITLE_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
+                  min: 0 0;
+                  align: 0.0 0;
                   text_class: "list_item";
                }
             }
@@ -16117,46 +16118,26 @@
                color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
          }
-         part { name: "elm.padding.icon1.left";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_74_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.rect.dialogue";
-                  to_y: "elm.padding.bottom";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.rect.dialogue";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 0.0 1.0;
-               visible: 0;
-            }
-         }
          part { name: "elm.icon1.bg";
             clip_to: "disclip";
             type: IMAGE;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_116_INC GENLIST_SIZE_116_INC;
+               min: GENLIST_SIZE_PASSWORD_ICON GENLIST_SIZE_PASSWORD_ICON;
                fixed: 1 1;
+               align: 0 1;
                rel1 {
                   relative: 1.0 0.0;
-                  to_x: "elm.padding.icon1.left";
+                  offset: 50 0;
+                  to_x: "elm.rect.dialogue";
                   to_y: "elm.padding.bottom";
                }
                rel2 {
                   relative: 1.0 0.0;
-                  to_x: "elm.padding.icon1.left";
+                  to_x: "elm.rect.dialogue";
                   to_y: "elm.padding.bottom";
                }
-               align: 0.0 1.0;
-               image.normal: "00_input_bg.png";
+               image.normal: "00_search_input_field_bg.png";
                image.border: 5 5 5 5;
                image.border_scale: 1;
             }
@@ -16168,7 +16149,7 @@
             description { state: "default" 0.0;
                rel1 {
                   to: "elm.icon1.bg";
-                  offset: 2 2;
+                  offset: 3 3;
                }
                rel2 {
                   to: "elm.icon1.bg";
@@ -16177,46 +16158,26 @@
                align: 0.5 0.5;
             }
          }
-         part { name: "elm.padding.icon2.left";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon1.bg";
-                  to_y: "elm.padding.bottom";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon1.bg";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 0.0 1.0;
-               visible: 0;
-            }
-         }
          part { name: "elm.icon2.bg";
             clip_to: "disclip";
             type: IMAGE;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_116_INC GENLIST_SIZE_116_INC;
+               min: GENLIST_SIZE_PASSWORD_ICON GENLIST_SIZE_PASSWORD_ICON;
                fixed: 1 1;
+               align: 0 1;
                rel1 {
                   relative: 1.0 0.0;
-                  to_x: "elm.padding.icon2.left";
+                  offset: GENLIST_PADDING_SIZE_DEFAULT 0;
+                  to_x: "elm.icon1.bg";
                   to_y: "elm.padding.bottom";
                }
                rel2 {
                   relative: 1.0 0.0;
-                  to_x: "elm.padding.icon2.left";
+                  to_x: "elm.icon1.bg";
                   to_y: "elm.padding.bottom";
                }
-               align: 0.0 1.0;
-               image.normal: "00_input_bg.png";
+               image.normal: "00_search_input_field_bg.png";
                image.border: 5 5 5 5;
                image.border_scale: 1;
             }
@@ -16228,7 +16189,7 @@
             description { state: "default" 0.0;
                rel1 {
                   to: "elm.icon2.bg";
-                  offset: 2 2;
+                  offset: 3 3;
                }
                rel2 {
                   to: "elm.icon2.bg";
@@ -16237,46 +16198,26 @@
                align: 0.5 0.5;
             }
          }
-         part { name: "elm.padding.icon3.left";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon2.bg";
-                  to_y: "elm.padding.bottom";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon2.bg";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 0.0 1.0;
-               visible: 0;
-            }
-         }
          part { name: "elm.icon3.bg";
             clip_to: "disclip";
             type: IMAGE;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_116_INC GENLIST_SIZE_116_INC;
+               min: GENLIST_SIZE_PASSWORD_ICON GENLIST_SIZE_PASSWORD_ICON;
                fixed: 1 1;
+               align: 0 1;
                rel1 {
                   relative: 1.0 0.0;
-                  to_x: "elm.padding.icon3.left";
+                  offset: GENLIST_PADDING_SIZE_DEFAULT 0;
+                  to_x: "elm.icon2.bg";
                   to_y: "elm.padding.bottom";
                }
                rel2 {
                   relative: 1.0 0.0;
-                  to_x: "elm.padding.icon3.left";
+                  to_x: "elm.icon2.bg";
                   to_y: "elm.padding.bottom";
                }
-               align: 0.0 1.0;
-               image.normal: "00_input_bg.png";
+               image.normal: "00_search_input_field_bg.png";
                image.border: 5 5 5 5;
                image.border_scale: 1;
             }
@@ -16288,7 +16229,7 @@
             description { state: "default" 0.0;
                rel1 {
                   to: "elm.icon3.bg";
-                  offset: 2 2;
+                  offset: 3 3;
                }
                rel2 {
                   to: "elm.icon3.bg";
@@ -16297,46 +16238,26 @@
                align: 0.5 0.5;
             }
          }
-         part { name: "elm.padding.icon4.left";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon3.bg";
-                  to_y: "elm.padding.bottom";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon3.bg";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 0.0 1.0;
-               visible: 0;
-            }
-         }
          part { name: "elm.icon4.bg";
             clip_to: "disclip";
             type: IMAGE;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_116_INC GENLIST_SIZE_116_INC;
+               min: GENLIST_SIZE_PASSWORD_ICON GENLIST_SIZE_PASSWORD_ICON;
                fixed: 1 1;
+               align: 0 1;
                rel1 {
                   relative: 1.0 0.0;
-                  to_x: "elm.padding.icon4.left";
+                  offset: GENLIST_PADDING_SIZE_DEFAULT 0;
+                  to_x: "elm.icon3.bg";
                   to_y: "elm.padding.bottom";
                }
                rel2 {
                   relative: 1.0 0.0;
-                  to_x: "elm.padding.icon4.left";
+                  to_x: "elm.icon3.bg";
                   to_y: "elm.padding.bottom";
                }
-               align: 0.0 1.0;
-               image.normal: "00_input_bg.png";
+               image.normal: "00_search_input_field_bg.png";
                image.border: 5 5 5 5;
                image.border_scale: 1;
             }
@@ -16348,7 +16269,7 @@
             description { state: "default" 0.0;
                rel1 {
                   to: "elm.icon4.bg";
-                  offset: 2 2;
+                  offset: 3 3;
                }
                rel2 {
                   to: "elm.icon4.bg";
@@ -16356,8 +16277,7 @@
                }
                align: 0.5 0.5;
             }
-         }
-         GENLIST_PART_DISCLIP
+         }         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active

diff --git a/themes/widgets/genlist/genlist_textblock_style.edc b/themes/widgets/genlist/genlist_textblock_style.edc
index cb935a5..f6ed43c 100644 (file)
--- a/themes/widgets/genlist/genlist_textblock_style.edc
+++ b/themes/widgets/genlist/genlist_textblock_style.edc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved 
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * PROPRIETARY/CONFIDENTIAL
  *