[editfield] fix a bug about text moving when focused->unfocused

diff --git a/themes/groups/editfield.edc b/themes/groups/editfield.edc
index ef0cd98..9378a34 100644 (file)
--- a/themes/groups/editfield.edc
+++ b/themes/groups/editfield.edc
@@ -180,7 +180,6 @@ group { name: "elm/editfield/base/default";
       part {
          name: "left3";
          type: RECT;
-         scale: 1;
          ignore_flags: ON_HOLD;
          description {
             state: "default" 0.0;

diff --git a/themes/groups/entry.edc b/themes/groups/entry.edc
index ebc7ccf..f0743e3 100644 (file)
--- a/themes/groups/entry.edc
+++ b/themes/groups/entry.edc
@@ -34,7 +34,7 @@
       styles
        {
           style { name: "entry_textblock_style";
-             base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" left_margin=2 right_margin=2 wrap=mixed text_class_entry";
+             base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" left_margin=1 right_margin=2 wrap=mixed text_class_entry";
              tag:  "br" "\n";
              tag:  "ps" "ps";
              tag:  "tab" "\t";
@@ -46,7 +46,7 @@
              tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC"";
           }
           style { name: "entry_textblock_disabled_style";
-             base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 left_margin=2 right_margin=2 wrap=mixed text_class=entry";
+             base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 left_margin=1 right_margin=2 wrap=mixed text_class=entry";
              tag:  "br" "\n";
              tag:  "ps" "ps";
              tag:  "tab" "\t";
@@ -132,7 +132,7 @@
       styles
        {
           style { name: "entry_textblock_char_wrap_style";
-             base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=char left_margin=2 right_margin=2";
+             base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2";
              tag:  "br" "\n";
              tag:  "ps" "ps";
              tag:  "tab" "\t";
@@ -144,7 +144,7 @@
              tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC"";
           }
           style { name: "entry_textblock_char_wrap_disabled_style";
-             base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=char left_margin=2 right_margin=2";
+             base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=char left_margin=1 right_margin=2";
              tag:  "br" "\n";
              tag:  "ps" "ps";
              tag:  "tab" "\t";
@@ -336,7 +336,7 @@
                styles
                {
                        style { name: "editfield_textblock_style";
-                               base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=mixed left_margin=2 right_margin=2";
+                               base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2";
                                tag:  "br" "\n";
                                tag:  "ps" "ps";
                                tag:  "tab" "\t";
@@ -348,7 +348,7 @@
                                tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC"";
                        }
                        style { name: "editfield_textblock_disabled_style";
-                               base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=mixed left_margin=2 right_margin=2";
+                               base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=mixed left_margin=1 right_margin=2";
                                tag:  "br" "\n";
                                tag:  "ps" "ps";
                                tag:  "tab" "\t";
@@ -441,7 +441,7 @@
                styles
                {
                        style { name: "editfield_textblock_char_wrap_style";
-                               base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=char left_margin=2 right_margin=2";
+                               base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2";
                                tag:  "br" "\n";
                                tag:  "ps" "ps";
                                tag:  "tab" "\t";
@@ -453,7 +453,7 @@
                                tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC"";
                        }
                        style { name: "editfield_textblock_char_wrap_disabled_style";
-                               base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=char left_margin=2 right_margin=2";
+                               base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=char left_margin=1 right_margin=2";
                                tag:  "br" "\n";
                                tag:  "ps" "ps";
                                tag:  "tab" "\t";
@@ -545,7 +545,7 @@
                styles
                {
                        style { name: "editfield_single_textblock_style";
-                               base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=none left_margin=2 right_margin=3";
+                               base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3";
                                tag:  "br" "\n";
                                tag:  "ps" "ps";
                                tag:  "tab" "\t";
@@ -557,7 +557,7 @@
                                tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC"";
                        }
                        style { name: "editfield_single_textblock_disabled_style";
-                           base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=none left_margin=2 right_margin=3";
+                           base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=none left_margin=1 right_margin=3";
                                tag:  "br" "\n";
                                tag:  "ps" "ps";
                                tag:  "tab" "\t";
@@ -808,7 +808,7 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
       styles
        {
           style { name: "entry_single_textblock_style";
-             base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=none left_margin=2 right_margin=3";
+             base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3";
              tag:  "br" "\n";
              tag:  "ps" "ps";
              tag:  "tab" "\t";
@@ -820,7 +820,7 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
              tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC"";
           }
           style { name: "entry_single_textblock_disabled_style";
-             base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=none left_margin=2 right_margin=3";
+             base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=none left_margin=1 right_margin=3";
              tag:  "br" "\n";
              tag:  "ps" "ps";
              tag:  "tab" "\t";
@@ -2829,7 +2829,7 @@ group { name: "elm/entry/base/font_color_black";
 
    styles {
       style { name: "font_color_black_textblock_style";
-         base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=mixed left_margin=2 right_margin=2";
+         base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=mixed left_margin=1 right_margin=2";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -2841,7 +2841,7 @@ group { name: "elm/entry/base/font_color_black";
          tag:  "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF";
       }
       style { name: "font_color_black_textblock_disabled_style";
-         base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=mixed left_margin=2 right_margin=2";
+         base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=mixed left_margin=1 right_margin=2";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -3004,7 +3004,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="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=char left_margin=2 right_margin=2";
+         base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=char left_margin=1 right_margin=2";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -3016,7 +3016,7 @@ group { name: "elm/entry/base-charwrap/font_color_black";
          tag:  "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF";
       }
       style { name: "font_color_black_textblock_char_wrap_disabled_style";
-         base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=char left_margin=2 right_margin=2";
+         base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=char left_margin=1 right_margin=2";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -3109,7 +3109,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="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=none left_margin=2 right_margin=3";
+         base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=none left_margin=1 right_margin=3";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -3121,7 +3121,7 @@ group { name: "elm/entry/base-single/font_color_black";
          tag:  "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF";
       }
       style { name: "font_color_black_single_textblock_disabled_style";
-         base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=none left_margin=2 right_margin=3";
+         base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=none left_margin=1 right_margin=3";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";

diff --git a/themes/inc/nbeat-black-hd-inc.edc b/themes/inc/nbeat-black-hd-inc.edc
index c316a86..b79572d 100644 (file)
--- a/themes/inc/nbeat-black-hd-inc.edc
+++ b/themes/inc/nbeat-black-hd-inc.edc
@@ -641,7 +641,7 @@
 #define EDITFIELD_DEFAULT_TOP2_INC 6
 #define EDITFIELD_DEFAULT_LEFT1_INC 0
 #define EDITFIELD_DEFAULT_LEFT2_INC 0
-#define EDITFIELD_DEFAULT_LEFT3_INC 2
+#define EDITFIELD_DEFAULT_LEFT3_INC 1
 #define EDITFIELD_DEFAULT_RIGHT1_ERASER_HIDE_INC 0
 #define EDITFIELD_DEFAULT_RIGHT1_ERASER_SHOW_INC 60
 #define EDITFIELD_DEFAULT_RIGHT2_INC 0
@@ -656,7 +656,7 @@
 #define EDITFIELD_SEARCHBAR_TOP2_INC 10
 #define EDITFIELD_SEARCHBAR_LEFT1_INC 0
 #define EDITFIELD_SEARCHBAR_LEFT2_INC 0
-#define EDITFIELD_SEARCHBAR_LEFT3_INC 2
+#define EDITFIELD_SEARCHBAR_LEFT3_INC 1
 #define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_HIDE_INC 15
 #define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 55
 #define EDITFIELD_SEARCHBAR_RIGHT2_INC 5

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index 25cadf1..60e35e8 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -626,7 +626,7 @@
 #define EDITFIELD_DEFAULT_TOP2_INC 6
 #define EDITFIELD_DEFAULT_LEFT1_INC 0
 #define EDITFIELD_DEFAULT_LEFT2_INC 0
-#define EDITFIELD_DEFAULT_LEFT3_INC 2
+#define EDITFIELD_DEFAULT_LEFT3_INC 1
 #define EDITFIELD_DEFAULT_RIGHT1_ERASER_HIDE_INC 0
 #define EDITFIELD_DEFAULT_RIGHT1_ERASER_SHOW_INC 40
 #define EDITFIELD_DEFAULT_RIGHT2_INC 0
@@ -641,7 +641,7 @@
 #define EDITFIELD_SEARCHBAR_TOP2_INC 10
 #define EDITFIELD_SEARCHBAR_LEFT1_INC 0
 #define EDITFIELD_SEARCHBAR_LEFT2_INC 0
-#define EDITFIELD_SEARCHBAR_LEFT3_INC 2
+#define EDITFIELD_SEARCHBAR_LEFT3_INC 1
 #define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_HIDE_INC 15
 #define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 45
 #define EDITFIELD_SEARCHBAR_RIGHT2_INC 5

diff --git a/themes/inc/nbeat-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc
index f09b30f..d6834fa 100644 (file)
--- a/themes/inc/nbeat-hd-inc.edc
+++ b/themes/inc/nbeat-hd-inc.edc
@@ -655,7 +655,7 @@
 #define EDITFIELD_DEFAULT_TOP2_INC 6
 #define EDITFIELD_DEFAULT_LEFT1_INC 0
 #define EDITFIELD_DEFAULT_LEFT2_INC 0
-#define EDITFIELD_DEFAULT_LEFT3_INC 2
+#define EDITFIELD_DEFAULT_LEFT3_INC 1
 #define EDITFIELD_DEFAULT_RIGHT1_ERASER_HIDE_INC 0
 #define EDITFIELD_DEFAULT_RIGHT1_ERASER_SHOW_INC 60
 #define EDITFIELD_DEFAULT_RIGHT2_INC 0
@@ -670,7 +670,7 @@
 #define EDITFIELD_SEARCHBAR_TOP2_INC 10
 #define EDITFIELD_SEARCHBAR_LEFT1_INC 0
 #define EDITFIELD_SEARCHBAR_LEFT2_INC 0
-#define EDITFIELD_SEARCHBAR_LEFT3_INC 2
+#define EDITFIELD_SEARCHBAR_LEFT3_INC 1
 #define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_HIDE_INC 15
 #define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 55
 #define EDITFIELD_SEARCHBAR_RIGHT2_INC 5

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index bc57668..3d4fe3a 100644 (file)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -648,7 +648,7 @@
 #define EDITFIELD_DEFAULT_TOP2_INC 6
 #define EDITFIELD_DEFAULT_LEFT1_INC 0
 #define EDITFIELD_DEFAULT_LEFT2_INC 0
-#define EDITFIELD_DEFAULT_LEFT3_INC 2
+#define EDITFIELD_DEFAULT_LEFT3_INC 1
 #define EDITFIELD_DEFAULT_RIGHT1_ERASER_HIDE_INC 0
 #define EDITFIELD_DEFAULT_RIGHT1_ERASER_SHOW_INC 40
 #define EDITFIELD_DEFAULT_RIGHT2_INC 0
@@ -663,7 +663,7 @@
 #define EDITFIELD_SEARCHBAR_TOP2_INC 10
 #define EDITFIELD_SEARCHBAR_LEFT1_INC 0
 #define EDITFIELD_SEARCHBAR_LEFT2_INC 0
-#define EDITFIELD_SEARCHBAR_LEFT3_INC 2
+#define EDITFIELD_SEARCHBAR_LEFT3_INC 1
 #define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_HIDE_INC 15
 #define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 45
 #define EDITFIELD_SEARCHBAR_RIGHT2_INC 5