[entry] Remove clear swallow in all of not editfield style entry.

diff --git a/themes/widgets/entry.edc b/themes/widgets/entry.edc
index ae5ef73..eb0f179 100644 (file)
--- a/themes/widgets/entry.edc
+++ b/themes/widgets/entry.edc
@@ -30,15 +30,6 @@
       image: "00_eidt_field_bg.png" COMP; \
    }
 
-#define ENTRY_TEXTBLOCK_DEFAULT_REL \
-   rel1 { \
-      relative: 0.0 0.0; \
-   } \
-   rel2 { \
-      to_x: "clear_padding"; \
-      relative: 0.0 1.0; \
-   }
-
 #define ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL \
    rel1 { \
       to_x: "focus_left_padding"; \
@@ -49,53 +40,11 @@
       relative: 0.0 1.0; \
    }
 
-#define ENTRY_SWALLOW_SCRIPT_PUBLIC \
+#define ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC \
    script { \
       public scroll_enabled; \
    }
 
-#define ENTRY_SWALLOW_PARTS \
-   part { name: "clear_padding"; \
-      type: SPACER; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         align: 1.0 0.5; \
-         min: 0 0; \
-         max: 0 0; \
-         fixed: 1 0; \
-         rel1 { \
-            relative: 1.0 0.0; \
-         } \
-         rel2 { \
-            relative: 1.0 1.0; \
-         } \
-      } \
-      description { state: "visible" 0.0; \
-         inherit: "default" 0.0; \
-         min: 70 0; \
-         max: 70 0; \
-      } \
-   } \
-   part { name: "elm.swallow.clear"; \
-      type: SWALLOW; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         align: 1.0 0.5; \
-         fixed: 1 1; \
-         rel1 { \
-            relative: 1.0 0.0; \
-         } \
-         rel2 { \
-            relative: 1.0 1.0; \
-         } \
-         visible: 0; \
-      } \
-      description { state: "visible" 0.0; \
-         inherit: "default" 0.0; \
-         visible: 1; \
-      } \
-   }
-
 #define ENTRY_EDITFIELD_SWALLOW_PARTS \
    part { name: "clear_padding"; \
       type: SPACER; \
@@ -234,46 +183,6 @@
       } \
    }
 
-#define ENTRY_SWALLOW_PROGRAMS \
-   program { name: "scroll_enabled"; \
-      signal: "elm,state,scroll,enabled"; \
-      source: "*"; \
-      script { \
-         set_int(scroll_enabled, 1); \
-      } \
-   } \
-   program { name: "scroll_disabled"; \
-      signal: "elm,state,scroll,disabled"; \
-      source: "*"; \
-      script { \
-         set_int(scroll_enabled, 0); \
-      } \
-   } \
-   program { name: "clear_show"; \
-      signal: "elm,state,clear,visible"; \
-      source: "*"; \
-      script { \
-         new v; \
-         v = get_int(scroll_enabled); \
-         if (!v) { \
-            set_state(PART:"elm.swallow.clear", "visible", 0.0); \
-            set_state(PART:"clear_padding", "visible", 0.0); \
-         } \
-      } \
-   } \
-   program { name: "clear_hide"; \
-      signal: "elm,state,clear,hidden"; \
-      source: "*"; \
-      script { \
-         new v; \
-         v = get_int(scroll_enabled); \
-         if (!v) { \
-            set_state(PART:"elm.swallow.clear", "default", 0.0); \
-            set_state(PART:"clear_padding", "default", 0.0); \
-         } \
-      } \
-   }
-
 #define ENTRY_EDITFIELD_SWALLOW_PROGRAMS \
    program { name: "scroll_enabled"; \
       signal: "elm,state,scroll,enabled"; \
@@ -448,7 +357,6 @@ group { name: "elm/entry/base/default";
                min: 0 1;
                align: 0.0 0.0;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -458,9 +366,7 @@ group { name: "elm/entry/base/default";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -497,7 +403,6 @@ group { name: "elm/entry/base/default";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
    }
 }
 
@@ -598,7 +503,6 @@ group { name: "elm/entry/base-charwrap/default";
                min: 0 1;
                align: 0.0 0.0;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -608,9 +512,7 @@ group { name: "elm/entry/base-charwrap/default";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
         program { name: "focus";
         signal: "load";
@@ -647,7 +549,6 @@ group { name: "elm/entry/base-charwrap/default";
         source: "elm.text";
         action: PLAY_SAMPLE "touch_sound" 1.0;
      }
-     ENTRY_SWALLOW_PROGRAMS
   }
 }
 
@@ -701,7 +602,6 @@ group { name: "elm/entry/base-nowrap/default";
                min: 1 1;
                align: 0.0 0.0;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -711,9 +611,7 @@ group { name: "elm/entry/base-nowrap/default";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -750,7 +648,6 @@ group { name: "elm/entry/base-nowrap/default";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
    }
 }
 
@@ -872,7 +769,7 @@ group { name: "elm/entry/base/editfield";
       }
       ENTRY_EDITFIELD_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
+   ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -1031,7 +928,7 @@ group { name: "elm/entry/base-charwrap/editfield";
       }
       ENTRY_EDITFIELD_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
+   ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -1186,7 +1083,7 @@ group { name: "elm/entry/base-single/editfield";
       }
       ENTRY_EDITFIELD_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
+   ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -1336,7 +1233,7 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
       }
       ENTRY_EDITFIELD_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
+   ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -1474,7 +1371,6 @@ group { name: "elm/entry/base-single/default";
                max: 0 0;
                align: 0.0 0.5;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -1483,9 +1379,7 @@ group { name: "elm/entry/base-single/default";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -1522,7 +1416,6 @@ group { name: "elm/entry/base-single/default";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
    }
 }
 
@@ -1967,7 +1860,6 @@ group { name: "elm/entry/base-noedit/default";
                  min: 1 1;
                   max: 0 1;
               }
-               ENTRY_TEXTBLOCK_DEFAULT_REL
            }
            description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -1976,9 +1868,7 @@ group { name: "elm/entry/base-noedit/default";
               }
            }
         }
-         ENTRY_SWALLOW_PARTS
       }
-      ENTRY_SWALLOW_SCRIPT_PUBLIC
       programs {
         program { name: "focus";
             signal: "load";
@@ -2015,7 +1905,6 @@ group { name: "elm/entry/base-noedit/default";
             source: "elm.text";
             action: PLAY_SAMPLE "touch_sound" 1.0;
          }
-         ENTRY_SWALLOW_PROGRAMS
       }
    }
 
@@ -2115,7 +2004,6 @@ group { name: "elm/entry/base-password/popup";
                min: 1 1;
                max: 0 1;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -2124,9 +2012,7 @@ group { name: "elm/entry/base-password/popup";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -2163,7 +2049,6 @@ group { name: "elm/entry/base-password/popup";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
    }
 }
 
@@ -4691,7 +4576,6 @@ group { name: "elm/entry/base-single/multibuttonentry";
                min: 1 1;
                max: 0 1;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -4700,9 +4584,7 @@ group { name: "elm/entry/base-single/multibuttonentry";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -4739,7 +4621,6 @@ group { name: "elm/entry/base-single/multibuttonentry";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
    }
 }
 group { name: "elm/entry/base/font_color_black";
@@ -4846,7 +4727,6 @@ group { name: "elm/entry/base/font_color_black";
                style: "font_color_black_textblock_style";
                min: 0 1;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -4856,9 +4736,7 @@ group { name: "elm/entry/base/font_color_black";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -4895,7 +4773,6 @@ group { name: "elm/entry/base/font_color_black";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
    }
 }
 
@@ -5103,7 +4980,6 @@ group { name: "elm/entry/base-charwrap/font_color_black";
                style: "font_color_black_textblock_char_wrap_style";
                min: 0 1;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -5113,9 +4989,7 @@ group { name: "elm/entry/base-charwrap/font_color_black";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -5152,7 +5026,6 @@ group { name: "elm/entry/base-charwrap/font_color_black";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
    }
 }
 
@@ -5259,7 +5132,6 @@ group { name: "elm/entry/base-single/font_color_black";
                min: 1 1;
                max: 0 1;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -5268,9 +5140,7 @@ group { name: "elm/entry/base-single/font_color_black";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -5307,7 +5177,6 @@ group { name: "elm/entry/base-single/font_color_black";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
    }
 }
 
@@ -5478,7 +5347,6 @@ group { name: "elm/entry/base-single/font_color_black/tizen_text_class";
             text {
                style: "tizen_text_class_single_textblock_style";
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -5540,7 +5408,6 @@ group { name: "elm/entry/base-password/font_color_black";
                min: 1 1;
                max: 0 1;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -5549,9 +5416,7 @@ group { name: "elm/entry/base-password/font_color_black";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -5588,7 +5453,6 @@ group { name: "elm/entry/base-password/font_color_black";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
    }
 }