[scroller] delete unnecesary image parts and add alias for editfield and searchbar

diff --git a/themes/widgets/entry.edc b/themes/widgets/entry.edc
index c5d0641..cb0817b 100644 (file)
--- a/themes/widgets/entry.edc
+++ b/themes/widgets/entry.edc
@@ -55,16 +55,6 @@ group { name: "elm/entry/base/default";
       item: context_menu_orientation "horizontal";
    }
    parts {
-      part { name: "entry.swallow.background";
-         type: SWALLOW;
-         description { state: "default" 0.0;
-            visible: 1;
-            rel1 { relative: 0 0; to: "elm.text"; }
-            rel2 { relative: 1 1; to: "elm.text"; }
-         }
-      }
-   }
-   parts {
       part { name: "elm.text";
          type: TEXTBLOCK;
          mouse_events: 1;
@@ -3564,6 +3554,8 @@ group { name: "elm/entry/base-password/font_color_black";
 }
 
 group { name: "elm/scroller/entry/default";
+      alias : "elm/scroller/entry/editfield";
+      alias : "elm/scroller/entry/editfield/searchbar/default";
       data {
          item: "focus_highlight" "on";
       }
@@ -3592,11 +3584,7 @@ group { name: "elm/scroller/entry/default";
          }
       }
       images {
-         image: "shelf_inset.png" COMP;
          image: "bt_sm_base2.png" COMP;
-         image: "bt_sm_shine.png" COMP;
-         image: "bt_sm_hilight.png" COMP;
-         image: "sl_bt2_2.png" COMP;
       }
       parts {
          part { name: "bg";
@@ -3696,41 +3684,6 @@ group { name: "elm/scroller/entry/default";
                }
             }
          }
-         part { name: "conf_over";
-            mouse_events:  0;
-            description { state: "default" 0.0;
-                          visible: 0;
-               rel1.to: "bg";
-               rel2.to: "bg";
-               image {
-                  normal: "shelf_inset.png";
-                  border: 7 7 7 7;
-                  middle: 0;
-               }
-               fill.smooth : 0;
-            }
-            description { state: "enabled" 0.0;
-               inherit: "default" 0.0;
-               color: 200 155 0 255;
-            }
-         }
-         part { name: "focus_highlight";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-                          visible: 0;
-               image {
-                  normal: "sl_bt2_2.png";
-                  border: 7 7 7 7;
-                  middle: 0;
-               }
-               fill.smooth : 0;
-               color: 200 155 0 0;
-            }
-            description { state: "enabled" 0.0;
-               inherit: "default" 0.0;
-               color: 200 155 0 255;
-            }
-         }
          part { name: "sb_vbar_clip_master";
             type: RECT;
             mouse_events: 0;
@@ -3800,34 +3753,6 @@ group { name: "elm/scroller/entry/default";
                }
             }
          }
-         part { name: "sb_vbar_over1";
-            clip_to: "sb_vbar_clip";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1.to: "elm.dragable.vbar";
-               rel2.relative: 1.0 0.5;
-               rel2.to: "elm.dragable.vbar";
-               image {
-                  normal: "bt_sm_hilight.png";
-                  border: 6 6 6 0;
-               }
-            }
-         }
-         part { name: "sb_vbar_over2";
-            clip_to: "sb_vbar_clip";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1.to: "elm.dragable.vbar";
-               rel2.to: "elm.dragable.vbar";
-               image {
-                  normal: "bt_sm_shine.png";
-                  border: 6 6 6 0;
-               }
-            }
-         }
-
          part { name: "sb_hbar_clip_master";
             type: RECT;
             mouse_events: 0;
@@ -3896,33 +3821,6 @@ group { name: "elm/scroller/entry/default";
                }
             }
          }
-         part { name: "sb_hbar_over1";
-            clip_to: "sb_hbar_clip";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1.to: "elm.dragable.hbar";
-               rel2.relative: 1.0 0.5;
-               rel2.to: "elm.dragable.hbar";
-               image {
-                  normal: "bt_sm_hilight.png";
-                  border: 4 4 4 0;
-               }
-            }
-         }
-         part { name: "sb_hbar_over2";
-            clip_to: "sb_hbar_clip";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1.to: "elm.dragable.hbar";
-               rel2.to: "elm.dragable.hbar";
-               image {
-                  normal: "bt_sm_shine.png";
-                  border: 4 4 4 0;
-               }
-            }
-         }
       }
       programs {
          program { name: "load";
@@ -4099,22 +3997,5 @@ group { name: "elm/scroller/entry/default";
                set_int(sbvis_timer, v);
             }
          }
-
-         program { name: "highlight_show";
-            signal: "elm,action,focus_highlight,show";
-            source: "elm";
-            action: STATE_SET "enabled" 0.0;
-            transition: ACCELERATE 0.3;
-            target: "focus_highlight";
-            target: "conf_over";
-         }
-         program { name: "highlight_hide";
-            signal: "elm,action,focus_highlight,hide";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            transition: DECELERATE 0.3;
-            target: "focus_highlight";
-            target: "conf_over";
-         }
       }
    }

diff --git a/themes/widgets/scroller.edc b/themes/widgets/scroller.edc
index 3447821..04a9e2e 100644 (file)
--- a/themes/widgets/scroller.edc
+++ b/themes/widgets/scroller.edc
@@ -470,6 +470,7 @@ group { name: "elm/scroller/base/handler";
       image: "00_scroll_bar_handler_left.png" COMP;
       image: "00_scroll_bar_handler_hor.png" COMP;
       image: "00_scroll_bar_handler_right.png" COMP;
+      image: "sl_bt2_2.png" COMP;
    }
    parts {
       part { name: "bg";