[entry] Search bar editfield include search_icon as image.

Conflicts:

	themes/inc/tizen-dark-inc.edc
	themes/inc/tizen-light-inc.edc
	themes/widgets/entry.edc

Change-Id: Ib3b4550afe0a8cfbafd1652c6cc929e14ac445ec

3 files changed, 23 insertions, 49 deletions

diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc
index 29ce7945..ab2cda25 100755
--- a/themes/inc/tizen-dark-inc.edc
+++ b/themes/inc/tizen-dark-inc.edc
@@ -602,10 +602,6 @@
 #define BUTTON_DEFAULT_STYLE_MULTILINE_BG_MIN_INC 100 80
 #define BUTTON_DEFAULT_STYLE_MULTILINE_PADDING_MIN_INC 12 0
 
-#define BUTTON_SEARCH_ICON_MIN_MAX_INC 45 45
-#define BUTTON_SEARCH_ICON_CLIPPER_DEFAULT_COLOR_INC 93 97 118 255
-#define BUTTON_SEARCH_ICON_CLIPPER_DISABLED_COLOR_INC 93 97 118 128
-
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC 54 54
 #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
@@ -998,7 +994,7 @@
 
 #define ENTRY_SEARCH_ICON_MIN_MAX_INC 45 45
 #define ENTRY_SEARCH_ICON_CLIPPER_DEFAULT_COLOR_INC 93 97 118 255
-#define ENTRY_SEARCH_ICON_CLIPPER_DISABLED_COLOR_INC 93 97 118 153
+#define ENTRY_SEARCH_ICON_CLIPPER_DISABLED_COLOR_INC 93 97 118 128
 #define ENTRY_SEARCH_ICON_LEFT_PADDING_MIN_MAX_INC 6 6
 #define ENTRY_SEARCH_ICON_RIGHT_PADDING_MIN_MAX_INC 16 16
 
diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc
index 88cc1d65..b519678e 100755
--- a/themes/inc/tizen-light-inc.edc
+++ b/themes/inc/tizen-light-inc.edc
@@ -601,10 +601,6 @@
 #define BUTTON_DEFAULT_STYLE_MULTILINE_BG_MIN_INC 100 80
 #define BUTTON_DEFAULT_STYLE_MULTILINE_PADDING_MIN_INC 12 0
 
-#define BUTTON_SEARCH_ICON_MIN_MAX_INC 45 45
-#define BUTTON_SEARCH_ICON_CLIPPER_DEFAULT_COLOR_INC 128 128 128 255
-#define BUTTON_SEARCH_ICON_CLIPPER_DISABLED_COLOR_INC 128 128 128 76
-
 #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
@@ -997,7 +993,7 @@
 
 #define ENTRY_SEARCH_ICON_MIN_MAX_INC 45 45
 #define ENTRY_SEARCH_ICON_CLIPPER_DEFAULT_COLOR_INC 128 128 128 255
-#define ENTRY_SEARCH_ICON_CLIPPER_DISABLED_COLOR_INC 128 128 128 128
+#define ENTRY_SEARCH_ICON_CLIPPER_DISABLED_COLOR_INC 128 128 128 76
 #define ENTRY_SEARCH_ICON_LEFT_PADDING_MIN_MAX_INC 6 6
 #define ENTRY_SEARCH_ICON_RIGHT_PADDING_MIN_MAX_INC 16 16
 
diff --git a/themes/widgets/entry.edc b/themes/widgets/entry.edc
index 136f5429..720472db 100644
--- a/themes/widgets/entry.edc
+++ b/themes/widgets/entry.edc
@@ -6104,6 +6104,7 @@ group { name: "elm/scroller/entry/editfield/searchbar/default";
       images {
          image: "00_search_edit_field_bg_focus.png" COMP;
          image: "00_search_edit_field_bg.png" COMP;
+         image: "00_search_icon.png" COMP;
       }
       parts {
          part { name: "focus_bg";
@@ -6166,11 +6167,11 @@ group { name: "elm/scroller/entry/editfield/searchbar/default";
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 {
-                  to_x: "focus_left_padding";
+                  to_x: "icon_padding";
                   relative: 1.0 0.0;
                }
                rel2 {
-                  to_x: "focus_left_padding";
+                  to_x: "icon_padding";
                   relative: 1.0 1.0;
                }
             }
@@ -6274,54 +6275,21 @@ group { name: "elm/scroller/entry/editfield/searchbar/default";
                }
             }
          }
-         part { name: "icon_padding";
-            type: SPACER;
+         part { name: "elm.swallow.content";
+            clip_to: "contentclipper";
             scale: 1;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               align: 0.0 0.5;
-               min: 0 0;
-               max: 0 0;
-               fixed: 1 1;
-               rel1 {
-                  to_x: "search_icon_right_padding";
-                  to_y: "bg";
-                  relative: 1.0 0.0;
-               }
-               rel2 {
-                  to_x: "search_icon_right_padding";
-                  to_y: "bg";
-                  relative: 1.0 1.0;
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: 70 0;
-               max: 70 0;
-            }
-         }
-         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_x: "search_icon_right_padding";
                   to_y: "bg";
                   relative: 1.0 0.0;
                }
                rel2 {
-                  to_x: "search_icon_right_padding";
+                  to_x: "clear_padding";
                   to_y: "bg";
-                  relative: 1.0 1.0;
+                  relative: 0.0 1.0;
                }
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
             }
          }
       }
@@ -6338,6 +6306,20 @@ group { name: "elm/scroller/entry/editfield/searchbar/default";
             action: STATE_SET "default" 0.0;
             target: "focus_image";
          }
+         program { name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "search_icon_disabler";
+            target: "search_icon.clipper";
+         }
+         program { name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "search_icon_disabler";
+            target: "search_icon.clipper";
+         }
       }
 }
 group { name: "elm/entry/base-single/datetime_popup";