[layout] Remove search_icon and eraser image in searchbar styles.

         These icon and image will be replaced by swallows of scrollable entry.

diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index 64f5d7c..9df0d54 100755 (executable)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -760,7 +760,7 @@
 #define EDITFIELD_SEARCHBAR_LEFT2_INC 0
 #define EDITFIELD_SEARCHBAR_LEFT3_INC 1
 #define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 56
-#define EDITFIELD_SEARCHBAR_RIGHT2_INC 5
+#define EDITFIELD_SEARCHBAR_RIGHT2_INC 0
 #define EDITFIELD_SEARCHBAR_BOTTOM1_SINGLE_INC 8
 #define EDITFIELD_SEARCHBAR_BOTTOM1_MULTI_INC 2
 #define EDITFIELD_SEARCHBAR_BOTTOM2_SINGLE_INC 16
@@ -825,10 +825,10 @@
 #define SEARCHBAR_LEFT_PADDING_INC 26
 #define SEARCHBAR_RIGHT_PADDING_INC 26
 #define SEARCHBAR_INPUTFIELD_BORDER_INC 12 13 12 13
-#define SEARCHBAR_LEFT_ICON_PADDING_INC 16
+#define SEARCHBAR_LEFT_ICON_PADDING_INC 0
 #define SEARCHBAR_ICON_MIN_W_INC 44
 #define SEARCHBAR_ICON_MIN_H_INC 44
-#define SEARCHBAR_LEFT_PADDING_SEARCHFIELD_INC 16
+#define SEARCHBAR_LEFT_PADDING_SEARCHFIELD_INC 9
 #define SEARCHBAR_RIGHT_PADDING_SEARCHFIELD_INC 8
 #define SEARCHBAR_SEARCH_TEXTFIELD_H_INC 60
 #define SEARCHBAR_H_INC 86

diff --git a/themes/widgets/layout.edc b/themes/widgets/layout.edc
index 0ad41eb..7e55da6 100644 (file)
--- a/themes/widgets/layout.edc
+++ b/themes/widgets/layout.edc
@@ -1153,9 +1153,7 @@ sounds {
 
 group { name: "elm/layout/searchbar/default";
    images {
-      image: "00_edit_field_clear.png" COMP;
       image: "00_search_edit_field_bg.png" COMP;
-      image: "00_search_icon.png" COMP;
    }
    parts {
       part { name: "inputfield_base";
@@ -1208,49 +1206,6 @@ group { name: "elm/layout/searchbar/default";
             rel2 { relative: 0.0 0.0; to: "bottom_right_padding"; }
          }
       }
-      part { name: "left_icon_padding_rect";
-         type: RECT;
-         scale: 1;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: SEARCHBAR_LEFT_ICON_PADDING_INC 0;
-            fixed: 1 0;
-            align: 0 0;
-            rel1.to: "inputfield_rect";
-            rel2 {
-               relative: 0.0 1.0;
-               to: "inputfield_rect";
-            }
-         }
-      }
-      part { name: "search_icon";
-         type: IMAGE;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         clip_to: "image.clipper";
-         description { state: "default" 0.0;
-            min: SEARCHBAR_ICON_MIN_W_INC SEARCHBAR_ICON_MIN_H_INC;
-            fixed: 1 1;
-            align: 0 0.5;
-            rel1 {
-               relative: 1.0 0.5;
-               to_x: "left_icon_padding_rect";
-               to_y: "inputfield_rect";
-            }
-            rel2 {
-               relative: 1.0 0.5;
-               to_x: "left_icon_padding_rect";
-               to_y: "inputfield_rect";
-            }
-            image.normal: "00_search_icon.png";
-         }
-      }
-      part { name: "image.clipper";
-         type: RECT;
-         description { state: "default" 0.0;
-            color: SEARCHBAR_ICON_COLOR_INC;
-         }
-      }
       part { name: "left_padding_search_textfield";
          type: RECT;
          scale: 1;
@@ -1260,14 +1215,12 @@ group { name: "elm/layout/searchbar/default";
             fixed: 1 0;
             align: 0.0 0.5;
             rel1 {
-               relative: 1.0 0.0;
-               to_x: "search_icon";
-               to_y: "inputfield_rect";
+               relative: 0.0 0.0;
+               to: "inputfield_rect";
             }
             rel2 {
-               relative: 1.0 1.0;
-               to_x: "search_icon";
-               to_y: "inputfield_rect";
+               relative: 0.0 1.0;
+               to: "inputfield_rect";
             }
          }
       }
@@ -1389,22 +1342,6 @@ group { name: "elm/layout/searchbar/default";
             }
          }
       }
-      part { name: "right1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 0;
-            fixed: 1 1;
-            align: 1 0;
-            rel1 {
-               relative: 1.0 0.0;
-               to: "search_textfield";
-            }
-            rel2.to: "search_textfield";
-         }
-      }
       part { name: "right2";
          type: RECT;
          scale: 1;
@@ -1511,29 +1448,6 @@ group { name: "elm/layout/searchbar/default";
             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: "Tizen:style=Roman";
-               size: ENTRY_TEXT_SIZE_INC;
-               min: 0 0;
-               align: 0.0 0.5;
-               text_class: "tizen";
-            }
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
       part {
          name: "elm.swallow.content";
          type: SWALLOW;
@@ -1548,106 +1462,15 @@ group { name: "elm/layout/searchbar/default";
             }
             rel2 {
                relative : 0.0 0.0;
-               to_x: "right1";
+               to_x: "right2";
                to_y: "bottom1";
             }
             align: 0.0 0.5;
          }
       }
-      part { name: "eraser_image";
-         scale: 1;
-         clip_to: "eraser_image.clipper";
-         description { state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_SEARCHBAR_ERASER_MINW_INC EDITFIELD_SEARCHBAR_ERASER_MINH_INC;
-            fixed: 1 1;
-            align: 1 0.5;
-            rel1 {
-               relative: 0.0 0.5;
-               to_x : "right2";
-            }
-            rel2 {
-               relative: 0.0 0.5;
-               to_x : "right2";
-            }
-            image.normal: "00_edit_field_clear.png";
-         }
-         description { state: "elm.eraser.show" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "eraser_image.clipper";
-         type: RECT;
-         description { state: "default" 0.0;
-            color: 0 0 0 0;
-         }
-         description { state: "elm.eraser.show" 0.0;
-            color: EDITFIELD_ERASER_DEFAULT_COLOR_INC;
-         }
-         description { state: "elm.eraser.pressed" 0.0;
-            color: EDITFIELD_ERASER_PRESSED_COLOR_INC;
-         }
-      }
-      part { name: "eraser";
-         type: RECT;
-         scale: 1;
-         mouse_events: 1;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_SEARCHBAR_ERASER_EVENT_MINW_INC EDITFIELD_SEARCHBAR_ERASER_EVENT_MINH_INC;
-            fixed: 1 1;
-            align: 1 0.5;
-            color: 0 0 0 0;
-            rel1 {
-               relative: 0.0 0.5;
-               to_x : "right2";
-            }
-            rel2 {
-               relative: 0.0 0.5;
-               to_x : "right2";
-            }
-         }
-         description { state: "elm.eraser.show" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
    }
    programs {
       program {
-         name: "guidetext_show";
-         signal: "elm,state,guidetext,show";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.guidetext";
-      }
-      program {
-         name: "guidetext_hide";
-         signal: "elm,state,guidetext,hide";
-         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: "eraser_image";
-         target: "eraser_image.clipper";
-         target: "eraser";
-      }
-      program {
-         name: "eraser_hide";
-         signal: "elm,state,eraser,hide";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "eraser_image";
-         target: "eraser_image.clipper";
-         target: "eraser";
-      }
-      program {
          name: "label_show";
          signal: "elm,state,title,show";
          source: "elm";
@@ -1670,17 +1493,6 @@ group { name: "elm/layout/searchbar/default";
          target: "bottom3";
       }
      program {
-         name: "eraser_clicked";
-         signal: "mouse,clicked,1";
-         source: "eraser";
-         action: SIGNAL_EMIT "elm,eraser,clicked" "elm";
-         after: "eraser_sound";
-      }
-      program {
-         name: "eraser_sound";
-         action: PLAY_SAMPLE "touch_sound" 1.0;
-      }
-     program {
          name: "bg_clicked";
          signal: "mouse,clicked,1";
          source: "search_textfield";
@@ -1692,34 +1504,13 @@ group { name: "elm/layout/searchbar/default";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-     program { name: "mouse_click";
-         signal: "mouse,clicked,1";
-         source: "search_icon";
-         action: SIGNAL_EMIT "elm,action,click" "";
-     }
-     program {
-         name: "eraser_pressed";
-         signal: "mouse,down,1";
-         source: "eraser";
-         action: STATE_SET "elm.eraser.pressed" 0.0;
-         target: "eraser_image.clipper";
-     }
-     program {
-         name: "eraser_unpressed";
-         signal: "mouse,up,1";
-         source: "eraser";
-         action: STATE_SET "elm.eraser.show" 0.0;
-         target: "eraser_image.clipper";
-      }
    }
 }
 
 group { name: "elm/layout/searchbar/cancel_button";
    images {
-      image: "00_edit_field_clear.png" COMP;
       image: "00_search_edit_field_bg.png" COMP;
       image: "00_search_edit_field_bg_focus.png" COMP;
-      image: "00_search_icon.png" COMP;
    }
    parts {
      part { name: "top_padding_rect";
@@ -1861,34 +1652,6 @@ group { name: "elm/layout/searchbar/cancel_button";
             }
          }
       }
-      part { name: "search_icon";
-         type: IMAGE;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         clip_to: "image.clipper";
-         description { state: "default" 0.0;
-            min: SEARCHBAR_ICON_MIN_W_INC SEARCHBAR_ICON_MIN_H_INC;
-            fixed: 1 1;
-            align: 0 0.5;
-            rel1 {
-               relative: 1.0 0.5;
-               to_x: "left_icon_padding_rect";
-               to_y: "inputfield_rect";
-            }
-            rel2 {
-               relative: 1.0 0.5;
-               to_x: "left_icon_padding_rect";
-               to_y: "inputfield_rect";
-            }
-            image.normal: "00_search_icon.png";
-         }
-      }
-      part { name: "image.clipper";
-         type: RECT;
-         description { state: "default" 0.0;
-            color: SEARCHBAR_ICON_COLOR_INC;
-         }
-      }
       part { name: "left_padding_search_textfield";
          type: RECT;
          scale: 1;
@@ -1898,14 +1661,12 @@ group { name: "elm/layout/searchbar/cancel_button";
             fixed: 1 0;
             align: 0.0 0.5;
             rel1 {
-               relative: 1.0 0.0;
-               to_x: "search_icon";
-               to_y: "inputfield_rect";
+               relative: 0.0 0.0;
+               to: "inputfield_rect";
             }
             rel2 {
-               relative: 1.0 1.0;
-               to_x: "search_icon";
-               to_y: "inputfield_rect";
+               relative: 0.0 1.0;
+               to: "inputfield_rect";
             }
          }
       }
@@ -2048,22 +1809,6 @@ group { name: "elm/layout/searchbar/cancel_button";
             }
          }
       }
-      part { name: "right1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 0;
-            fixed: 1 1;
-            align: 1 0;
-            rel1 {
-               relative: 1.0 0.0;
-               to: "search_textfield";
-            }
-            rel2.to: "search_textfield";
-         }
-      }
       part { name: "right2";
          type: RECT;
          scale: 1;
@@ -2173,29 +1918,6 @@ group { name: "elm/layout/searchbar/cancel_button";
             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: "Tizen:style=Roman";
-               size: ENTRY_TEXT_SIZE_INC;
-               min: 0 0;
-               align: 0.0 0.5;
-               text_class: "tizen";
-            }
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
       part {
          name: "elm.swallow.content";
          type: SWALLOW;
@@ -2210,106 +1932,15 @@ group { name: "elm/layout/searchbar/cancel_button";
             }
             rel2 {
                relative : 0.0 0.0;
-               to_x: "right1";
+               to_x: "right2";
                to_y: "bottom1";
             }
             align: 0.0 0.5;
          }
       }
-      part { name: "eraser_image";
-         scale: 1;
-         clip_to: "eraser_image.clipper";
-         description { state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_SEARCHBAR_ERASER_MINW_INC EDITFIELD_SEARCHBAR_ERASER_MINH_INC;
-            fixed: 1 1;
-            align: 1 0.5;
-            rel1 {
-               relative: 0.0 0.5;
-               to_x : "right2";
-            }
-            rel2 {
-               relative: 0.0 0.5;
-               to_x : "right2";
-            }
-            image.normal: "00_edit_field_clear.png";
-         }
-         description { state: "elm.eraser.show" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "eraser_image.clipper";
-         type: RECT;
-         description { state: "default" 0.0;
-            color: 0 0 0 0;
-         }
-         description { state: "elm.eraser.show" 0.0;
-            color: EDITFIELD_ERASER_DEFAULT_COLOR_INC;
-         }
-         description { state: "elm.eraser.pressed" 0.0;
-            color: EDITFIELD_ERASER_PRESSED_COLOR_INC;
-         }
-      }
-      part { name: "eraser";
-         type: RECT;
-         scale: 1;
-         mouse_events: 1;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_SEARCHBAR_ERASER_EVENT_MINW_INC EDITFIELD_SEARCHBAR_ERASER_EVENT_MINH_INC;
-            fixed: 1 1;
-            align: 1 0.5;
-            color: 0 0 0 0;
-            rel1 {
-               relative: 0.0 0.5;
-               to_x : "right2";
-            }
-            rel2 {
-               relative: 0.0 0.5;
-               to_x : "right2";
-            }
-         }
-         description { state: "elm.eraser.show" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
    }
    programs {
       program {
-         name: "guidetext_show";
-         signal: "elm,state,guidetext,show";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.guidetext";
-      }
-      program {
-         name: "guidetext_hide";
-         signal: "elm,state,guidetext,hide";
-         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: "eraser_image";
-         target: "eraser_image.clipper";
-         target: "eraser";
-      }
-      program {
-         name: "eraser_hide";
-         signal: "elm,state,eraser,hide";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "eraser_image";
-         target: "eraser_image.clipper";
-         target: "eraser";
-      }
-      program {
          name: "label_show";
          signal: "elm,state,title,show";
          source: "elm";
@@ -2331,17 +1962,6 @@ group { name: "elm/layout/searchbar/cancel_button";
          target: "bottom2";
          target: "bottom3";
       }
-     program {
-         name: "eraser_clicked";
-         signal: "mouse,clicked,1";
-         source: "eraser";
-         action: SIGNAL_EMIT "elm,eraser,clicked" "elm";
-         after: "eraser_sound";
-      }
-      program {
-         name: "eraser_sound";
-         action: PLAY_SAMPLE "touch_sound" 1.0;
-      }
       program {
          name: "sound_play";
          signal: "mouse,clicked,1";
@@ -2393,20 +2013,6 @@ group { name: "elm/layout/searchbar/cancel_button";
          source: "search_icon";
          action: SIGNAL_EMIT "elm,action,click" "";
       }
-      program {
-         name: "eraser_pressed";
-         signal: "mouse,down,1";
-         source: "eraser";
-         action: STATE_SET "elm.eraser.pressed" 0.0;
-         target: "eraser_image.clipper";
-      }
-      program {
-         name: "eraser_unpressed";
-         signal: "mouse,up,1";
-         source: "eraser";
-         action: STATE_SET "elm.eraser.show" 0.0;
-         target: "eraser_image.clipper";
-      }
    }
 }