[entry] Remove normal entry custom focus code

diff --git a/themes/widgets/entry.edc b/themes/widgets/entry.edc
index 8504f6f..ae5ef73 100644 (file)
--- a/themes/widgets/entry.edc
+++ b/themes/widgets/entry.edc
@@ -21,16 +21,8 @@
 #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; \
-   }
+   data.item: "focus_highlight" "on";
 
 #define ENTRY_EDITFIELD_FOCUS_IMAGE \
    images { \
@@ -40,6 +32,15 @@
 
 #define ENTRY_TEXTBLOCK_DEFAULT_REL \
    rel1 { \
+      relative: 0.0 0.0; \
+   } \
+   rel2 { \
+      to_x: "clear_padding"; \
+      relative: 0.0 1.0; \
+   }
+
+#define ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL \
+   rel1 { \
       to_x: "focus_left_padding"; \
       relative: 1.0 0.0; \
    } \
@@ -63,12 +64,10 @@
          max: 0 0; \
          fixed: 1 0; \
          rel1 { \
-            to_x: "focus_right_padding"; \
-            relative: 0.0 0.0; \
+            relative: 1.0 0.0; \
          } \
          rel2 { \
-            to_x: "focus_right_padding"; \
-            relative: 0.0 1.0; \
+            relative: 1.0 1.0; \
          } \
       } \
       description { state: "visible" 0.0; \
@@ -84,12 +83,10 @@
          align: 1.0 0.5; \
          fixed: 1 1; \
          rel1 { \
-            to_x: "focus_right_padding"; \
-            relative: 0.0 0.0; \
+            relative: 1.0 0.0; \
          } \
          rel2 { \
-            to_x: "focus_right_padding"; \
-            relative: 0.0 1.0; \
+            relative: 1.0 1.0; \
          } \
          visible: 0; \
       } \
@@ -99,82 +96,47 @@
       } \
    }
 
-#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"; \
+#define ENTRY_EDITFIELD_SWALLOW_PARTS \
+   part { name: "clear_padding"; \
       type: SPACER; \
       scale: 1; \
       description { state: "default" 0.0; \
-         align: 0.0 0.5; \
-         min: 10 0; \
-         max: 10 0; \
+         align: 1.0 0.5; \
+         min: 0 0; \
+         max: 0 0; \
          fixed: 1 0; \
          rel1 { \
-            to_x: "focus_bg"; \
+            to_x: "focus_right_padding"; \
             relative: 0.0 0.0; \
          } \
          rel2 { \
-            to_x: "focus_bg"; \
+            to_x: "focus_right_padding"; \
             relative: 0.0 1.0; \
          } \
       } \
-      description { state: "hidden" 0.0; \
+      description { state: "visible" 0.0; \
          inherit: "default" 0.0; \
-         min: 0 0; \
-         max: 0 0; \
+         min: 70 0; \
+         max: 70 0; \
       } \
    } \
-   part { name: "focus_right_padding"; \
-      type: SPACER; \
+   part { name: "elm.swallow.clear"; \
+      type: SWALLOW; \
       scale: 1; \
       description { state: "default" 0.0; \
          align: 1.0 0.5; \
-         min: 10 0; \
-         max: 10 0; \
-         fixed: 1 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; \
-         } \
+         fixed: 1 1; \
          rel1 { \
-            to_x: "focus_bg"; \
+            to_x: "focus_right_padding"; \
             relative: 0.0 0.0; \
          } \
          rel2 { \
-            to_x: "focus_bg"; \
-            relative: 1.0 1.0; \
+            to_x: "focus_right_padding"; \
+            relative: 0.0 1.0; \
          } \
+         visible: 0; \
       } \
-      description { state: "focused" 0.0; \
+      description { state: "visible" 0.0; \
          inherit: "default" 0.0; \
          visible: 1; \
       } \
@@ -278,9 +240,6 @@
       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"; \
@@ -288,9 +247,6 @@
       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"; \
@@ -318,26 +274,48 @@
       } \
    }
 
-#define ENTRY_FOCUS_PROGRAMS \
-   program { name: "action_focus"; \
-      signal: "elm,action,focus_highlight,show"; \
-      source: "elm"; \
+#define ENTRY_EDITFIELD_SWALLOW_PROGRAMS \
+   program { name: "scroll_enabled"; \
+      signal: "elm,state,scroll,enabled"; \
+      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"; \
+      signal: "elm,state,scroll,disabled"; \
+      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"; \
+      signal: "elm,state,clear,visible"; \
+      source: "*"; \
       script { \
          new v; \
          v = get_int(scroll_enabled); \
          if (!v) { \
-            set_state(PART:"focus_image", "focused", 0.0); \
+            set_state(PART:"elm.swallow.clear", "visible", 0.0); \
+            set_state(PART:"clear_padding", "visible", 0.0); \
          } \
       } \
    } \
-   program { name: "action_unfocus"; \
-      signal: "elm,action,focus_highlight,hide"; \
-      source: "elm"; \
+   program { name: "clear_hide"; \
+      signal: "elm,state,clear,hidden"; \
+      source: "*"; \
       script { \
          new v; \
          v = get_int(scroll_enabled); \
          if (!v) { \
-            set_state(PART:"focus_image", "default", 0.0); \
+            set_state(PART:"elm.swallow.clear", "default", 0.0); \
+            set_state(PART:"clear_padding", "default", 0.0); \
          } \
       } \
    }
@@ -425,10 +403,7 @@ 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;
@@ -523,7 +498,6 @@ group { name: "elm/entry/base/default";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
       ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -579,10 +553,7 @@ 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;
@@ -677,7 +648,6 @@ group { name: "elm/entry/base-charwrap/default";
         action: PLAY_SAMPLE "touch_sound" 1.0;
      }
      ENTRY_SWALLOW_PROGRAMS
-     ENTRY_FOCUS_PROGRAMS
   }
 }
 
@@ -688,10 +658,7 @@ 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;
@@ -784,7 +751,6 @@ group { name: "elm/entry/base-nowrap/default";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
       ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -894,7 +860,7 @@ group { name: "elm/entry/base/editfield";
                min: 0 1;
                align: 0.0 0.0;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
+            ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -904,7 +870,7 @@ group { name: "elm/entry/base/editfield";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
+      ENTRY_EDITFIELD_SWALLOW_PARTS
    }
    ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
@@ -943,7 +909,7 @@ group { name: "elm/entry/base/editfield";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_EDITFIELD_SWALLOW_PROGRAMS
       ENTRY_EDITFIELD_FOCUS_PROGRAMS
    }
 }
@@ -1053,7 +1019,7 @@ group { name: "elm/entry/base-charwrap/editfield";
                min: 0 1;
                align: 0.0 0.0;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
+            ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -1063,7 +1029,7 @@ group { name: "elm/entry/base-charwrap/editfield";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
+      ENTRY_EDITFIELD_SWALLOW_PARTS
    }
    ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
@@ -1102,7 +1068,7 @@ group { name: "elm/entry/base-charwrap/editfield";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_EDITFIELD_SWALLOW_PROGRAMS
       ENTRY_EDITFIELD_FOCUS_PROGRAMS
    }
 }
@@ -1209,7 +1175,7 @@ group { name: "elm/entry/base-single/editfield";
                min: 1 1;
                max: 0 1;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
+            ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -1218,7 +1184,7 @@ group { name: "elm/entry/base-single/editfield";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
+      ENTRY_EDITFIELD_SWALLOW_PARTS
    }
    ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
@@ -1257,7 +1223,7 @@ group { name: "elm/entry/base-single/editfield";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_EDITFIELD_SWALLOW_PROGRAMS
       ENTRY_EDITFIELD_FOCUS_PROGRAMS
    }
 }
@@ -1269,8 +1235,8 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
    data {
       item: context_menu_orientation "horizontal";
    }
-   ENTRY_FOCUS_DATA
-   ENTRY_FOCUS_IMAGE
+   ENTRY_EDITFIELD_FOCUS_DATA
+   ENTRY_EDITFIELD_FOCUS_IMAGE
    styles {
       style { name: "editfield_searchbar_single_textblock_style";
          base: "font=Tizen:style=Roman font_size="ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry";
@@ -1316,7 +1282,7 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
       }
    }
    parts {
-      ENTRY_FOCUS_PARTS
+      ENTRY_EDITFIELD_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -1359,7 +1325,7 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
                min: 1 1;
                max: 0 1;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
+            ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -1368,7 +1334,7 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
+      ENTRY_EDITFIELD_SWALLOW_PARTS
    }
    ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
@@ -1407,8 +1373,8 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
+      ENTRY_EDITFIELD_SWALLOW_PROGRAMS
+      ENTRY_EDITFIELD_FOCUS_PROGRAMS
    }
 }
 
@@ -1460,13 +1426,10 @@ 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;
@@ -1560,7 +1523,6 @@ group { name: "elm/entry/base-single/default";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
       ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -1961,10 +1923,7 @@ 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;
@@ -2057,7 +2016,6 @@ group { name: "elm/entry/base-noedit/default";
             action: PLAY_SAMPLE "touch_sound" 1.0;
          }
          ENTRY_SWALLOW_PROGRAMS
-         ENTRY_FOCUS_PROGRAMS
       }
    }
 
@@ -2113,10 +2071,7 @@ 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;
@@ -2209,7 +2164,6 @@ group { name: "elm/entry/base-password/popup";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
       ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -4694,10 +4648,7 @@ group { name: "elm/entry/base-single/multibuttonentry";
    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;
@@ -4789,7 +4740,6 @@ group { name: "elm/entry/base-single/multibuttonentry";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
       ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
    }
 }
 group { name: "elm/entry/base/font_color_black";
@@ -4852,10 +4802,7 @@ 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;
@@ -4949,7 +4896,6 @@ group { name: "elm/entry/base/font_color_black";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
       ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -5113,10 +5059,7 @@ 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;
@@ -5210,7 +5153,6 @@ group { name: "elm/entry/base-charwrap/font_color_black";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
       ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -5274,10 +5216,7 @@ 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;
@@ -5369,7 +5308,6 @@ group { name: "elm/entry/base-single/font_color_black";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
       ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -5559,10 +5497,7 @@ 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;
@@ -5654,16 +5589,12 @@ group { name: "elm/entry/base-password/font_color_black";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
       ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
    }
 }
 
 group { name: "elm/scroller/entry/default";
       data {
-         item: "focus_highlight" "on";
-      }
-      images {
-         image: "00_focus.png" COMP;
+         item: "focus_highlight" "off";
       }
       script {
          public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer;
@@ -5693,70 +5624,10 @@ group { name: "elm/scroller/entry/default";
          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;
+            repeat_events: 1;
             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;
-               align: 0.0 0.5;
-               min: 10 0;
-               max: 10 0;
-               fixed: 1 0;
-               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;
-               align: 1.0 0.5;
-               min: 10 0;
-               max: 10 0;
-               fixed: 1 0;
-               rel1 {
-                  to: "focus_bg";
-                  relative: 1.0 0.0;
-               }
-               rel2 {
-                  to: "focus_bg";
-                  relative: 1.0 1.0;
-               }
             }
          }
          part { name: "bg";
@@ -5764,14 +5635,6 @@ group { name: "elm/scroller/entry/default";
             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";
@@ -6264,24 +6127,12 @@ 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";
+         item: "focus_highlight" "on";
       }
       images {
          image: "00_edit_field_focus.png" COMP;
@@ -6304,30 +6155,6 @@ group { name: "elm/scroller/entry/editfield";
                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;
@@ -6364,6 +6191,31 @@ group { name: "elm/scroller/entry/editfield";
                }
             }
          }
+         part { name: "focus_image";
+            scale: 1;
+            mouse_events: 0;
+            repeat_events: 1;
+            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: "bg";
             type: RECT;
             scale: 1;
@@ -6398,7 +6250,7 @@ group { name: "elm/scroller/entry/editfield";
 group { name: "elm/scroller/entry/editfield/searchbar/default";
       inherit: "elm/scroller/entry/default";
       data {
-         item: "focus_highlight" "off";
+         item: "focus_highlight" "on";
       }
       images {
          image: "00_search_edit_field_bg_focus.png" COMP;
@@ -6421,30 +6273,6 @@ group { name: "elm/scroller/entry/editfield/searchbar/default";
                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_search_edit_field_bg_focus.png";
-                  border: 12 13 12 13;
-                  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;
@@ -6481,6 +6309,30 @@ group { name: "elm/scroller/entry/editfield/searchbar/default";
                }
             }
          }
+         part { name: "focus_image";
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 0;
+               image {
+                  normal: "00_search_edit_field_bg_focus.png";
+                  border: 12 13 12 13;
+                  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: "bg";
             type: RECT;
             scale: 1;