Entry : preedit bug in black theme is fixed

diff --git a/themes/groups/entry.edc b/themes/groups/entry.edc
index f6e3cd8..7e7fe5e 100644 (file)
--- a/themes/groups/entry.edc
+++ b/themes/groups/entry.edc
@@ -13,8 +13,8 @@
              tag:  "b" "+ font=SLP:style=Bold";
              tag:  "link" "+ color=#800 underline=on underline_color=#8008";
              tag:  "hilight" "+ font=SLP:style=Bold";
-             tag:  "preedit" "+ underline=on underline_color=#000000FF";
-             tag:  "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF";
+             tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC"";
+             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=24 color=#00000080 wrap=mixed";
@@ -25,8 +25,8 @@
              tag:  "b" "+ font=SLP:style=Bold";
              tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
              tag:  "hilight" "+ font=SLP:style=Bold";
-             tag:  "preedit" "+ underline=on underline_color=#000000FF";
-             tag:  "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF";
+             tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC"";
+             tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC"";
           }
        }
       data {
@@ -110,8 +110,8 @@
              tag:  "b" "+ font=SLP:style=Bold";
              tag:  "link" "+ color=#800 underline=on underline_color=#8008";
              tag:  "hilight" "+ font=SLP:style=Bold";
-             tag:  "preedit" "+ underline=on underline_color=#000000FF";
-             tag:  "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF";
+             tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC"";
+             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=24 color=#00000080 wrap=char";
@@ -122,8 +122,8 @@
              tag:  "b" "+ font=SLP:style=Bold";
              tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
              tag:  "hilight" "+ font=SLP:style=Bold";
-             tag:  "preedit" "+ underline=on underline_color=#000000FF";
-             tag:  "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF";
+             tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC"";
+             tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC"";
           }
        }
       data {
@@ -312,8 +312,8 @@
                                tag:  "b" "+ font=SLP:style=Bold";
                                tag:  "link" "+ color=#800 underline=on underline_color=#8008";
                                tag:  "hilight" "+ font=SLP:style=Bold";
-                               tag:  "preedit" "+ underline=on underline_color=#000000FF";
-                               tag:  "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF";
+                               tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC"";
+                               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=32 color=#00000080 wrap=mixed linesize=44";
@@ -324,8 +324,8 @@
                                tag:  "b" "+ font=SLP:style=Bold";
                                tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
                                tag:  "hilight" "+ font=SLP:style=Bold";
-                               tag:  "preedit" "+ underline=on underline_color=#000000FF";
-                               tag:  "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF";
+                               tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC"";
+                               tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC"";
                        }
                }
       data {
@@ -416,8 +416,8 @@
                                tag:  "b" "+ font=SLP:style=Bold";
                                tag:  "link" "+ color=#800 underline=on underline_color=#8008";
                                tag:  "hilight" "+ font=SLP:style=Bold";
-                               tag:  "preedit" "+ underline=on underline_color=#000000FF";
-                               tag:  "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF";
+                               tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC"";
+                               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=32 color=#00000080 wrap=char linesize=44";
@@ -428,8 +428,8 @@
                                tag:  "b" "+ font=SLP:style=Bold";
                                tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
                                tag:  "hilight" "+ font=SLP:style=Bold";
-                               tag:  "preedit" "+ underline=on underline_color=#000000FF";
-                               tag:  "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF";
+                               tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC"";
+                               tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC"";
                        }
                }
       data {
@@ -520,8 +520,8 @@
                                tag:  "b" "+ font=SLP:style=Bold";
                                tag:  "link" "+ color=#800 underline=on underline_color=#8008";
                                tag:  "hilight" "+ font=SLP:style=Bold";
-                               tag:  "preedit" "+ underline=on underline_color=#000000FF";
-                               tag:  "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF";
+                               tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC"";
+                               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=32 color=#00000080 wrap=none";
@@ -532,8 +532,8 @@
                                tag:  "b" "+ font=SLP:style=Bold";
                                tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
                                tag:  "hilight" "+ font=SLP:style=Bold";
-                               tag:  "preedit" "+ underline=on underline_color=#000000FF";
-                               tag:  "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF";
+                               tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC"";
+                               tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC"";
                        }
                }
       data {
@@ -714,8 +714,8 @@
              tag:  "b" "+ font=SLP:style=Bold";
              tag:  "link" "+ color=#800 underline=on underline_color=#8008";
              tag:  "hilight" "+ font=SLP:style=Bold";
-             tag:  "preedit" "+ underline=on underline_color=#000000FF";
-             tag:  "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF";
+             tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC"";
+             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=24 color=#00000080 wrap=none";
@@ -726,8 +726,8 @@
              tag:  "b" "+ font=SLP:style=Bold";
              tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
              tag:  "hilight" "+ font=SLP:style=Bold";
-             tag:  "preedit" "+ underline=on underline_color=#000000FF";
-             tag:  "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF";
+             tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC"";
+             tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC"";
           }
        }
       data {
@@ -1282,8 +1282,8 @@ group { name: "elm/entry/custom-password/popup";
          tag:  "b" "+ font=SLP:style=Bold";
          tag:  "link" "+ color=#800 underline=on underline_color=#8008";
          tag:  "hilight" "+ font=SLP:style=Bold";
-         tag:  "preedit" "+ underline=on underline_color=#000000FF";
-         tag:  "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC"";
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC"";
       }
       style { name: "entry_single_textblock_disabled_popup_style";
          base: "font=SLP:style=Roman font_size=24 align=center color=#00000080 wrap=none";
@@ -1294,8 +1294,8 @@ group { name: "elm/entry/custom-password/popup";
          tag:  "b" "+ font=SLP:style=Bold";
          tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
          tag:  "hilight" "+ font=SLP:style=Bold";
-         tag:  "preedit" "+ underline=on underline_color=#000000FF";
-         tag:  "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC"";
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC"";
       }
    }
    data.item: "default_font_size" "24";

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index 70e599a..4fb9ade 100755 (executable)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -259,6 +259,8 @@
 
 #define ENTRY_TEXT_COLOR_INC "#FFFFFF"
 #define ENTRY_CURSOR_COLOR_INC 42 109 140 255
+#define ENTRY_PREEDIT_BACKGROUND_COLOR_INC "#FFFFFF"
+#define ENTRY_PREEDIT_TEXT_COLOR_INC "#000000"
 
 #define PANES_DEFAULT_FIXED_SEPERATOR_NORMAL_COLOR_INC 118 118 118 255
 

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index 95e0352..ee4fe96 100755 (executable)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -282,6 +282,8 @@
 
 #define ENTRY_TEXT_COLOR_INC "#000000"
 #define ENTRY_CURSOR_COLOR_INC 217 147 26 255
+#define ENTRY_PREEDIT_BACKGROUND_COLOR_INC "#000000"
+#define ENTRY_PREEDIT_TEXT_COLOR_INC "#FFFFFF"
 
 #define PANES_DEFAULT_FIXED_SEPERATOR_NORMAL_COLOR_INC 219 219 219 255