[entry] Apply tizen-dark-theme to editfield style

Change-Id: Iee73cef5cd6a79da97ec73b372759f0ed26e3210

diff --git a/themes/images/HD/dark/Content_views/00_edit_field_bg.png b/themes/images/HD/dark/Content_views/00_edit_field_bg.png
new file mode 100644 (file)
index 0000000..11b3cad
Binary files /dev/null and b/themes/images/HD/dark/Content_views/00_edit_field_bg.png differ

diff --git a/themes/images/HD/dark/Content_views/00_edit_field_focus.png b/themes/images/HD/dark/Content_views/00_edit_field_focus.png
new file mode 100644 (file)
index 0000000..e52f16c
Binary files /dev/null and b/themes/images/HD/dark/Content_views/00_edit_field_focus.png differ

diff --git a/themes/images/HD/light/Content_views/00_edit_field_bg.png b/themes/images/HD/light/Content_views/00_edit_field_bg.png
new file mode 100644 (file)
index 0000000..11b3cad
Binary files /dev/null and b/themes/images/HD/light/Content_views/00_edit_field_bg.png differ

diff --git a/themes/images/HD/light/Content_views/00_edit_field_focus.png b/themes/images/HD/light/Content_views/00_edit_field_focus.png
new file mode 100644 (file)
index 0000000..e52f16c
Binary files /dev/null and b/themes/images/HD/light/Content_views/00_edit_field_focus.png differ

diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc
index 3693c6c..f7e1599 100755 (executable)
--- a/themes/inc/tizen-dark-inc.edc
+++ b/themes/inc/tizen-dark-inc.edc
@@ -605,16 +605,16 @@
 #define BUTTON_SEARCH_ICON_CLIPPER_DISABLED_COLOR_INC 128 128 128 76
 
 #define BUTTON_EDITFIELD_RENAME_BUTTON_MIN_MAX_INC 54 54
-#define BUTTON_EDITFIELD_RENAME_BUTTON_CLIPPER_DEFAULT_COLOR_INC 128 128 128 255
-#define BUTTON_EDITFIELD_RENAME_BUTTON_CLIPPER_PRESSED_COLOR_INC 59 115 182 255
-#define BUTTON_EDITFIELD_RENAME_BUTTON_CLIPPER_DISABLED_COLOR_INC 128 128 128 76
+#define BUTTON_EDITFIELD_RENAME_BUTTON_CLIPPER_DEFAULT_COLOR_INC 72 93 147 255
+#define BUTTON_EDITFIELD_RENAME_BUTTON_CLIPPER_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_EDITFIELD_RENAME_BUTTON_CLIPPER_DISABLED_COLOR_INC 72 93 147 128
 
 #define BUTTON_SEARCH_RENAME_BUTTON_MIN_MAX_INC 45 45
 
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC 54 54
-#define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_DEFAULT_COLOR_INC 128 128 128 255
-#define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_PRESSED_COLOR_INC 59 115 182 255
-#define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_DISABLED_COLOR_INC 128 128 128 76
+#define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_DEFAULT_COLOR_INC 72 93 147 255
+#define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_DISABLED_COLOR_INC 72 93 147 128
 
 #define BUTTON_SEARCH_CLEAR_BUTTON_MIN_MAX_INC 45 45
 
@@ -945,8 +945,8 @@
 #define NOCONTENT_IMAGE_COLOR_INC            128 128 128 255
 
 #define ENTRY_TEXT_SIZE_INC 44
-#define ENTRY_TEXT_COLOR_INC "#000000"
-#define ENTRY_GUIDE_TEXT_COLOR_INC "#90A9C7"
+#define ENTRY_TEXT_COLOR_INC "#FAFAFA"
+#define ENTRY_GUIDE_TEXT_COLOR_INC "#485D93"
 #define ENTRY_CURSOR_COLOR_INC 59 115 182 255
 #define ENTRY_PREEDIT_BACKGROUND_COLOR_INC "#000000"
 #define ENTRY_PREEDIT_TEXT_COLOR_INC "#FFFFFF"

diff --git a/themes/widgets/button.edc b/themes/widgets/button.edc
index b4a5a12..b8f803c 100644 (file)
--- a/themes/widgets/button.edc
+++ b/themes/widgets/button.edc
@@ -7771,7 +7771,7 @@ group { name: "elm/button/base/bubble_circle/sent";
                min: BUTTON_EDITFIELD_RENAME_BUTTON_MIN_MAX_INC;
                max: BUTTON_EDITFIELD_RENAME_BUTTON_MIN_MAX_INC;
                fixed: 1 1;
-               align: 0.0 0.5;
+               align: 0.5 0.5;
                image.normal: "00_edit_field_rename.png";
             }
          }
@@ -7897,7 +7897,7 @@ group { name: "elm/button/base/bubble_circle/sent";
                min: BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC;
                max: BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC;
                fixed: 1 1;
-               align: 0.0 0.5;
+               align: 0.5 0.5;
                image.normal: "00_edit_field_clear.png";
             }
          }

diff --git a/themes/widgets/entry.edc b/themes/widgets/entry.edc
index d2f9f04..76acb1b 100644 (file)
--- a/themes/widgets/entry.edc
+++ b/themes/widgets/entry.edc
@@ -21,9 +21,27 @@
 #define ENTRY_BLOCK_HANDLE_SOURCE10 "elm/entry/selection/block_handle_edge_left"
 #define ENTRY_BLOCK_HANDLE_SOURCE11 "elm/entry/selection/block_handle_edge_right"
 
+#define ENTRY_FOCUS_DATA \
+   data.item: "focus_highlight" "on";
+
+#define ENTRY_EDITFIELD_FOCUS_DATA \
+   data.item: "focus_highlight" "off";
+
+#define ENTRY_FOCUS_IMAGE \
+   images { \
+      image: "00_focus.png" COMP; \
+   }
+
+#define ENTRY_EDITFIELD_FOCUS_IMAGE \
+   images { \
+      image: "00_edit_field_focus.png" COMP; \
+      image: "00_eidt_field_bg.png" COMP; \
+   }
+
 #define ENTRY_TEXTBLOCK_DEFAULT_REL \
    rel1 { \
-      relative: 0.0 0.0; \
+      to_x: "focus_left_padding"; \
+      relative: 1.0 0.0; \
    } \
    rel2 { \
       to_x: "editfield_space"; \
@@ -38,12 +56,19 @@
 #define ENTRY_SWALLOW_PARTS \
    part { name: "editfield_space"; \
       type: SPACER; \
+      scale: 1; \
       description { state: "default" 0.0; \
          align: 1.0 0.5; \
          min: 0 0; \
          max: 0 0; \
-         rel1.relative: 1.0 0.0; \
-         rel2.relative: 1.0 1.0; \
+         rel1 { \
+            to_x: "focus_right_padding"; \
+            relative: 0.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "focus_right_padding"; \
+            relative: 0.0 1.0; \
+         } \
       } \
       description { state: "rename_visible" 0.0; \
          inherit: "default" 0.0; \
@@ -74,28 +99,211 @@
    } \
    part { name: "elm.swallow.clear"; \
       type: SWALLOW; \
+      scale: 1; \
       description { state: "default" 0.0; \
+         align: 1.0 0.5; \
          fixed: 1 1; \
-         rel1.relative: 1.0 0.0; \
-         rel2.relative: 1.0 1.0; \
+         rel1 { \
+            to_x: "focus_right_padding"; \
+            relative: 0.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "focus_right_padding"; \
+            relative: 0.0 1.0; \
+         } \
          visible: 0; \
       } \
       description { state: "visible" 0.0; \
          inherit: "default" 0.0; \
-         align: 1.0 0.5; \
          visible: 1; \
       } \
    } \
    part { name: "elm.swallow.rename"; \
       type: SWALLOW; \
+      scale: 1; \
       description { state: "default" 0.0; \
+         align: 1.0 0.5; \
          fixed: 1 1; \
+         rel1 { \
+            to_x: "focus_right_padding"; \
+            relative: 0.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "focus_right_padding"; \
+            relative: 0.0 1.0; \
+         } \
+         visible: 0; \
+      } \
+      description { state: "visible" 0.0; \
+         inherit: "default" 0.0; \
+         visible: 1; \
+      } \
+   }
+
+#define ENTRY_FOCUS_PARTS \
+   part { name: "focus_bg"; \
+      type: RECT; \
+      scale: 1; \
+      description { state: "default" 0.0; \
+         visible: 0; \
+         rel1.relative: 0.0 0.0; \
+         rel2.relative: 1.0 1.0; \
+      } \
+   } \
+   part { name: "focus_left_padding"; \
+      type: SPACER; \
+      scale: 1; \
+      description { state: "default" 0.0; \
+         min: 10 0; \
+         max: 10 0; \
+         align: 0.0 0.5; \
+         rel1 { \
+            to_x: "focus_bg"; \
+            relative: 0.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "focus_bg"; \
+            relative: 0.0 1.0; \
+         } \
+      } \
+      description { state: "hidden" 0.0; \
+         inherit: "default" 0.0; \
+         min: 0 0; \
+         max: 0 0; \
+      } \
+   } \
+   part { name: "focus_right_padding"; \
+      type: SPACER; \
+      scale: 1; \
+      description { state: "default" 0.0; \
+         min: 10 0; \
+         max: 10 0; \
          align: 1.0 0.5; \
-         rel1.relative: 1.0 0.0; \
+         rel1 { \
+            to_x: "focus_bg"; \
+            relative: 1.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "focus_bg"; \
+            relative: 1.0 1.0; \
+         } \
+      } \
+      description { state: "hidden" 0.0; \
+         inherit: "default" 0.0; \
+         min: 0 0; \
+         max: 0 0; \
+      } \
+   } \
+   part { name: "focus_image"; \
+      scale: 1; \
+      mouse_events: 0; \
+      description { state: "default" 0.0; \
+         visible: 0; \
+         image { \
+            normal: "00_focus.png"; \
+            border: 6 6 6 6; \
+            border_scale: 1; \
+         } \
+         rel1 { \
+            to_x: "focus_bg"; \
+            relative: 0.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "focus_bg"; \
+            relative: 1.0 1.0; \
+         } \
+      } \
+      description { state: "focused" 0.0; \
+         inherit: "default" 0.0; \
+         visible: 1; \
+      } \
+   }
+
+#define ENTRY_EDITFIELD_FOCUS_PARTS \
+   part { name: "focus_bg"; \
+      type: IMAGE; \
+      scale: 1; \
+      mouse_events: 0; \
+      repeat_events: 1; \
+      description { state: "default" 0.0; \
+         visible: 1; \
+         image { \
+            normal: "00_edit_field_bg.png"; \
+            border: 8 8 8 8; \
+            border_scale: 1; \
+         } \
+         rel1.relative: 0.0 0.0; \
          rel2.relative: 1.0 1.0; \
+      } \
+      description { state: "hidden" 0.0; \
+         inherit: "default" 0.0; \
          visible: 0; \
       } \
-      description { state: "visible" 0.0; \
+   } \
+   part { name: "focus_left_padding"; \
+      type: SPACER; \
+      scale: 1; \
+      description { state: "default" 0.0; \
+         min: 10 0; \
+         max: 10 0; \
+         align: 0.0 0.5; \
+         rel1 { \
+            to_x: "focus_bg"; \
+            relative: 0.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "focus_bg"; \
+            relative: 0.0 1.0; \
+         } \
+      } \
+      description { state: "hidden" 0.0; \
+         inherit: "default" 0.0; \
+         min: 0 0; \
+         max: 0 0; \
+      } \
+   } \
+   part { name: "focus_right_padding"; \
+      type: SPACER; \
+      scale: 1; \
+      description { state: "default" 0.0; \
+         min: 10 0; \
+         max: 10 0; \
+         align: 1.0 0.5; \
+         rel1 { \
+            to_x: "focus_bg"; \
+            relative: 1.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "focus_bg"; \
+            relative: 1.0 1.0; \
+         } \
+      } \
+      description { state: "hidden" 0.0; \
+         inherit: "default" 0.0; \
+         min: 0 0; \
+         max: 0 0; \
+      } \
+   } \
+   part { name: "focus_image"; \
+      scale: 1; \
+      mouse_events: 0; \
+      description { state: "default" 0.0; \
+         visible: 0; \
+         image { \
+            normal: "00_edit_field_focus.png"; \
+            border: 8 8 8 8; \
+            border_scale: 1; \
+         } \
+         rel1 { \
+            to: "focus_bg"; \
+            relative: 0.0 0.0; \
+         } \
+         rel2 { \
+            to: "focus_bg"; \
+            relative: 1.0 1.0; \
+         } \
+      } \
+      description { state: "focused" 0.0; \
          inherit: "default" 0.0; \
          visible: 1; \
       } \
@@ -107,6 +315,9 @@
       source: "*"; \
       script { \
          set_int(scroll_enabled, 1); \
+         set_state(PART:"focus_bg", "hidden", 0.0); \
+         set_state(PART:"focus_left_padding", "hidden", 0.0); \
+         set_state(PART:"focus_right_padding", "hidden", 0.0); \
       } \
    } \
    program { name: "scroll_disabled"; \
@@ -114,6 +325,9 @@
       source: "*"; \
       script { \
          set_int(scroll_enabled, 0); \
+         set_state(PART:"focus_bg", "default", 0.0); \
+         set_state(PART:"focus_left_padding", "default", 0.0); \
+         set_state(PART:"focus_right_padding", "default", 0.0); \
       } \
    } \
    program { name: "clear_show"; \
@@ -165,6 +379,54 @@
       } \
    }
 
+#define ENTRY_FOCUS_PROGRAMS \
+   program { name: "action_focus"; \
+      signal: "elm,action,focus_highlight,show"; \
+      source: "elm"; \
+      script { \
+         new v; \
+         v = get_int(scroll_enabled); \
+         if (!v) { \
+            set_state(PART:"focus_image", "focused", 0.0); \
+         } \
+      } \
+   } \
+   program { name: "action_unfocus"; \
+      signal: "elm,action,focus_highlight,hide"; \
+      source: "elm"; \
+      script { \
+         new v; \
+         v = get_int(scroll_enabled); \
+         if (!v) { \
+            set_state(PART:"focus_image", "default", 0.0); \
+         } \
+      } \
+   }
+
+#define ENTRY_EDITFIELD_FOCUS_PROGRAMS \
+   program { name: "action_focus"; \
+      signal: "elm,state,focus,on"; \
+      source: "*"; \
+      script { \
+         new v; \
+         v = get_int(scroll_enabled); \
+         if (!v) { \
+            set_state(PART:"focus_image", "focused", 0.0); \
+         } \
+      } \
+   } \
+   program { name: "action_unfocus"; \
+      signal: "elm,state,focus,off"; \
+      source: "*"; \
+      script { \
+         new v; \
+         v = get_int(scroll_enabled); \
+         if (!v) { \
+            set_state(PART:"focus_image", "default", 0.0); \
+         } \
+      } \
+   }
+
 sounds {
    sample {
       name: "touch_sound" AS_IS;
@@ -224,7 +486,10 @@ group { name: "elm/entry/base/default";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -319,6 +584,7 @@ group { name: "elm/entry/base/default";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
       ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -374,7 +640,10 @@ group { name: "elm/entry/base-charwrap/default";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -469,6 +738,7 @@ group { name: "elm/entry/base-charwrap/default";
         action: PLAY_SAMPLE "touch_sound" 1.0;
      }
      ENTRY_SWALLOW_PROGRAMS
+     ENTRY_FOCUS_PROGRAMS
   }
 }
 
@@ -479,7 +749,10 @@ group { name: "elm/entry/base-nowrap/default";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -572,6 +845,7 @@ group { name: "elm/entry/base-nowrap/default";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
       ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -633,7 +907,10 @@ group { name: "elm/entry/base/editfield";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_EDITFIELD_FOCUS_DATA
+   ENTRY_EDITFIELD_FOCUS_IMAGE
    parts {
+      ENTRY_EDITFIELD_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -728,6 +1005,7 @@ group { name: "elm/entry/base/editfield";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
       ENTRY_SWALLOW_PROGRAMS
+      ENTRY_EDITFIELD_FOCUS_PROGRAMS
    }
 }
 
@@ -788,7 +1066,10 @@ group { name: "elm/entry/base-charwrap/editfield";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_EDITFIELD_FOCUS_DATA
+   ENTRY_EDITFIELD_FOCUS_IMAGE
    parts {
+      ENTRY_EDITFIELD_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -883,6 +1164,7 @@ group { name: "elm/entry/base-charwrap/editfield";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
       ENTRY_SWALLOW_PROGRAMS
+      ENTRY_EDITFIELD_FOCUS_PROGRAMS
    }
 }
 
@@ -942,7 +1224,10 @@ group { name: "elm/entry/base-single/editfield";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_EDITFIELD_FOCUS_DATA
+   ENTRY_EDITFIELD_FOCUS_IMAGE
    parts {
+      ENTRY_EDITFIELD_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -1034,6 +1319,7 @@ group { name: "elm/entry/base-single/editfield";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
       ENTRY_SWALLOW_PROGRAMS
+      ENTRY_EDITFIELD_FOCUS_PROGRAMS
    }
 }
 
@@ -1044,7 +1330,10 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -1136,6 +1425,7 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
       ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -1187,10 +1477,13 @@ group { name: "elm/entry/base-single/default";
          tag:  "hilight" "+ font=Tizen:style=Bold";
       }
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    data {
       item: context_menu_orientation "horizontal";
    }
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -1284,6 +1577,7 @@ group { name: "elm/entry/base-single/default";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
       ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -1684,7 +1978,10 @@ group { name: "elm/entry/base-noedit/default";
       data {
          item: context_menu_orientation "horizontal";
       }
+      ENTRY_FOCUS_DATA
+      ENTRY_FOCUS_IMAGE
       parts {
+         ENTRY_FOCUS_PARTS
          part { name: "elm.guide";
             type: TEXTBLOCK;
             mouse_events: 0;
@@ -1777,6 +2074,7 @@ group { name: "elm/entry/base-noedit/default";
             action: PLAY_SAMPLE "touch_sound" 1.0;
          }
          ENTRY_SWALLOW_PROGRAMS
+         ENTRY_FOCUS_PROGRAMS
       }
    }
 
@@ -1832,7 +2130,10 @@ group { name: "elm/entry/base-password/popup";
          tag:  "hilight" "+ font=Tizen:style=Bold";
       }
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -1925,6 +2226,7 @@ group { name: "elm/entry/base-password/popup";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
       ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -4416,7 +4718,10 @@ group { name: "elm/entry/base/font_color_black";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -4510,6 +4815,7 @@ group { name: "elm/entry/base/font_color_black";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
       ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -4673,7 +4979,10 @@ group { name: "elm/entry/base-charwrap/font_color_black";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -4767,6 +5076,7 @@ group { name: "elm/entry/base-charwrap/font_color_black";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
       ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -4830,7 +5140,10 @@ group { name: "elm/entry/base-single/font_color_black";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -4922,6 +5235,7 @@ group { name: "elm/entry/base-single/font_color_black";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
       ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -5111,7 +5425,10 @@ group { name: "elm/entry/base-password/font_color_black";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -5203,6 +5520,7 @@ group { name: "elm/entry/base-password/font_color_black";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
       ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -5210,7 +5528,10 @@ group { name: "elm/scroller/entry/default";
       alias : "elm/scroller/entry/editfield";
       alias : "elm/scroller/entry/editfield/searchbar/default";
       data {
-         item: "focus_highlight" "off";
+         item: "focus_highlight" "on";
+      }
+      images {
+         image: "00_focus.png" COMP;
       }
       script {
          public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer;
@@ -5237,14 +5558,91 @@ group { name: "elm/scroller/entry/default";
          }
       }
       parts {
+         part { name: "focus_bg";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part { name: "focus_image";
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 0;
+               image {
+                  normal: "00_focus.png";
+                  border: 6 6 6 6;
+                  border_scale: 1;
+               }
+               rel1 {
+                  to: "focus_bg";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to: "focus_bg";
+                  relative: 1.0 1.0;
+               }
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "focus_left_padding";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 10 0;
+               max: 10 0;
+               align: 0.0 0.5;
+               rel1 {
+                  to: "focus_bg";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to: "focus_bg";
+                  relative: 0.0 1.0;
+               }
+            }
+         }
+         part { name: "focus_right_padding";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 10 0;
+               max: 10 0;
+               align: 1.0 0.5;
+               rel1 {
+                  to: "focus_bg";
+                  relative: 1.0 0.0;
+               }
+               rel2 {
+                  to: "focus_bg";
+                  relative: 1.0 1.0;
+               }
+            }
+         }
          part { name: "bg";
             type: RECT;
+            scale: 1;
             description { state: "default" 0.0;
                visible: 0;
+               rel1 {
+                  to_x: "focus_left_padding";
+                  relative: 1.0 0.0;
+               }
+               rel2 {
+                  to_x: "focus_right_padding";
+                  relative: 0.0 1.0;
+               }
             }
          }
          part { name: "clipper";
             type: RECT;
+            scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                rel1.to: "bg";
@@ -5253,8 +5651,11 @@ group { name: "elm/scroller/entry/default";
          }
          part { name: "editfield_space";
             type: SPACER;
+            scale: 1;
             description { state: "default" 0.0;
                align: 1.0 1.0;
+               min: 0 0;
+               max: 0 0;
                rel1.to: "elm.swallow.end";
                rel1.relative: 0.0 0.0;
                rel2.to: "elm.swallow.end";
@@ -5275,7 +5676,6 @@ group { name: "elm/scroller/entry/default";
             }
             description { state: "clear_visible" 0.0;
                inherit: "default" 0.0;
-               align: 1.0 1.0;
                min: 9 0;
                max: 9 0;
                rel1 {
@@ -5290,6 +5690,7 @@ group { name: "elm/scroller/entry/default";
          }
          part { name: "contentclipper";
             type: RECT;
+            scale: 1;
             mouse_events: 0;
             clip_to: "clipper";
             description { state: "default" 0.0;
@@ -5301,8 +5702,10 @@ group { name: "elm/scroller/entry/default";
          }
          part { name: "elm.swallow.icon";
             type: SWALLOW;
+            scale: 1;
             clip_to: "clipper";
             description { state: "default" 0.0;
+               align: 0.0 0.5;
                fixed: 1 1;
                rel1 {
                   to: "bg";
@@ -5315,21 +5718,13 @@ group { name: "elm/scroller/entry/default";
                visible: 0;
             }
             description { state: "visible" 0.0;
-               fixed: 1 1;
-               align: 0.0 1.0;
-               rel1 {
-                         to: "bg";
-                         relative: 0.0 0.0;
-               }
-               rel2 {
-                  to: "bg";
-                  relative: 0.0 1.0;
-               }
+               inherit: "default" 0.0;
                visible: 1;
             }
          }
          part { name: "icon_right_padding";
             type: SPACER;
+            scale: 1;
             clip_to: "clipper";
             description { state: "default" 0.0;
                fixed: 1 1;
@@ -5353,8 +5748,10 @@ group { name: "elm/scroller/entry/default";
          }
          part { name: "elm.swallow.clear";
             type: SWALLOW;
+            scale: 1;
             clip_to: "clipper";
             description { state: "default" 0.0;
+               align: 1.0 0.5;
                fixed: 1 1;
                rel1 {
                   to_x: "elm.swallow.end";
@@ -5370,15 +5767,15 @@ group { name: "elm/scroller/entry/default";
             }
             description { state: "clear_visible" 0.0;
                inherit: "default" 0.0;
-               align: 1.0 1.0;
                visible: 1;
             }
          }
          part { name: "elm.swallow.rename";
             type: SWALLOW;
+            scale: 1;
             clip_to: "clipper";
             description { state: "default" 0.0;
-               align: 1.0 1.0;
+               align: 1.0 0.5;
                fixed: 1 1;
                rel1 {
                   to_x: "elm.swallow.end";
@@ -5399,8 +5796,10 @@ group { name: "elm/scroller/entry/default";
          }
          part { name: "elm.swallow.end";
             type: SWALLOW;
+            scale: 1;
             clip_to: "clipper";
             description { state: "default" 0.0;
+               align: 1.0 0.5;
                fixed: 1 1;
                rel1 {
                   to: "bg";
@@ -5414,12 +5813,12 @@ group { name: "elm/scroller/entry/default";
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               align: 1.0 1.0;
                visible: 1;
             }
          }
          part { name: "elm.swallow.content";
             clip_to: "contentclipper";
+            scale: 1;
             type: SWALLOW;
             description { state: "default" 0.0;
                rel1 {
@@ -5427,13 +5826,14 @@ group { name: "elm/scroller/entry/default";
                        relative: 1.0 0.0;
                }
                rel2 {
-                to: "editfield_space";
+                to_x: "editfield_space";
                 relative: 0.0 1.0;
                }
             }
          }
          part { name: "sb_vbar_clip_master";
             type: RECT;
+            scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
             }
@@ -5445,6 +5845,7 @@ group { name: "elm/scroller/entry/default";
          part { name: "sb_vbar_clip";
             clip_to: "sb_vbar_clip_master";
             type: RECT;
+            scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
             }
@@ -5455,6 +5856,7 @@ group { name: "elm/scroller/entry/default";
          }
          part { name: "sb_vbar";
             type: RECT;
+            scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                fixed: 1 1;
@@ -5475,6 +5877,7 @@ group { name: "elm/scroller/entry/default";
          }
          part { name: "elm.dragable.vbar";
             type: RECT;
+            scale: 1;
             clip_to: "sb_vbar_clip";
             mouse_events: 0;
             dragable {
@@ -5499,6 +5902,7 @@ group { name: "elm/scroller/entry/default";
          }
          part { name: "sb_hbar_clip_master";
             type: RECT;
+            scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
             }
@@ -5510,6 +5914,7 @@ group { name: "elm/scroller/entry/default";
          part { name: "sb_hbar_clip";
             clip_to: "sb_hbar_clip_master";
             type: RECT;
+            scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
             }
@@ -5520,6 +5925,7 @@ group { name: "elm/scroller/entry/default";
          }
          part { name: "sb_hbar";
             type: RECT;
+            scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                fixed: 1 1;
@@ -5540,6 +5946,7 @@ group { name: "elm/scroller/entry/default";
          }
          part { name: "elm.dragable.hbar";
             type: RECT;
+            scale: 1;
             clip_to: "sb_hbar_clip";
             mouse_events: 0;
             dragable {
@@ -5767,5 +6174,135 @@ group { name: "elm/scroller/entry/default";
                set_int(sbvis_timer, v);
             }
          }
+         program { name: "action_focus";
+            signal: "elm,action,focus_highlight,show";
+            source: "elm";
+            action: STATE_SET "focused" 0.0;
+            target: "focus_image";
+         }
+         program { name: "action_unfocus";
+            signal: "elm,action,focus_highlight,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "focus_image";
+         }
       }
    }
+group { name: "elm/scroller/entry/editfield";
+      inherit: "elm/scroller/entry/default";
+      data {
+         item: "focus_highlight" "off";
+      }
+      images {
+         image: "00_edit_field_focus.png" COMP;
+         image: "00_edit_field_bg.png" COMP;
+      }
+      parts {
+         part { name: "focus_bg";
+            type: IMAGE;
+            scale: 1;
+            mouse_events: 0;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               visible: 1;
+               image {
+                  normal: "00_edit_field_bg.png";
+                  border: 8 8 8 8;
+                  border_scale: 1;
+               }
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part { name: "focus_image";
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 0;
+               image {
+                  normal: "00_edit_field_focus.png";
+                  border: 8 8 8 8;
+                  border_scale: 1;
+               }
+               rel1 {
+                  to: "focus_bg";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to: "focus_bg";
+                  relative: 1.0 1.0;
+               }
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "focus_left_padding";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 10 0;
+               max: 10 0;
+               align: 0.0 0.5;
+               rel1 {
+                  to: "focus_bg";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to: "focus_bg";
+                  relative: 0.0 1.0;
+               }
+            }
+         }
+         part { name: "focus_right_padding";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 10 0;
+               max: 10 0;
+               align: 1.0 0.5;
+               rel1 {
+                  to: "focus_bg";
+                  relative: 1.0 0.0;
+               }
+               rel2 {
+                  to: "focus_bg";
+                  relative: 1.0 1.0;
+               }
+            }
+         }
+         part { name: "bg";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1 {
+                  to_x: "focus_left_padding";
+                  relative: 1.0 0.0;
+               }
+               rel2 {
+                  to_x: "focus_right_padding";
+                  relative: 0.0 1.0;
+               }
+            }
+         }
+      }
+      programs {
+         program { name: "action_focus";
+            signal: "elm,state,focus,on";
+            source: "*";
+            action: STATE_SET "focused" 0.0;
+            target: "focus_image";
+         }
+         program { name: "action_unfocus";
+            signal: "elm,state,focus,off";
+            source: "*";
+            action: STATE_SET "default" 0.0;
+            target: "focus_image";
+         }
+      }
+}
+
+
+