[entry] Fix search_icon locate outside of scroll

Conflicts:

	themes/widgets/entry.edc

Change-Id: Iece2595e90ef563878102831186abb759228ef18

diff --git a/themes/widgets/entry.edc b/themes/widgets/entry.edc
index e406f1b..993c9ec 100644 (file)
--- a/themes/widgets/entry.edc
+++ b/themes/widgets/entry.edc
@@ -6166,6 +6166,83 @@ group { name: "elm/scroller/entry/editfield/searchbar/default";
                }
             }
          }
+         part { name: "search_icon_left_padding";
+            type: SPACER;
+            description { state: "default" 0.0;
+               min: ENTRY_SEARCH_ICON_LEFT_PADDING_MIN_MAX_INC;
+               max: ENTRY_SEARCH_ICON_LEFT_PADDING_MIN_MAX_INC;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  to_x: "focus_left_padding";
+                  relative: 1.0 0.0;
+               }
+               rel2 {
+                  to_x: "focus_left_padding";
+                  relative: 1.0 1.0;
+               }
+            }
+         }
+         part { name: "search_icon";
+            type: IMAGE;
+            mouse_events: 0;
+            repeat_events: 1;
+            clip_to: "search_icon.clipper";
+            description { state: "default" 0.0;
+               min: ENTRY_SEARCH_ICON_MIN_MAX_INC;
+               max: ENTRY_SEARCH_ICON_MIN_MAX_INC;
+               fixed: 1 1;
+               align: 0.0 0.5;
+               image.normal: "00_search_icon.png";
+               rel1 {
+                  to_x: "search_icon_left_padding";
+                  relative: 1.0 0.0;
+               }
+               rel2 {
+                  to_x: "search_icon_left_padding";
+                  relative: 1.0 1.0;
+               }
+            }
+         }
+         part { name: "search_icon_right_padding";
+            type: SPACER;
+            description { state: "default" 0.0;
+               min: ENTRY_SEARCH_ICON_RIGHT_PADDING_MIN_MAX_INC;
+               max: ENTRY_SEARCH_ICON_RIGHT_PADDING_MIN_MAX_INC;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  to_x: "search_icon";
+                  relative: 1.0 0.0;
+               }
+               rel2 {
+                  to_x: "search_icon";
+                  relative: 1.0 1.0;
+               }
+            }
+         }
+         part { name: "search_icon.clipper";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: ENTRY_SEARCH_ICON_CLIPPER_DEFAULT_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               color: ENTRY_SEARCH_ICON_CLIPPER_DISABLED_COLOR_INC;
+            }
+         }
+         part { name: "search_icon_disabler";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: 0 0 0 0;
+               rel1.to: "search_icon";
+               rel2.to: "search_icon";
+               visible: 0;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "focus_image";
             scale: 1;
             mouse_events: 0;
@@ -6205,6 +6282,56 @@ group { name: "elm/scroller/entry/editfield/searchbar/default";
                }
             }
          }
+         part { name: "icon_padding";
+            type: SPACER;
+            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_y: "bg";
+                  relative: 1.0 1.0;
+               }
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
       }
       programs {
          program { name: "action_focus";