[editfield] thin cursor bug fixed

diff --git a/themes/groups/editfield.edc b/themes/groups/editfield.edc
index 6ed5511..fd43106 100644 (file)
--- a/themes/groups/editfield.edc
+++ b/themes/groups/editfield.edc
@@ -178,6 +178,27 @@ group { name: "elm/editfield/base/default";
          }
       }
       part {
+         name: "left3";
+         type: RECT;
+         scale: 1;
+         ignore_flags: ON_HOLD;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: 2 0;
+            fixed: 1 1;
+            align: 0 0;
+            rel1 {
+               to: "elm.swallow.content";
+               relative: 0.0 0.0;
+            }
+            rel2 {
+               to: "elm.swallow.content";
+               relative: 0.0 1.0;
+            }
+         }
+      }
+      part {
          name: "right1";
          type: RECT;
          scale: 1;
@@ -338,7 +359,11 @@ group { name: "elm/editfield/base/default";
             state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
-            rel1.to: "elm.swallow.content";
+            rel1 {
+               to_x: "left3";
+               to_y: "elm.swallow.content";
+               relative: 1.0 0.0;
+            }
             rel2.to: "elm.swallow.content";
             text {
                style: "editfield_content_singleline_style";
@@ -366,7 +391,11 @@ group { name: "elm/editfield/base/default";
             state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
-            rel1.to: "elm.swallow.content";
+            rel1 {
+               to_x: "left3";
+               to_y: "elm.swallow.content";
+               relative: 1.0 0.0;
+            }
             rel2.to: "elm.swallow.content";
             text {
                style: "editfield_content_multiline_style";
@@ -395,7 +424,11 @@ group { name: "elm/editfield/base/default";
             state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
-            rel1.to: "elm.swallow.content";
+            rel1 {
+               to_x: "left3";
+               to_y: "elm.swallow.content";
+               relative: 1.0 0.0;
+            }
             rel2.to: "elm.swallow.content";
             text {
                style: "editfield_content_password_style";
@@ -759,6 +792,27 @@ group { name: "elm/editfield/base/searchbar";
          }
       }
       part {
+         name: "left3";
+         type: RECT;
+         scale: 1;
+         ignore_flags: ON_HOLD;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: 2 0;
+            fixed: 1 1;
+            align: 0 0;
+            rel1 {
+               to: "elm.swallow.content";
+               relative: 0.0 0.0;
+            }
+            rel2 {
+               to: "elm.swallow.content";
+               relative: 0.0 1.0;
+            }
+         }
+      }
+      part {
          name: "right1";
          type: RECT;
          scale: 1;
@@ -919,7 +973,11 @@ group { name: "elm/editfield/base/searchbar";
             state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
-            rel1.to: "elm.swallow.content";
+            rel1 {
+               to_x: "left3";
+               to_y: "elm.swallow.content";
+               relative: 1.0 0.0;
+            }
             rel2.to: "elm.swallow.content";
             text {
                style: "editfield_content_singleline_style";
@@ -947,7 +1005,11 @@ group { name: "elm/editfield/base/searchbar";
             state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
-            rel1.to: "elm.swallow.content";
+            rel1 {
+               to_x: "left3";
+               to_y: "elm.swallow.content";
+               relative: 1.0 0.0;
+            }
             rel2.to: "elm.swallow.content";
             text {
                style: "editfield_content_multiline_style";
@@ -976,7 +1038,11 @@ group { name: "elm/editfield/base/searchbar";
             state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
-            rel1.to: "elm.swallow.content";
+            rel1 {
+               to_x: "left3";
+               to_y: "elm.swallow.content";
+               relative: 1.0 0.0;
+            }
             rel2.to: "elm.swallow.content";
             text {
                style: "editfield_content_password_style";
@@ -1371,6 +1437,27 @@ group { name: "elm/editfield/base/font_color_black";
          }
       }
       part {
+         name: "left3";
+         type: RECT;
+         scale: 1;
+         ignore_flags: ON_HOLD;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: 2 0;
+            fixed: 1 1;
+            align: 0 0;
+            rel1 {
+               to: "elm.swallow.content";
+               relative: 0.0 0.0;
+            }
+            rel2 {
+               to: "elm.swallow.content";
+               relative: 0.0 1.0;
+            }
+         }
+      }
+      part {
          name: "right1";
          type: RECT;
          scale: 1;
@@ -1531,7 +1618,11 @@ group { name: "elm/editfield/base/font_color_black";
             state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
-            rel1.to: "elm.swallow.content";
+            rel1 {
+               to_x: "left3";
+               to_y: "elm.swallow.content";
+               relative: 1.0 0.0;
+            }
             rel2.to: "elm.swallow.content";
             text {
                style: "editfield_content_singleline_black_style";
@@ -1559,7 +1650,11 @@ group { name: "elm/editfield/base/font_color_black";
             state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
-            rel1.to: "elm.swallow.content";
+            rel1 {
+               to_x: "left3";
+               to_y: "elm.swallow.content";
+               relative: 1.0 0.0;
+            }
             rel2.to: "elm.swallow.content";
             text {
                style: "editfield_content_multiline_black_style";
@@ -1588,7 +1683,11 @@ group { name: "elm/editfield/base/font_color_black";
             state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
-            rel1.to: "elm.swallow.content";
+            rel1 {
+               to_x: "left3";
+               to_y: "elm.swallow.content";
+               relative: 1.0 0.0;
+            }
             rel2.to: "elm.swallow.content";
             text {
                style: "editfield_content_password_black_style";
@@ -1825,3 +1924,616 @@ group { name: "elm/editfield/base/font_color_black";
       }
    }
 }
+
+group { name: "elm/editfield/base/searchbar/font_color_black";
+   images {
+      image: "00_field_btn_clear.png" COMP;
+   }
+   script {
+      public single_line = 0;
+      public password_mode = 0;
+
+      public set_multi_line() {
+         set_int(single_line, 0);
+      }
+      public set_single_line() {
+         set_int(single_line, 1);
+      }
+      public set_password() {
+         set_int(password_mode, 1);
+      }
+      public unset_password() {
+         set_int(password_mode, 0);
+      }
+      public no_edit() {
+         if(get_int(single_line) == 1) {
+            if(get_int(password_mode) == 0) {
+               set_state(PART:"elm.content.single", "no_edit", 0.0);
+               set_state(PART:"elm.content.multi", "default", 0.0);
+               set_state(PART:"elm.content.password", "default", 0.0);
+            }
+            else {
+               set_state(PART:"elm.content.single", "default", 0.0);
+               set_state(PART:"elm.content.multi", "default", 0.0);
+               set_state(PART:"elm.content.password", "no_edit", 0.0);
+            }
+         }
+         else if(get_int(single_line) == 0) {
+            set_state(PART:"elm.content.single", "default", 0.0);
+            set_state(PART:"elm.content.multi", "no_edit", 0.0);
+            set_state(PART:"elm.content.password", "default", 0.0);
+         }
+         set_state(PART:"elm.swallow.content", "no_edit", 0.0);
+         set_state(PART:"over", "default", 0.0);
+         set_state(PART:"top2", "default", 0.0);
+      }
+   }
+   parts {
+      part {
+         name: "base";
+         type: RECT;
+         scale: 1;
+         ignore_flags: ON_HOLD;
+         description {
+            state: "default" 0.0;
+            min: 0 30;
+            color: 0 0 0 0;
+         }
+      }
+      part {
+         name: "top1";
+         type: RECT;
+         scale: 1;
+         ignore_flags: ON_HOLD;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: 0 6;
+            fixed: 1 1;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 1.0 0.0;
+            align: 0.5 0;
+         }
+         description {
+            state: "elm.text.show" 0.0;
+            inherit: "default" 0.0;
+            min: 0 10.5;
+         }
+      }
+      part {
+         name: "top2";
+         type: RECT;
+         scale: 1;
+         ignore_flags: ON_HOLD;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: 0 10;
+            fixed: 1 1;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 1.0 0.0;
+            align: 0.5 0;
+         }
+         description {
+            state: "edit" 0.0;
+            inherit: "default" 0.0;
+         }
+      }
+      part {
+         name: "left1";
+         type: RECT;
+         scale: 1;
+         ignore_flags: ON_HOLD;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: 0 0;
+            fixed: 1 1;
+            align: 0 0;
+            rel1.relative : 0.0 0.0;
+            rel2.relative : 0.0 1.0;
+         }
+      }
+      part {
+         name: "left2";
+         type: RECT;
+         scale: 1;
+         ignore_flags: ON_HOLD;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: 0 0;
+            fixed: 1 1;
+            align: 0 0;
+            rel1.relative : 0.0 0.0;
+            rel2.relative : 0.0 1.0;
+         }
+      }
+      part {
+         name: "left3";
+         type: RECT;
+         scale: 1;
+         ignore_flags: ON_HOLD;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: 2 0;
+            fixed: 1 1;
+            align: 0 0;
+            rel1 {
+               to: "elm.swallow.content";
+               relative: 0.0 0.0;
+            }
+            rel2 {
+               to: "elm.swallow.content";
+               relative: 0.0 1.0;
+            }
+         }
+      }
+      part {
+         name: "right1";
+         type: RECT;
+         scale: 1;
+         ignore_flags: ON_HOLD;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: 15 0;
+            fixed: 1 1;
+            align: 1 0;
+            rel1.relative : 1.0 0.0;
+            rel2.relative : 1.0 1.0;
+         }
+         description {
+            state: "elm.eraser.show" 0.0;
+            inherit: "default" 0.0;
+            min: 55 0;
+         }
+      }
+      part {
+         name: "right2";
+         type: RECT;
+         scale: 1;
+         ignore_flags: ON_HOLD;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: 5 0;
+            fixed: 1 1;
+            align: 1 0;
+            rel1.relative : 1.0 0.0;
+            rel2.relative : 1.0 1.0;
+         }
+      }
+      part {
+         name: "bottom1";
+         type: RECT;
+         scale: 1;
+         ignore_flags: ON_HOLD;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: 0 8;
+            fixed: 1 1;
+            align: 0 1;
+            rel1.relative: 0.0 1.0;
+         }
+         description {
+            state: "elm.text.show" 0.0;
+            inherit: "default" 0.0;
+            min: 0 2;
+         }
+      }
+      part {
+         name: "bottom2";
+         type: RECT;
+         scale: 1;
+         ignore_flags: ON_HOLD;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: 0 11;
+            fixed: 0 1;
+            rel1.relative: 0.0 1.0;
+            align: 0 1;
+         }
+         description {
+            state: "elm.text.show" 0.0;
+            inherit: "default" 0.0;
+            min: 0 2;
+         }
+      }
+      part {
+         name: "bottom3";
+         type: RECT;
+         scale: 1;
+         ignore_flags: ON_HOLD;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: 0 60;
+            fixed: 0 1;
+            rel1.relative: 0.0 1.0;
+            align: 0 1;
+         }
+         description {
+            state: "elm.text.show" 0.0;
+            inherit: "default" 0.0;
+            min: 0 50;
+         }
+      }
+      part {
+         name: "elm.text";
+         type: TEXT;
+         scale: 1;
+         ignore_flags: ON_HOLD;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            align: 0.0 0.0;
+            min: 0 30;
+            fixed: 1 1;
+            rel1 {
+               relative: 1.0 1.0;
+               to_x: "left2";
+               to_y: "top2";
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               to_x: "left2";
+               to_y: "top2";
+            }
+            color: EDITFIELD_TITLE_COLOR_INC;
+            text {
+               font: "SLP:style=Medium";
+               size: 20;
+               min: 1 1;
+               align: 0.0 0.0;
+            }
+         }
+         description {
+            state: "elm.text.show" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part {
+         name: "elm.guidetext";
+         type: TEXT;
+         scale: 1;
+         ignore_flags: ON_HOLD;
+         description {
+            state: "default" 0.0;
+            align: 0.0 0.0;
+            fixed: 1 1;
+            rel1.to: "elm.swallow.content";
+            rel2.to: "elm.swallow.content";
+            color: EDITFIELD_GUIDE_TEXT_COLOR_INC;
+            text {
+               font: "SLP:style=Roman";
+               size: 32;
+               min: 0 0;
+               align: 0.0 0.5;
+            }
+         }
+         description {
+            state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part {
+         name: "elm.content.single";
+         type: TEXTBLOCK;
+         scale: 1;
+         ignore_flags: ON_HOLD;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            fixed: 1 1;
+            rel1 {
+               to_x: "left3";
+               to_y: "elm.swallow.content";
+               relative: 1.0 0.0;
+            }
+            rel2.to: "elm.swallow.content";
+            text {
+               style: "editfield_content_singleline_black_style";
+               min: 0 0;
+               max: 0 1;
+            }
+         }
+         description {
+            state: "no_edit" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+         description {
+            state: "edit" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part {
+         name: "elm.content.multi";
+         type: TEXTBLOCK;
+         scale: 1;
+         ignore_flags: ON_HOLD;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            fixed: 1 1;
+            rel1 {
+               to_x: "left3";
+               to_y: "elm.swallow.content";
+               relative: 1.0 0.0;
+            }
+            rel2.to: "elm.swallow.content";
+            text {
+               style: "editfield_content_multiline_black_style";
+               min: 0 1;
+            }
+         }
+         description {
+            state: "no_edit" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+         description {
+            state: "edit" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part {
+         name: "elm.content.password";
+         type: TEXTBLOCK;
+         scale: 1;
+         ignore_flags: ON_HOLD;
+         entry_mode: PASSWORD;
+         multiline: 0;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            fixed: 1 1;
+            rel1 {
+               to_x: "left3";
+               to_y: "elm.swallow.content";
+               relative: 1.0 0.0;
+            }
+            rel2.to: "elm.swallow.content";
+            text {
+               style: "editfield_content_password_black_style";
+               repch: "*";
+               min: 0 0;
+               max: 0 1;
+            }
+         }
+         description {
+            state: "single_no_edit" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+         description {
+            state: "edit" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part {
+         name: "elm.swallow.content";
+         type: SWALLOW;
+         scale: 1;
+         ignore_flags: ON_HOLD;
+         description {
+            state: "default" 0.0;
+            min: 0 40;
+            rel1 {
+               relative : 1.0 1.0;
+               to_x: "left1";
+               to_y: "top1";
+            }
+            rel2 {
+               relative : 0.0 0.0;
+               to_x: "right1";
+               to_y: "bottom1";
+            }
+            align: 0.0 0.5;
+         }
+         description {
+            state: "no_edit" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+         description {
+            state: "edit" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part {
+         name: "over";
+         type: RECT;
+         scale: 1;
+         ignore_flags: ON_HOLD;
+         description {
+            state: "default" 0.0;
+            rel1.to: "base";
+            rel2.to: "base";
+            color: 0 0 0 0;
+         }
+         description {
+            state: "edit" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part {
+         name: "eraser_image";
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: 30 30;
+            fixed: 1 1;
+            align: 1 1;
+            rel1 {
+               relative: 0.0 0.0;
+               to_x : "right2";
+               to_y : "bottom2";
+            }
+            rel2 {
+               relative: 0.0 0.0;
+               to_x : "right2";
+               to_y : "bottom2";
+            }
+            image {
+               normal: "00_field_btn_clear.png";
+               border: 4 4 4 4 ;
+               border_scale: 1;
+            }
+         }
+         description {
+            state: "elm.eraser.show" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part {
+         name: "eraser";
+         mouse_events: 1;
+         ignore_flags: ON_HOLD;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            color: 0 0 0 0;
+            rel1 {
+               relative: 0.0 0.0;
+               to_x : "eraser_image";
+               to_y : "bottom3";
+            }
+         }
+         description {
+            state: "elm.eraser.show" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+   }
+   programs {
+      program {
+         name: "guidetext_show";
+         signal: "elm,state,guidetext,visible";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.guidetext";
+      }
+      program {
+         name: "guidetext_hide";
+         signal: "elm,state,guidetext,hidden";
+         source: "elm";
+         action: STATE_SET "hidden" 0.0;
+         target: "elm.guidetext";
+      }
+      program {
+         name: "eraser_show";
+         signal: "elm,state,eraser,show";
+         source: "elm";
+         action: STATE_SET "elm.eraser.show" 0.0;
+         target: "right1";
+         target: "eraser_image";
+         target: "eraser";
+      }
+      program {
+         name: "eraser_hide";
+         signal: "elm,state,eraser,hidden";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "right1";
+         target: "eraser_image";
+         target: "eraser";
+      }
+      program {
+         name: "multiline_set";
+         signal: "elm,state,text,multiline";
+         source: "elm";
+         script {
+            set_multi_line();
+         }
+      }
+      program {
+         name: "singleline_set";
+         signal: "elm,state,text,singleline";
+         source: "elm";
+         script {
+            set_single_line();
+         }
+      }
+      program {
+         name: "password_set";
+         signal: "elm,state,password,set";
+         source: "elm";
+         script {
+            set_password();
+         }
+      }
+      program {
+         name: "password_unset";
+         signal: "elm,state,password,unset";
+         source: "elm";
+         script {
+            unset_password();
+         }
+      }
+      program {
+         name: "editing";
+         signal: "elm,state,over,hide";
+         source: "elm";
+         action: STATE_SET "edit" 0.0;
+         target: "elm.swallow.content";
+         target: "elm.content.password";
+         target: "elm.content.multi";
+         target: "elm.content.single";
+         target: "over";
+         target: "top2";
+      }
+      program {
+         name: "no_editing";
+         signal: "elm,state,over,show";
+         source: "elm";
+         script {
+            no_edit();
+         }
+      }
+      program {
+         name: "label_show";
+         signal: "elm,state,text,visible";
+         source: "elm";
+         action: STATE_SET "elm.text.show" 0.0;
+         target: "elm.text";
+         target: "top1";
+         target: "bottom1";
+         target: "bottom2";
+         target: "bottom3";
+      }
+      program {
+         name: "label_hide";
+         signal: "elm,state,text,hidden";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+         target: "top1";
+         target: "bottom1";
+         target: "bottom2";
+         target: "bottom3";
+      }
+      program {
+         name: "entry_show";
+         signal: "elm,state,entry,show";
+         source: "elm";
+         action: STATE_SET "edit" 0.0;
+         target: "elm.swallow.content";
+         target: "elm.content.multi";
+      }
+   }
+}

diff --git a/themes/groups/entry.edc b/themes/groups/entry.edc
index bb3244f..3b19a33 100644 (file)
--- a/themes/groups/entry.edc
+++ b/themes/groups/entry.edc
@@ -29,7 +29,7 @@
       styles
        {
           style { name: "entry_textblock_style";
-             base: "font=SLP:style=Roman font_size=24 color="ENTRY_TEXT_COLOR_INC" wrap=mixed text_class_entry";
+             base: "font=SLP:style=Roman font_size=24 color="ENTRY_TEXT_COLOR_INC" left_margin=2 right_margin=2 wrap=mixed text_class_entry";
              tag:  "br" "\n";
              tag:  "ps" "ps";
              tag:  "tab" "\t";
@@ -127,7 +127,7 @@
       styles
        {
           style { name: "entry_textblock_char_wrap_style";
-             base: "font=SLP:style=Roman font_size=24 color="ENTRY_TEXT_COLOR_INC" wrap=char";
+             base: "font=SLP:style=Roman font_size=24 color="ENTRY_TEXT_COLOR_INC" wrap=char left_margin=2 right_margin=2";
              tag:  "br" "\n";
              tag:  "ps" "ps";
              tag:  "tab" "\t";
@@ -322,6 +322,7 @@
                alias: "elm/entry/base/editfield/multiline";
                alias: "elm/entry/base/editfield/multiline/default";
                alias: "elm/entry/base/editfield/multiline/lighting";
+               alias: "elm/entry/base/editfield/searchbar/default";
 
                data.item: "default_font_size" "24";
                data.item: "min_font_size" "8";
@@ -330,7 +331,7 @@
                styles
                {
                        style { name: "editfield_textblock_style";
-                               base: "font=SLP:style=Roman font_size=32 color="ENTRY_TEXT_COLOR_INC" wrap=mixed";
+                               base: "font=SLP:style=Roman font_size=32 color="ENTRY_TEXT_COLOR_INC" wrap=mixed left_margin=2 right_margin=2";
                                tag:  "br" "\n";
                                tag:  "ps" "ps";
                                tag:  "tab" "\t";
@@ -435,7 +436,7 @@
                styles
                {
                        style { name: "editfield_textblock_char_wrap_style";
-                               base: "font=SLP:style=Roman font_size=32 color="ENTRY_TEXT_COLOR_INC" wrap=char";
+                               base: "font=SLP:style=Roman font_size=32 color="ENTRY_TEXT_COLOR_INC" wrap=char left_margin=2 right_margin=2";
                                tag:  "br" "\n";
                                tag:  "ps" "ps";
                                tag:  "tab" "\t";
@@ -539,7 +540,7 @@
                styles
                {
                        style { name: "editfield_single_textblock_style";
-                               base: "font=SLP:style=Roman font_size=32 color="ENTRY_TEXT_COLOR_INC" wrap=none";
+                               base: "font=SLP:style=Roman font_size=32 color="ENTRY_TEXT_COLOR_INC" wrap=none left_margin=2 right_margin=3";
                                tag:  "br" "\n";
                                tag:  "ps" "ps";
                                tag:  "tab" "\t";
@@ -627,6 +628,75 @@
                }
        }
 
+group { name: "elm/entry/base-single/editfield/searchbar/default";
+
+               data.item: "default_font_size" "24";
+               data.item: "min_font_size" "8";
+               data.item: "max_font_size" "60";
+
+      data {
+         item: context_menu_orientation "horizontal";
+      }
+      parts {
+        part { name: "entry.swallow.background";
+           type: SWALLOW;
+           description { state: "default" 0.0;
+                  visible: 1;
+                  rel1 { relative: 0 0; to: "elm.text"; }
+                  rel2 { relative: 1 1; to: "elm.text"; }
+                       }
+             }
+       }
+               parts {
+                       part { name: "elm.text";
+                               type: TEXTBLOCK;
+                               mouse_events: 1;
+                               scale: 1;
+                               entry_mode: EDITABLE;
+                               select_mode: BLOCK_HANDLE;
+                               //cursor_mode: BEFORE;
+                               multiline: 0;
+                               source: "elm/entry/selection/default"; // selection under
+                               source2: "elm/entry/selection/block_handle"; // block handle
+                               source3: "elm/entry/selection/block_handle_top"; // block handle
+                               source4: "elm/entry/cursor/default"; // cursorover
+                               source5: "elm/entry/anchor/default"; // anchor under
+                               description { state: "default" 0.0;
+                                       text {
+                                               style: "editfield_single_textblock_style";
+                                               min: 1 1;
+                                               max: 0 1;
+                                       }
+                               }
+                               description { state: "disabled" 0.0;
+                                       inherit: "default" 0.0;
+                                       text {
+                                               style: "editfield_single_textblock_disabled_style";
+                                       }
+                               }
+                       }
+               }
+               programs {
+                       program { name: "focus";
+                               signal: "load";
+                               source: "";
+                               action: FOCUS_SET;
+                               target: "elm.text";
+                       }
+                       program { name: "disable";
+                               signal: "elm,state,disabled";
+                               source: "elm";
+                               action: STATE_SET "disabled" 0.0;
+                               target: "elm.text";
+                       }
+                       program { name: "enable";
+                               signal: "elm,state,enabled";
+                               source: "elm";
+                               action: STATE_SET "default" 0.0;
+                               target: "elm.text";
+                       }
+               }
+       }
    group { name: "elm/entry/base-nowrap/default";
       data.item: "default_font_size" "24";
       data.item: "min_font_size" "8";
@@ -733,7 +803,7 @@
       styles
        {
           style { name: "entry_single_textblock_style";
-             base: "font=SLP:style=Roman font_size=24 color="ENTRY_TEXT_COLOR_INC" wrap=none";
+             base: "font=SLP:style=Roman font_size=24 color="ENTRY_TEXT_COLOR_INC" wrap=none left_margin=2 right_margin=3";
              tag:  "br" "\n";
              tag:  "ps" "ps";
              tag:  "tab" "\t";
@@ -1293,7 +1363,7 @@ group { name: "elm/entry/base-password/popup";
                                scale: 1;
                                clip_to: "clip2";
                                description { state: "default" 0.0;
-                                       min: 4 0;
+                                       min: 3 0;
                                        fixed: 1 0;
                                        align: 0.5 0.5;
                                        rel1 {
@@ -2496,7 +2566,7 @@ group { name: "elm/entry/base/font_color_black";
 
    styles {
       style { name: "font_color_black_textblock_style";
-         base: "font=SLP:style=Roman font_size=32 color=#000000FF wrap=mixed";
+         base: "font=SLP:style=Roman font_size=32 color=#000000FF wrap=mixed left_margin=2 right_margin=2";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -2601,7 +2671,7 @@ group { name: "elm/entry/base-charwrap/font_color_black";
 
    styles {
       style { name: "font_color_black_textblock_char_wrap_style";
-         base: "font=SLP:style=Roman font_size=32 color=#000000FF wrap=char";
+         base: "font=SLP:style=Roman font_size=32 color=#000000FF wrap=char left_margin=2 right_margin=2";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -2698,6 +2768,7 @@ group { name: "elm/entry/base-single/font_color_black";
    alias: "elm/entry/base-single/font_color_black/singleline/default";
    alias: "elm/entry/base-single/font_color_black/singleline/lighting";
    alias: "elm/entry/base-single/editfield/font_color_black";
+   alias: "elm/entry/base-single/editfield/searchbar/font_color_black";
 
    data.item: "default_font_size" "24";
    data.item: "min_font_size" "8";
@@ -2705,7 +2776,7 @@ group { name: "elm/entry/base-single/font_color_black";
 
    styles {
       style { name: "font_color_black_single_textblock_style";
-         base: "font=SLP:style=Roman font_size=32 color=#000000FF wrap=none";
+         base: "font=SLP:style=Roman font_size=32 color=#000000FF wrap=none left_margin=2 right_margin=3";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";