[Button] Apply shadow effect for button.
authorAmit Kamboj <amit.kamboj@samsung.com>
Tue, 2 Jul 2013 07:02:31 +0000 (12:32 +0530)
committerSungho Kwak <sungho1.kwak@samsung.com>
Thu, 4 Jul 2013 07:18:13 +0000 (16:18 +0900)
Change-Id: If12f480d4072186228688a3ede5cb3d167359731

29 files changed:
themes/images/HD/dark/Controls/Button/00_button_add_press.png [deleted file]
themes/images/HD/dark/Controls/Button/00_button_call_press.png [deleted file]
themes/images/HD/dark/Controls/Button/00_button_contact_press.png [deleted file]
themes/images/HD/dark/Controls/Button/00_button_delete_press.png [deleted file]
themes/images/HD/dark/Controls/Button/00_button_expand_cancel_press.png [deleted file]
themes/images/HD/dark/Controls/Button/00_button_expand_closed_press.png [deleted file]
themes/images/HD/dark/Controls/Button/00_button_expand_opened_press.png [deleted file]
themes/images/HD/dark/Controls/Button/00_button_expand_send_press.png [deleted file]
themes/images/HD/dark/Controls/Button/00_button_info_press.png [deleted file]
themes/images/HD/dark/Controls/Button/00_button_left_press.png [deleted file]
themes/images/HD/dark/Controls/Button/00_button_rename_press.png [deleted file]
themes/images/HD/dark/Controls/Button/00_button_right_press.png [deleted file]
themes/images/HD/dark/Controls/Button/00_button_warning_press.png [deleted file]
themes/images/HD/light/Controls/Button/00_button_add_press.png [deleted file]
themes/images/HD/light/Controls/Button/00_button_call_press.png [deleted file]
themes/images/HD/light/Controls/Button/00_button_contact_press.png [deleted file]
themes/images/HD/light/Controls/Button/00_button_delete_press.png [deleted file]
themes/images/HD/light/Controls/Button/00_button_expand_cancel_press.png [deleted file]
themes/images/HD/light/Controls/Button/00_button_expand_closed_press.png [deleted file]
themes/images/HD/light/Controls/Button/00_button_expand_opened_press.png [deleted file]
themes/images/HD/light/Controls/Button/00_button_expand_send_press.png [deleted file]
themes/images/HD/light/Controls/Button/00_button_info_press.png [deleted file]
themes/images/HD/light/Controls/Button/00_button_left_press.png [deleted file]
themes/images/HD/light/Controls/Button/00_button_rename_press.png [deleted file]
themes/images/HD/light/Controls/Button/00_button_right_press.png [deleted file]
themes/images/HD/light/Controls/Button/00_button_warning_press.png [deleted file]
themes/inc/tizen-dark-inc.edc
themes/inc/tizen-light-inc.edc
themes/widgets/button.edc

diff --git a/themes/images/HD/dark/Controls/Button/00_button_add_press.png b/themes/images/HD/dark/Controls/Button/00_button_add_press.png
deleted file mode 100644 (file)
index 47417c9..0000000
Binary files a/themes/images/HD/dark/Controls/Button/00_button_add_press.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/Button/00_button_call_press.png b/themes/images/HD/dark/Controls/Button/00_button_call_press.png
deleted file mode 100644 (file)
index a374e6d..0000000
Binary files a/themes/images/HD/dark/Controls/Button/00_button_call_press.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/Button/00_button_contact_press.png b/themes/images/HD/dark/Controls/Button/00_button_contact_press.png
deleted file mode 100644 (file)
index 25f07f0..0000000
Binary files a/themes/images/HD/dark/Controls/Button/00_button_contact_press.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/Button/00_button_delete_press.png b/themes/images/HD/dark/Controls/Button/00_button_delete_press.png
deleted file mode 100644 (file)
index b1ce778..0000000
Binary files a/themes/images/HD/dark/Controls/Button/00_button_delete_press.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/Button/00_button_expand_cancel_press.png b/themes/images/HD/dark/Controls/Button/00_button_expand_cancel_press.png
deleted file mode 100644 (file)
index 4dd5215..0000000
Binary files a/themes/images/HD/dark/Controls/Button/00_button_expand_cancel_press.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/Button/00_button_expand_closed_press.png b/themes/images/HD/dark/Controls/Button/00_button_expand_closed_press.png
deleted file mode 100644 (file)
index ac3aef3..0000000
Binary files a/themes/images/HD/dark/Controls/Button/00_button_expand_closed_press.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/Button/00_button_expand_opened_press.png b/themes/images/HD/dark/Controls/Button/00_button_expand_opened_press.png
deleted file mode 100644 (file)
index 9d17f5a..0000000
Binary files a/themes/images/HD/dark/Controls/Button/00_button_expand_opened_press.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/Button/00_button_expand_send_press.png b/themes/images/HD/dark/Controls/Button/00_button_expand_send_press.png
deleted file mode 100644 (file)
index d60d26d..0000000
Binary files a/themes/images/HD/dark/Controls/Button/00_button_expand_send_press.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/Button/00_button_info_press.png b/themes/images/HD/dark/Controls/Button/00_button_info_press.png
deleted file mode 100644 (file)
index 3b57fd2..0000000
Binary files a/themes/images/HD/dark/Controls/Button/00_button_info_press.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/Button/00_button_left_press.png b/themes/images/HD/dark/Controls/Button/00_button_left_press.png
deleted file mode 100644 (file)
index baa8955..0000000
Binary files a/themes/images/HD/dark/Controls/Button/00_button_left_press.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/Button/00_button_rename_press.png b/themes/images/HD/dark/Controls/Button/00_button_rename_press.png
deleted file mode 100644 (file)
index 5c87a4c..0000000
Binary files a/themes/images/HD/dark/Controls/Button/00_button_rename_press.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/Button/00_button_right_press.png b/themes/images/HD/dark/Controls/Button/00_button_right_press.png
deleted file mode 100644 (file)
index 93e3395..0000000
Binary files a/themes/images/HD/dark/Controls/Button/00_button_right_press.png and /dev/null differ
diff --git a/themes/images/HD/dark/Controls/Button/00_button_warning_press.png b/themes/images/HD/dark/Controls/Button/00_button_warning_press.png
deleted file mode 100644 (file)
index 057b20f..0000000
Binary files a/themes/images/HD/dark/Controls/Button/00_button_warning_press.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/Button/00_button_add_press.png b/themes/images/HD/light/Controls/Button/00_button_add_press.png
deleted file mode 100644 (file)
index 47417c9..0000000
Binary files a/themes/images/HD/light/Controls/Button/00_button_add_press.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/Button/00_button_call_press.png b/themes/images/HD/light/Controls/Button/00_button_call_press.png
deleted file mode 100644 (file)
index a374e6d..0000000
Binary files a/themes/images/HD/light/Controls/Button/00_button_call_press.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/Button/00_button_contact_press.png b/themes/images/HD/light/Controls/Button/00_button_contact_press.png
deleted file mode 100644 (file)
index 25f07f0..0000000
Binary files a/themes/images/HD/light/Controls/Button/00_button_contact_press.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/Button/00_button_delete_press.png b/themes/images/HD/light/Controls/Button/00_button_delete_press.png
deleted file mode 100644 (file)
index b1ce778..0000000
Binary files a/themes/images/HD/light/Controls/Button/00_button_delete_press.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/Button/00_button_expand_cancel_press.png b/themes/images/HD/light/Controls/Button/00_button_expand_cancel_press.png
deleted file mode 100644 (file)
index 4dd5215..0000000
Binary files a/themes/images/HD/light/Controls/Button/00_button_expand_cancel_press.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/Button/00_button_expand_closed_press.png b/themes/images/HD/light/Controls/Button/00_button_expand_closed_press.png
deleted file mode 100644 (file)
index ac3aef3..0000000
Binary files a/themes/images/HD/light/Controls/Button/00_button_expand_closed_press.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/Button/00_button_expand_opened_press.png b/themes/images/HD/light/Controls/Button/00_button_expand_opened_press.png
deleted file mode 100644 (file)
index 9d17f5a..0000000
Binary files a/themes/images/HD/light/Controls/Button/00_button_expand_opened_press.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/Button/00_button_expand_send_press.png b/themes/images/HD/light/Controls/Button/00_button_expand_send_press.png
deleted file mode 100644 (file)
index d60d26d..0000000
Binary files a/themes/images/HD/light/Controls/Button/00_button_expand_send_press.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/Button/00_button_info_press.png b/themes/images/HD/light/Controls/Button/00_button_info_press.png
deleted file mode 100644 (file)
index 3b57fd2..0000000
Binary files a/themes/images/HD/light/Controls/Button/00_button_info_press.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/Button/00_button_left_press.png b/themes/images/HD/light/Controls/Button/00_button_left_press.png
deleted file mode 100644 (file)
index baa8955..0000000
Binary files a/themes/images/HD/light/Controls/Button/00_button_left_press.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/Button/00_button_rename_press.png b/themes/images/HD/light/Controls/Button/00_button_rename_press.png
deleted file mode 100644 (file)
index 5c87a4c..0000000
Binary files a/themes/images/HD/light/Controls/Button/00_button_rename_press.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/Button/00_button_right_press.png b/themes/images/HD/light/Controls/Button/00_button_right_press.png
deleted file mode 100644 (file)
index 93e3395..0000000
Binary files a/themes/images/HD/light/Controls/Button/00_button_right_press.png and /dev/null differ
diff --git a/themes/images/HD/light/Controls/Button/00_button_warning_press.png b/themes/images/HD/light/Controls/Button/00_button_warning_press.png
deleted file mode 100644 (file)
index 057b20f..0000000
Binary files a/themes/images/HD/light/Controls/Button/00_button_warning_press.png and /dev/null differ
index 43b9459..262738a 100755 (executable)
 #define GENLIST_LIST_UNREAD_BG_COLOR                    0 0 0 255
 
 #define BUTTON_TEXT_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC "#000000C0"
-#define BUTTON_TEXT_SHADOW_TEXTBLOCK_DIM_COLOR_INC "#FFFFFFFF"
+#define BUTTON_TEXT_SHADOW_TEXTBLOCK_DIM_COLOR_INC "#00000073"
 #define BUTTON_TEXT_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC "#000000C0"
 
 #define BUTTON_TICKER_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 192
 #define BUTTON_SEARCH_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_SEARCH_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_SEARCH_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFA99"
+
+#define BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_DIM_COLOR_INC "#00000073"
 #define BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC "#000000C0"
 #define BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC "#000000C0"
 
 #define BUTTON_SEARCH_BUTTON_CANCEL_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_SEARCH_BUTTON_CANCEL_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFA99"
 
-#define BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC 250 250 250 255
-#define BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC 250 250 250 255
-#define BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC 250 250 250 153
-
 #define BUTTON_TEXT_STYLE1_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF"
 #define BUTTON_TEXT_STYLE1_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_TEXT_STYLE1_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_POPUP_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_POPUP_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#00000099"
 
+#define BUTTON_POPUP_BUTTON_SHADOW_TEXTBLOCK_DIM_COLOR_INC "#FAFAFA73"
 #define BUTTON_POPUP_BUTTON_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAC0"
 #define BUTTON_POPUP_BUTTON_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC "#000000C0"
 
-#define BUTTON_DELETE_BUTTON_TEXT_NORMAL_COLOR_INC 250 250 250 255
-#define BUTTON_DELETE_BUTTON_TEXT_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_DELETE_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255
-#define BUTTON_DELETE_BUTTON_TEXT_DISABLED_COLOR_INC 250 250 250 153
-
-#define BUTTON_SWEEP_BUTTON_TEXT_NORMAL_COLOR_INC 250 250 250 255
-#define BUTTON_SWEEP_BUTTON_TEXT_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_SWEEP_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255
-#define BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC 250 250 250 153
-
 #define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF"
 #define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFAFF"
 
+#define BUTTON_CONTACT_BUTTON_TEXTBLOCK_DIM_NORMAL_COLOR_INC "00000073"
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC "#000000C0"
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC "#000000C0"
 
 #define BUTTON_CIRCLE_STYLE_PRESSED_COLOR_INC 250 250 250 255
 #define BUTTON_CIRCLE_STYLE_DISABLED_COLOR_INC 250 250 250 153
 
-#define BUTTON_CIRCLE_STYLE_WARNING_NORMAL_COLOR_INC 250 250 250 255
-#define BUTTON_CIRCLE_STYLE_WARNING_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_CIRCLE_STYLE_WARNING_DISABLED_COLOR_INC 250 250 250 153
+#define BUTTON_CIRCLE_STYLE_CLIPPER_DEFAULT_COLOR_INC 0 0 0 255
+#define BUTTON_CIRCLE_STYLE_ICON_CLIPPER_PRESSED_COLOR_INC 0 0 0 255
+#define BUTTON_CIRCLE_STYLE_ICON_CLIPPER_DISABLED_COLOR_INC 0 0 0 153
+
+#define BUTTON_CIRCLE_STYLE_NORMAL_TOP_OFFSET_INC 0 2
+#define BUTTON_CIRCLE_STYLE_NORMAL_BOTTOM_OFFSET_INC -1 1
+#define BUTTON_CIRCLE_STYLE_PRESSED_TOP_OFFSET_INC 0 -2
+#define BUTTON_CIRCLE_STYLE_PRESSED_BOTTOM_OFFSET_INC -1 -3
+
+#define BUTTON_WARNING_STYLE_NORMAL_COLOR_INC 250 250 250 255
+#define BUTTON_WARNING_STYLE_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_WARNING_STYLE_DISABLED_COLOR_INC 250 250 250 153
+
+#define BUTTON_WARNING_STYLE_CLIPPER_NORMAL_COLOR_INC 0 0 0 255
+#define BUTTON_WARNING_STYLE_CLIPPER_PRESSED_COLOR_INC 0 0 0 255
+#define BUTTON_WARNING_STYLE_CLIPPER_DISABLED_COLOR_INC 0 0 0 153
+
+#define BUTTON_WARNING_STYLE_NORMAL_TOP_OFFSET_INC 0 2
+#define BUTTON_WARNING_STYLE_NORMAL_BOTTOM_OFFSET_INC -1 1
+#define BUTTON_WARNING_STYLE_PRESSED_TOP_OFFSET_INC 0 -2
+#define BUTTON_WARNING_STYLE_PRESSED_BOTTOM_OFFSET_INC -1 -3
 
 #define BUTTON_EDIT_STYLE_NORMAL_COLOR_INC 250 250 250 255
 #define BUTTON_EDIT_STYLE_PRESSED_COLOR_INC 250 250 250 255
 #define BUTTON_EDIT_STYLE_DISABLED_COLOR_INC 250 250 250 153
 
+#define BUTTON_EDIT_STYLE_CLIPPER_DEFAULT_COLOR_INC 0 0 0 255
+#define BUTTON_EDIT_STYLE_ICON_CLIPPER_PRESSED_COLOR_INC 0 0 0 255
+#define BUTTON_EDIT_STYLE_ICON_CLIPPER_DISABLED_COLOR_INC 0 0 0 153
+
+#define BUTTON_EDIT_STYLE_NORMAL_TOP_OFFSET_INC 0 2
+#define BUTTON_EDIT_STYLE_NORMAL_BOTTOM_OFFSET_INC -1 1
+#define BUTTON_EDIT_STYLE_PRESSED_TOP_OFFSET_INC 0 -2
+#define BUTTON_EDIT_STYLE_PRESSED_BOTTOM_OFFSET_INC -1 -3
+
+#define BUTTON_CIRCLE_STYLE_MINUS_SHADOW_NORMAL_COLOR_INC 0 0 0 255
+#define BUTTON_CIRCLE_STYLE_MINUS_SHADOW_PRESSED_COLOR_INC 0 0 0 255
+#define BUTTON_CIRCLE_STYLE_MINUS_SHADOW_DISABLED_COLOR_INC 0 0 0 153
+
+#define BUTTON_CIRCLE_STYLE_MINUS_NORMAL_TOP_OFFSET_INC 0 2
+#define BUTTON_CIRCLE_STYLE_MINUS_NORMAL_BOTTOM_OFFSET_INC -2 1
+#define BUTTON_CIRCLE_STYLE_MINUS_PRESSED_TOP_OFFSET_INC 0 -2
+#define BUTTON_CIRCLE_STYLE_MINUS_PRESSED_BOTTOM_OFFSET_INC -1 -3
+
 #define BUTTON_CIRCLE_STYLE_MINUS_NORMAL_COLOR_INC 250 250 250 255
 #define BUTTON_CIRCLE_STYLE_MINUS_PRESSED_COLOR_INC 250 250 250 255
 #define BUTTON_CIRCLE_STYLE_MINUS_DISABLED_COLOR_INC 250 250 250 153
 
-#define BUTTON_TEXT_COLORSELECTOR_NORMAL_COLOR_INC 250 250 250 255
-#define BUTTON_TEXT_COLORSELECTOR_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_TEXT_COLORSELECTOR_DISABLED_COLOR_INC 250 250 250 128
+#define BUTTON_COLORSELECTOR_NORMAL_COLOR_INC 250 250 250 255
+#define BUTTON_COLORSELECTOR_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_COLORSELECTOR_DISABLED_COLOR_INC 250 250 250 153
+
+#define BUTTON_COLORSELECTOR_SHADOW_NORMAL_COLOR_INC 0 0 0 255
+#define BUTTON_COLORSELECTOR_SHADOW_PRESSED_COLOR_INC 0 0 0 255
+#define BUTTON_COLORSELECTOR_SHADOW_DISABLED_COLOR_INC 0 0 0 153
+
+#define BUTTON_COLORSELECTOR_NORMAL_TOP_OFFSET_INC 0 2
+#define BUTTON_COLORSELECTOR_NORMAL_BOTTOM_OFFSET_INC -1 1
+#define BUTTON_COLORSELECTOR_PRESSED_TOP_OFFSET_INC 0 -2
+#define BUTTON_COLORSELECTOR_PRESSED_BOTTOM_OFFSET_INC -1 -3
 
 #define BUTTON_DATETIME_AMPM_BG_MIN_INC 95 60
 #define BUTTON_DATETIME_AMPM_TEXT_FONT_SIZE_INC 34
 #define BUTTON_SEARCH_BUTTON_ICONONLY_BG_MIN_INC 66 66
 #define BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC 30
 
+#define BUTTON_STYLE1_NORMAL_TOP_OFFSET_INC 0 2
+#define BUTTON_STYLE1_NORMAL_BOTTOM_OFFSET_INC -1 1
+#define BUTTON_STYLE1_PRESSED_TOP_OFFSET_INC 0 -2
+#define BUTTON_STYLE1_PRESSED_BOTTOM_OFFSET_INC -1 -3
+
+#define BUTTON_STYLE1_SHADOW_NORMAL_COLOR_INC 0 0 0 255
+#define BUTTON_STYLE1_SHADOW_PRESSED_COLOR_INC 0 0 0 255
+#define BUTTON_STYLE1_SHADOW_DISABLED_COLOR_INC 0 0 0 153
+
+#define BUTTON_STYLE1_ICON_NORMAL_COLOR_INC 250 250 250 255
+#define BUTTON_STYLE1_ICON_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_STYLE1_ICON_DISABLED_COLOR_INC 250 250 250 153
+
 #define BUTTON_TEXT_STYLE1_BG_MIN_INC 100 74
 #define BUTTON_TEXT_STYLE1_VISIBLE_BG_MIN_INC 148 74
 #define BUTTON_TEXT_STYLE1_ICONONLY_BG_MIN_INC 74 74
 #define BUTTON_TEXT_STYLE1_ICONONLY_ICON_MIN_MAX_INC 45 45
 #define BUTTON_TEXT_STYLE1_FONT_SIZE_INC 36
 
-#define BUTTON_TEXT_STYLE2_BG_MIN_INC 100 74
-#define BUTTON_TEXT_STYLE2_VISIBLE_BG_MIN_INC 148 74
-#define BUTTON_TEXT_STYLE2_ICONONLY_BG_MIN_INC 74 74
-#define BUTTON_TEXT_STYLE2_BG_BORDER_INC 13 13 15 15
-#define BUTTON_TEXT_STYLE2_PADDING_MIN_INC 12 0
-#define BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC 45 45
-#define BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC 4 0
-#define BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC 45 45
-#define BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC 45 45
-#define BUTTON_TEXT_STYLE2_FONT_SIZE_INC 36
-
 #define BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC 72 72
 #define BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC 45 45
 #define BUTTON_CIRCLE_STYLE_CONTENT_MIN_MAX_INC 45 45
 #define BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC 110
 #define BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC 110
 
+#define BUTTON_POPUP_NORMAL_TOP_OFFSET_INC 0 2
+#define BUTTON_POPUP_NORMAL_BOTTOM_OFFSET_INC -1 1
+#define BUTTON_POPUP_PRESSED_TOP_OFFSET_INC 0 -2
+#define BUTTON_POPUP_PRESSED_BOTTOM_OFFSET_INC -1 -3
+
+#define BUTTON_POPUP_SHADOW_NORMAL_COLOR_INC 250 250 250 191
+#define BUTTON_POPUP_SHADOW_PRESSED_COLOR_INC 0 0 0 191
+#define BUTTON_POPUP_SHADOW_DISABLED_COLOR_INC 250 250 250 114
+
+#define BUTTON_POPUP_ICON_NORMAL_COLOR_INC 0 0 0 255
+#define BUTTON_POPUP_ICON_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_POPUP_ICON_DISABLED_COLOR_INC 0 0 0 153
+
 #define BUTTON_POPUP_BG_NORMAL_MIN_INC 30 76
 #define BUTTON_POPUP_BG_BORDER_INC 13 13 9 9
 #define BUTTON_POPUP_PADDING_MIN_INC 12 3
 #define BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC 90
 #define BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC 90
 
-#define BUTTON_SWEEP_BG_NORMAL_MIN_INC 74 74
-#define BUTTON_SWEEP_BG_BORDER_INC 13 13 15 15
-#define BUTTON_SWEEP_PADDING_MIN_INC 12 0
-#define BUTTON_SWEEP_ICON_RECT_MIN_INC 0 45
-#define BUTTON_SWEEP_PADDING_ICON_TEXT_VISIBLE_MIN_INC 8 0
-#define BUTTON_SWEEP_ICONONLY_ICON_MIN_INC 45 45
-#define BUTTON_SWEEP_TEXT_MIN_INC 50 26
-#define BUTTON_SWEEP_FONT_SIZE_INC 26
-
 #define BUTTON_EXPAND_BUTTON_TEXT_SIZE_INC 30
 
+#define BUTTON_EXPANDABLE_NORMAL_TOP_OFFSET_INC 0 2
+#define BUTTON_EXPANDABLE_NORMAL_BOTTOM_OFFSET_INC -1 1
+#define BUTTON_EXPANDABLE_PRESSED_TOP_OFFSET_INC 0 -2
+#define BUTTON_EXPANDABLE_PRESSED_BOTTOM_OFFSET_INC -1 -3
+
+#define BUTTON_EXPANDABLE_SHADOW_NORMAL_COLOR_INC 0 0 0 255
+#define BUTTON_EXPANDABLE_SHADOW_PRESSED_COLOR_INC 0 0 0 255
+#define BUTTON_EXPANDABLE_SHADOW_DISABLED_COLOR_INC 0 0 0 153
+
 #define BUTTON_EXPANDABLE_NUMBER_BG_NORMAL_MIN_MAX_INC 92 45
 #define BUTTON_EXPANDABLE_NUMBER_BG_BORDER_INC 13 13 15 15
 #define BUTTON_EXPANDABLE_NUMBER_PADDING_MIN_INC 12 1
 #define BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC 63 63
 #define BUTTON_NAVIFRAME_MORE_BOTTOM_PADDING_INC 0 17
 
-#define BUTTON_TICKERNOTI_BG_MIN_MAX_INC 154 74
-#define BUTTON_TICKERNOTI_BG_BORDER_INC 13 13 14 14
-#define BUTTON_TICKERNOTI_PADDING_MIN_INC 12 0
-#define BUTTON_TICKERNOTI_VISIBLE_ICON_RECT_MIN_MAX_INC 45 45
-#define BUTTON_TICKERNOTI_VISIBLE_PADDING_ICON_TEXT_MIN_INC 4 0
-#define BUTTON_TICKERNOTI_VISIBLE_ICON_MIN_MAX_INC 45 45
-#define BUTTON_TICKERNOTI_ICONONLY_ICON_MIN_MAX_INC 45 45
-#define BUTTON_TICKERNOTI_FONT_SIZE_INC 36
-
 #define BUTTON_COLORSELECTOR_BG_DEFAULT_MIN_INC 74 74
 #define BUTTON_COLORSELECTOR_BG_BORDER_INC 13 13 15 15
 #define BUTTON_COLORSELECTOR_IMAGE_MIN_MAX_INC 45 45
 #define BUTTON_DEFAULT_STYLE_TEXT_MIN_INC 144 36
 #define BUTTON_DEFAULT_STYLE_FONT_SIZE_INC 36
 
-#define BUTTON_DEFAULT_STYLE_MULTILINE_BG_MIN_INC 100 80
-#define BUTTON_DEFAULT_STYLE_MULTILINE_PADDING_MIN_INC 12 0
-
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC 60 60
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_IMAGE_MIN_MAX_INC 54 54
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_DEFAULT_COLOR_INC 72 93 147 255
 #define BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_PRESSED_COLOR_INC 42 57 172 255
 #define BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_DISABLED_COLOR_INC 93 97 118 153
 
+#define BUTTON_JUMP_SHADOW_NORMAL_COLOR_INC 0 0 0 255
+#define BUTTON_JUMP_SHADOW_PRESSED_COLOR_INC 0 0 0 255
+#define BUTTON_JUMP_SHADOW_DISABLED_COLOR_INC 0 0 0 153
+
+#define BUTTON_JUMP_NORMAL_COLOR_INC 250 250 250 255
+#define BUTTON_JUMP_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_JUMP_DISABLED_COLOR_INC 250 250 250 153
+
 #define BUTTON_JUMP_STYLE_BG_MIN_INC 74 74
-#define BUTTON_JUMP_ICON_NORMAL_COLOR_INC 250 250 250 255
-#define BUTTON_JUMP_ICON_PRESSED_COLOR_INC 250 150 150 255
-#define BUTTON_JUMP_ICON_DIM_COLOR_INC 250 250 250 128
+#define BUTTON_JUMP_TO_NORMAL_TOP_OFFSET_INC 0 2
+#define BUTTON_JUMP_TO_NORMAL_BOTTOM_OFFSET_INC -1 1
+#define BUTTON_JUMP_TO_PRESSED_TOP_OFFSET_INC 0 -2
+#define BUTTON_JUMP_TO_PRESSED_BOTTOM_OFFSET_INC -1 -3
 #define BUTTON_JUMP_TOP_PADDING_TO_SCROLLER_MIN_MAX_INC 26 18
 #define BUTTON_JUMP_LEFT_PADDING_TO_SCROLLER_MIN_MAX_INC 26 18
 
index fbd7548..dca9f06 100755 (executable)
 #define GENLIST_LIST_UNREAD_BG_COLOR                    250 247 242 255
 
 #define BUTTON_TEXT_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF"
-#define BUTTON_TEXT_SHADOW_TEXTBLOCK_DIM_COLOR_INC "#FAFAFAFF"
+#define BUTTON_TEXT_SHADOW_TEXTBLOCK_DIM_COLOR_INC "#FAFAFA7F"
 #define BUTTON_TEXT_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC "#000000FF"
 
 #define BUTTON_TICKER_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 192
 #define BUTTON_NUMBER_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_NUMBER_TEXTBLOCK_DISABLE_VISIBLE_COLOR_INC "#28282880"
 
-#define BUTTON_NUMBER_ICON_NORMAL_COLOR_INC 58 58 58 255
+#define BUTTON_NUMBER_ICON_NORMAL_COLOR_INC 40 40 40 255
 #define BUTTON_NUMBER_ICON_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_NUMBER_ICON_DISABLED_COLOR_INC 58 58 58 128
+#define BUTTON_NUMBER_ICON_DISABLED_COLOR_INC 40 40 40 128
 
 #define BUTTON_SEARCH_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#282828FF"
 #define BUTTON_SEARCH_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_SEARCH_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_SEARCH_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#28282880"
+
+#define BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_DIM_COLOR_INC "#0000005F"
 #define BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC "#000000C0"
 #define BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC "#000000C0"
 
 #define BUTTON_SEARCH_BUTTON_CANCEL_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_SEARCH_BUTTON_CANCEL_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFA80"
 
-#define BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC 58 58 58 255
-#define BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC 250 250 250 255
-#define BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC 58 58 58 128
-
 #define BUTTON_TEXT_STYLE1_TEXTBLOCK_NORMAL_COLOR_INC "#282828FF"
 #define BUTTON_TEXT_STYLE1_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_TEXT_STYLE1_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_POPUP_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_POPUP_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#3A3A3A80"
 
+#define BUTTON_POPUP_BUTTON_SHADOW_TEXTBLOCK_DIM_COLOR_INC "#FAFAFA7F"
 #define BUTTON_POPUP_BUTTON_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF"
 #define BUTTON_POPUP_BUTTON_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC "#000000FF"
 
-#define BUTTON_DELETE_BUTTON_TEXT_NORMAL_COLOR_INC 250 250 250 255
-#define BUTTON_DELETE_BUTTON_TEXT_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_DELETE_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255
-#define BUTTON_DELETE_BUTTON_TEXT_DISABLED_COLOR_INC 250 250 250 128
-
-#define BUTTON_SWEEP_BUTTON_TEXT_NORMAL_COLOR_INC 58 58 58 255
-#define BUTTON_SWEEP_BUTTON_TEXT_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_SWEEP_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255
-#define BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC 58 58 58 128
-
 #define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#3A3A3AFF"
 #define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFAFF"
 
+#define BUTTON_CONTACT_BUTTON_TEXTBLOCK_DIM_NORMAL_COLOR_INC "#0000007F"
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC "#000000FF"
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC "#000000FF"
 
 #define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DEFAULT_SHADOW_COLOR_INC 250 250 250 255
 #define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_PRESSED_SHADOW_COLOR_INC 0 0 0 191
 
-#define BUTTON_CIRCLE_STYLE_NORMAL_COLOR_INC 101 101 101 255
+#define BUTTON_CIRCLE_STYLE_NORMAL_COLOR_INC 40 40 40 255
 #define BUTTON_CIRCLE_STYLE_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_CIRCLE_STYLE_DISABLED_COLOR_INC 101 101 101 128
+#define BUTTON_CIRCLE_STYLE_DISABLED_COLOR_INC 40 40 40 128
+
+#define BUTTON_CIRCLE_STYLE_CLIPPER_DEFAULT_COLOR_INC 250 250 250 255
+#define BUTTON_CIRCLE_STYLE_ICON_CLIPPER_PRESSED_COLOR_INC 250 250 250 0
+#define BUTTON_CIRCLE_STYLE_ICON_CLIPPER_DISABLED_COLOR_INC 250 250 250 128
+
+#define BUTTON_CIRCLE_STYLE_NORMAL_TOP_OFFSET_INC 0 2
+#define BUTTON_CIRCLE_STYLE_NORMAL_BOTTOM_OFFSET_INC -1 1
+#define BUTTON_CIRCLE_STYLE_PRESSED_TOP_OFFSET_INC 0 0
+#define BUTTON_CIRCLE_STYLE_PRESSED_BOTTOM_OFFSET_INC -1 -1
+
+#define BUTTON_WARNING_STYLE_NORMAL_COLOR_INC 250 250 250 255
+#define BUTTON_WARNING_STYLE_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_WARNING_STYLE_DISABLED_COLOR_INC 250 250 250 128
+
+#define BUTTON_WARNING_STYLE_CLIPPER_NORMAL_COLOR_INC 250 250 250 0
+#define BUTTON_WARNING_STYLE_CLIPPER_PRESSED_COLOR_INC 250 250 250 0
+#define BUTTON_WARNING_STYLE_CLIPPER_DISABLED_COLOR_INC 250 250 250 0
+
+#define BUTTON_WARNING_STYLE_NORMAL_TOP_OFFSET_INC 0 0
+#define BUTTON_WARNING_STYLE_NORMAL_BOTTOM_OFFSET_INC -1 -1
+#define BUTTON_WARNING_STYLE_PRESSED_TOP_OFFSET_INC 0 0
+#define BUTTON_WARNING_STYLE_PRESSED_BOTTOM_OFFSET_INC -1 -1
+
+#define BUTTON_EDIT_STYLE_NORMAL_COLOR_INC 40 40 40 255
+#define BUTTON_EDIT_STYLE_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_EDIT_STYLE_DISABLED_COLOR_INC 40 40 40 128
+
+#define BUTTON_EDIT_STYLE_CLIPPER_DEFAULT_COLOR_INC 250 250 250 255
+#define BUTTON_EDIT_STYLE_ICON_CLIPPER_PRESSED_COLOR_INC 250 250 250 0
+#define BUTTON_EDIT_STYLE_ICON_CLIPPER_DISABLED_COLOR_INC 250 250 250 128
+
+#define BUTTON_EDIT_STYLE_NORMAL_TOP_OFFSET_INC 0 2
+#define BUTTON_EDIT_STYLE_NORMAL_BOTTOM_OFFSET_INC -1 1
+#define BUTTON_EDIT_STYLE_PRESSED_TOP_OFFSET_INC 0 0
+#define BUTTON_EDIT_STYLE_PRESSED_BOTTOM_OFFSET_INC -1 -1
+
+#define BUTTON_CIRCLE_STYLE_MINUS_SHADOW_NORMAL_COLOR_INC 250 250 250 0
+#define BUTTON_CIRCLE_STYLE_MINUS_SHADOW_PRESSED_COLOR_INC 250 250 250 0
+#define BUTTON_CIRCLE_STYLE_MINUS_SHADOW_DISABLED_COLOR_INC 250 250 250 0
+
+#define BUTTON_CIRCLE_STYLE_MINUS_NORMAL_TOP_OFFSET_INC 0 0
+#define BUTTON_CIRCLE_STYLE_MINUS_NORMAL_BOTTOM_OFFSET_INC -1 -1
+#define BUTTON_CIRCLE_STYLE_MINUS_PRESSED_TOP_OFFSET_INC 0 0
+#define BUTTON_CIRCLE_STYLE_MINUS_PRESSED_BOTTOM_OFFSET_INC -1 -1
 
-#define BUTTON_CIRCLE_STYLE_WARNING_NORMAL_COLOR_INC 250 250 250 255
-#define BUTTON_CIRCLE_STYLE_WARNING_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_CIRCLE_STYLE_WARNING_DISABLED_COLOR_INC 250 250 250 128
+#define BUTTON_CIRCLE_STYLE_MINUS_NORMAL_COLOR_INC 250 250 250 255
+#define BUTTON_CIRCLE_STYLE_MINUS_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_CIRCLE_STYLE_MINUS_DISABLED_COLOR_INC 250 250 250 128
 
-#define BUTTON_EDIT_STYLE_NORMAL_COLOR_INC 101 101 101 255
-#define BUTTON_EDIT_STYLE_PRESSED_COLOR_INC 255 255 255 255
-#define BUTTON_EDIT_STYLE_DISABLED_COLOR_INC 101 101 101 128
+#define BUTTON_COLORSELECTOR_NORMAL_COLOR_INC 40 40 40 255
+#define BUTTON_COLORSELECTOR_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_COLORSELECTOR_DISABLED_COLOR_INC 40 40 40 128
 
-#define BUTTON_CIRCLE_STYLE_MINUS_NORMAL_COLOR_INC 255 255 255 255
-#define BUTTON_CIRCLE_STYLE_MINUS_PRESSED_COLOR_INC 255 255 255 255
-#define BUTTON_CIRCLE_STYLE_MINUS_DISABLED_COLOR_INC 255 255 255 128
+#define BUTTON_COLORSELECTOR_SHADOW_NORMAL_COLOR_INC 250 250 250 255
+#define BUTTON_COLORSELECTOR_SHADOW_PRESSED_COLOR_INC 250 250 250 0
+#define BUTTON_COLORSELECTOR_SHADOW_DISABLED_COLOR_INC 250 250 250 128
 
-#define BUTTON_TEXT_COLORSELECTOR_NORMAL_COLOR_INC 58 58 58 255
-#define BUTTON_TEXT_COLORSELECTOR_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_TEXT_COLORSELECTOR_DISABLED_COLOR_INC 58 58 58 128
+#define BUTTON_COLORSELECTOR_NORMAL_TOP_OFFSET_INC 0 2
+#define BUTTON_COLORSELECTOR_NORMAL_BOTTOM_OFFSET_INC -1 1
+#define BUTTON_COLORSELECTOR_PRESSED_TOP_OFFSET_INC 0 -2
+#define BUTTON_COLORSELECTOR_PRESSED_BOTTOM_OFFSET_INC -1 -3
 
 #define BUTTON_DATETIME_AMPM_BG_MIN_INC 95 60
 #define BUTTON_DATETIME_AMPM_TEXT_FONT_SIZE_INC 34
 #define BUTTON_SEARCH_BUTTON_ICONONLY_BG_MIN_INC 66 66
 #define BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC 30
 
+#define BUTTON_STYLE1_NORMAL_TOP_OFFSET_INC 0 2
+#define BUTTON_STYLE1_NORMAL_BOTTOM_OFFSET_INC -1 1
+#define BUTTON_STYLE1_PRESSED_TOP_OFFSET_INC 0 -2
+#define BUTTON_STYLE1_PRESSED_BOTTOM_OFFSET_INC -1 -3
+
+#define BUTTON_STYLE1_SHADOW_NORMAL_COLOR_INC 250 250 250 255
+#define BUTTON_STYLE1_SHADOW_PRESSED_COLOR_INC 250 250 250 0
+#define BUTTON_STYLE1_SHADOW_DISABLED_COLOR_INC 250 250 250 128
+
+#define BUTTON_STYLE1_ICON_NORMAL_COLOR_INC 40 40 40 255
+#define BUTTON_STYLE1_ICON_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_STYLE1_ICON_DISABLED_COLOR_INC 40 40 40 128
+
 #define BUTTON_TEXT_STYLE1_BG_MIN_INC 100 74
 #define BUTTON_TEXT_STYLE1_VISIBLE_BG_MIN_INC 148 74
 #define BUTTON_TEXT_STYLE1_ICONONLY_BG_MIN_INC 74 74
 #define BUTTON_TEXT_STYLE1_ICONONLY_ICON_MIN_MAX_INC 45 45
 #define BUTTON_TEXT_STYLE1_FONT_SIZE_INC 36
 
-#define BUTTON_TEXT_STYLE2_BG_MIN_INC 100 74
-#define BUTTON_TEXT_STYLE2_VISIBLE_BG_MIN_INC 148 74
-#define BUTTON_TEXT_STYLE2_ICONONLY_BG_MIN_INC 74 74
-#define BUTTON_TEXT_STYLE2_BG_BORDER_INC 13 13 15 15
-#define BUTTON_TEXT_STYLE2_PADDING_MIN_INC 12 0
-#define BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC 45 45
-#define BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC 4 0
-#define BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC 45 45
-#define BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC 45 45
-#define BUTTON_TEXT_STYLE2_FONT_SIZE_INC 36
-
 #define BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC 72 72
 #define BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC 45 45
 #define BUTTON_CIRCLE_STYLE_CONTENT_MIN_MAX_INC 45 45
 #define BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC 110
 #define BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC 110
 
+#define BUTTON_POPUP_NORMAL_TOP_OFFSET_INC 0 2
+#define BUTTON_POPUP_NORMAL_BOTTOM_OFFSET_INC -1 1
+#define BUTTON_POPUP_PRESSED_TOP_OFFSET_INC 0 -2
+#define BUTTON_POPUP_PRESSED_BOTTOM_OFFSET_INC -1 -3
+
+#define BUTTON_POPUP_SHADOW_NORMAL_COLOR_INC 250 250 250 255
+#define BUTTON_POPUP_SHADOW_PRESSED_COLOR_INC 0 0 0 255
+#define BUTTON_POPUP_SHADOW_DISABLED_COLOR_INC 250 250 250 128
+
+#define BUTTON_POPUP_ICON_NORMAL_COLOR_INC 58 58 58 255
+#define BUTTON_POPUP_ICON_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_POPUP_ICON_DISABLED_COLOR_INC 58 58 58 128
+
 #define BUTTON_POPUP_BG_NORMAL_MIN_INC 30 76
 #define BUTTON_POPUP_BG_BORDER_INC 13 13 9 9
 #define BUTTON_POPUP_PADDING_MIN_INC 12 3
 #define BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC 90
 #define BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC 90
 
-#define BUTTON_SWEEP_BG_NORMAL_MIN_INC 74 74
-#define BUTTON_SWEEP_BG_BORDER_INC 13 13 15 15
-#define BUTTON_SWEEP_PADDING_MIN_INC 12 0
-#define BUTTON_SWEEP_ICON_RECT_MIN_INC 0 45
-#define BUTTON_SWEEP_PADDING_ICON_TEXT_VISIBLE_MIN_INC 8 0
-#define BUTTON_SWEEP_ICONONLY_ICON_MIN_INC 45 45
-#define BUTTON_SWEEP_TEXT_MIN_INC 50 26
-#define BUTTON_SWEEP_FONT_SIZE_INC 26
-
 #define BUTTON_EXPAND_BUTTON_TEXT_SIZE_INC 30
 
+#define BUTTON_EXPANDABLE_NORMAL_TOP_OFFSET_INC 0 2
+#define BUTTON_EXPANDABLE_NORMAL_BOTTOM_OFFSET_INC -1 1
+#define BUTTON_EXPANDABLE_PRESSED_TOP_OFFSET_INC 0 0
+#define BUTTON_EXPANDABLE_PRESSED_BOTTOM_OFFSET_INC -1 -1
+
+#define BUTTON_EXPANDABLE_SHADOW_NORMAL_COLOR_INC 250 250 250 255
+#define BUTTON_EXPANDABLE_SHADOW_PRESSED_COLOR_INC 250 250 250 0
+#define BUTTON_EXPANDABLE_SHADOW_DISABLED_COLOR_INC 250 250 250 128
+
 #define BUTTON_EXPANDABLE_NUMBER_BG_NORMAL_MIN_MAX_INC 92 45
 #define BUTTON_EXPANDABLE_NUMBER_BG_BORDER_INC 13 13 15 15
 #define BUTTON_EXPANDABLE_NUMBER_PADDING_MIN_INC 12 1
 #define BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC 63 63
 #define BUTTON_NAVIFRAME_MORE_BOTTOM_PADDING_INC 0 17
 
-#define BUTTON_TICKERNOTI_BG_MIN_MAX_INC 154 74
-#define BUTTON_TICKERNOTI_BG_BORDER_INC 13 13 14 14
-#define BUTTON_TICKERNOTI_PADDING_MIN_INC 12 0
-#define BUTTON_TICKERNOTI_VISIBLE_ICON_RECT_MIN_MAX_INC 45 45
-#define BUTTON_TICKERNOTI_VISIBLE_PADDING_ICON_TEXT_MIN_INC 4 0
-#define BUTTON_TICKERNOTI_VISIBLE_ICON_MIN_MAX_INC 45 45
-#define BUTTON_TICKERNOTI_ICONONLY_ICON_MIN_MAX_INC 45 45
-#define BUTTON_TICKERNOTI_FONT_SIZE_INC 36
-
 #define BUTTON_COLORSELECTOR_BG_DEFAULT_MIN_INC 74 74
 #define BUTTON_COLORSELECTOR_BG_BORDER_INC 13 13 15 15
 #define BUTTON_COLORSELECTOR_IMAGE_MIN_MAX_INC 45 45
 #define BUTTON_DEFAULT_STYLE_TEXT_MIN_INC 144 36
 #define BUTTON_DEFAULT_STYLE_FONT_SIZE_INC 36
 
-#define BUTTON_DEFAULT_STYLE_MULTILINE_BG_MIN_INC 100 80
-#define BUTTON_DEFAULT_STYLE_MULTILINE_PADDING_MIN_INC 12 0
-
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC 60 60
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_IMAGE_MIN_MAX_INC 54 54
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_DEFAULT_COLOR_INC 128 128 128 255
 #define BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_PRESSED_COLOR_INC 59 115 182 255
 #define BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_DISABLED_COLOR_INC 135 133 128 128
 
+#define BUTTON_JUMP_SHADOW_NORMAL_COLOR_INC 250 250 250 255
+#define BUTTON_JUMP_SHADOW_PRESSED_COLOR_INC 250 250 250 0
+#define BUTTON_JUMP_SHADOW_DISABLED_COLOR_INC 250 250 250 128
+
+#define BUTTON_JUMP_NORMAL_COLOR_INC 40 40 40 255
+#define BUTTON_JUMP_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_JUMP_DISABLED_COLOR_INC 40 40 40 128
+
 #define BUTTON_JUMP_STYLE_BG_MIN_INC 74 74
-#define BUTTON_JUMP_ICON_NORMAL_COLOR_INC 58 58 58 255
-#define BUTTON_JUMP_ICON_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_JUMP_ICON_DIM_COLOR_INC 58 58 58 128
+#define BUTTON_JUMP_TO_NORMAL_TOP_OFFSET_INC 0 2
+#define BUTTON_JUMP_TO_NORMAL_BOTTOM_OFFSET_INC -1 1
+#define BUTTON_JUMP_TO_PRESSED_TOP_OFFSET_INC 0 0
+#define BUTTON_JUMP_TO_PRESSED_BOTTOM_OFFSET_INC -1 -1
 #define BUTTON_JUMP_TOP_PADDING_TO_SCROLLER_MIN_MAX_INC 26 18
 #define BUTTON_JUMP_LEFT_PADDING_TO_SCROLLER_MIN_MAX_INC 26 18
 
index dbd82e3..3dcc7f1 100644 (file)
@@ -59,7 +59,7 @@
             tag: "tab" "\t";
          }
          style { name: "btn_base_style1_dim";
-            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_TEXTBLOCK_DISABLED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_TEXTBLOCK_DISABLED_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_TEXT_SHADOW_TEXTBLOCK_DIM_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
             tag: "br" "\n";
             tag: "ps" "ps";
             tag: "tab" "\t";
          part { name: "elm.swallow.content";
             type: SWALLOW;
             scale: 1;
-            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
                max: BUTTON_TEXT_STYLE1_ICONONLY_ICON_MIN_MAX_INC;
             }
          }
+         part { name: "elm.swallow.content.shadow.proxy";
+            type: PROXY;
+            scale: 1;
+            clip_to: "elm.swallow.content.shadow.clipper";
+            description { state: "default" 0.0;
+               source: "elm.swallow.content";
+               proxy.source_clip: 0;
+               rel1 {
+                  to: "elm.swallow.content";
+                  offset: BUTTON_STYLE1_NORMAL_TOP_OFFSET_INC;
+               }
+               rel2 {
+                  to: "elm.swallow.content";
+                  offset: BUTTON_STYLE1_NORMAL_BOTTOM_OFFSET_INC;
+               }
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               rel1 {
+                  to: "elm.swallow.content";
+                  offset: BUTTON_STYLE1_PRESSED_TOP_OFFSET_INC;
+               }
+               rel2 {
+                  to: "elm.swallow.content";
+                  offset: BUTTON_STYLE1_PRESSED_BOTTOM_OFFSET_INC;
+               }
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+            }
+         }
+         part { name: "elm.swallow.content.proxy";
+            type: PROXY;
+            scale: 1;
+            clip_to: "icon_clipper";
+            description { state: "default" 0.0;
+               source: "elm.swallow.content";
+               proxy.source_clip: 0;
+               rel1.to: "elm.swallow.content";
+               rel2.to: "elm.swallow.content";
+            }
+         }
+         part { name: "elm.swallow.content.shadow.clipper";
+            scale: 1;
+            type: RECT;
+            description { state: "default" 0.0;
+               color: BUTTON_STYLE1_SHADOW_NORMAL_COLOR_INC;
+            }
+            description { state: "clicked" 0.0;
+               color: BUTTON_STYLE1_SHADOW_PRESSED_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               color: BUTTON_STYLE1_SHADOW_DISABLED_COLOR_INC;
+            }
+         }
+         part { name: "icon_clipper";
+            scale: 1;
+            type: RECT;
+            description { state: "default" 0.0;
+               color: BUTTON_STYLE1_ICON_NORMAL_COLOR_INC;
+            }
+            description { state: "clicked" 0.0;
+               color: BUTTON_STYLE1_ICON_PRESSED_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               color: BUTTON_STYLE1_ICON_DISABLED_COLOR_INC;
+            }
+         }
          part { name: "elm.text";
             type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
-            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
                rel1 {
                color: 0 0 0 0;
             }
          }
-         part { name: "clipper";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: BUTTON_DISCLIP_NORMAL_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_DISCLIP_DISABLED_COLOR_INC;
-            }
-         }
          part { name: "disabler";
             type: RECT;
             description { state: "default" 0.0;
          program { name: "button_click_anim";
             action: STATE_SET "clicked" 0.0;
             target: "button_image";
+            target: "elm.swallow.content.shadow.proxy";
+            target: "elm.swallow.content.shadow.clipper";
+            target: "icon_clipper";
             after: "text_clicked";
          }
          program { name: "text_clicked";
                  }
                if (get_int(button_state) != BUTTON_STATE_DISABLED)
                  set_state(PART:"button_image", "default", 0.0);
+               set_state(PART:"elm.swallow.content.shadow.proxy", "default", 0.0);
+               set_state(PART:"elm.swallow.content.shadow.clipper", "default", 0.0);
+               set_state(PART:"icon_clipper", "default", 0.0);
             }
             after: button_unpress;
          }
             action: STATE_SET "disabled" 0.0;
             target: "button_image";
             target: "disabler";
-            target: "clipper";
+            target: "elm.swallow.content.shadow.proxy";
+            target: "elm.swallow.content.shadow.clipper";
+            target: "icon_clipper";
             after: "disable_text";
          }
          program { name: "disable_text";
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "button_image";
-            target: "clipper";
+            target: "elm.swallow.content.shadow.proxy";
+            target: "elm.swallow.content.shadow.clipper";
+            target: "icon_clipper";
             target: "disabler";
             after: "enable_text";
          }
             type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
-            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
                rel1 {
             type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
-            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
                fixed: 1 1;
             tag: "tab" "\t";
          }
          style { name: "btn_base_style1_delete_dim";
-            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_DELETE_TEXTBLOCK_DISABLED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_DELETE_TEXTBLOCK_DISABLED_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_TEXT_SHADOW_TEXTBLOCK_DIM_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
             tag: "br" "\n";
             tag: "ps" "ps";
             tag: "tab" "\t";
             type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
-            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
                rel1 {
             tag: "tab" "\t";
          }
          style { name: "btn_base_search_dim";
-            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_DIM_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
             tag: "br" "\n";
             tag: "ps" "ps";
             tag: "tab" "\t";
          part { name: "elm.text";
             type: TEXTBLOCK;
             mouse_events: 0;
-            clip_to: "clipper";
             scale: 1;
             description { state: "default" 0.0;
                visible: 0;
             tag: "tab" "\t";
          }
          style { name: "btn_base_search_send_dim";
-            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_SEND_TEXTBLOCK_DISABLED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_SEND_TEXTBLOCK_DISABLED_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_DIM_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
             tag: "br" "\n";
             tag: "ps" "ps";
             tag: "tab" "\t";
          part { name: "elm.text";
             type: TEXTBLOCK;
             mouse_events: 0;
-            clip_to: "clipper";
             scale: 1;
             description { state: "default" 0.0;
                visible: 0;
                }
             }
             description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_base_search_send_focus";
-               }
-            }
-         }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/search_button/cancel";
-      inherit: "elm/button/base/style1";
-      images {
-         image: "00_button_01_delete.png" COMP;
-         image: "00_button_01_delete_dim.png" COMP;
-         image: "00_button_01_delete_press.png" COMP;
-      }
-      styles{
-         style { name: "btn_base_search_cancel";
-            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_CANCEL_TEXTBLOCK_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
-            tag: "br" "\n";
-            tag: "ps" "ps";
-            tag: "tab" "\t";
-         }
-         style { name: "btn_base_search_cancel_pressed";
-            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_CANCEL_TEXTBLOCK_PRESSED_COLOR_INC" style=far_shadow,top shadow_color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
-            tag: "br" "\n";
-            tag: "ps" "ps";
-            tag: "tab" "\t";
-         }
-         style { name: "btn_base_search_cancel_dim";
-            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_CANCEL_TEXTBLOCK_DISABLED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
-            tag: "br" "\n";
-            tag: "ps" "ps";
-            tag: "tab" "\t";
-         }
-         style { name: "btn_base_search_cancel_focus";
-            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_CANCEL_TEXTBLOCK_FOCUSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
-            tag: "br" "\n";
-            tag: "ps" "ps";
-            tag: "tab" "\t";
-         }
-      }
-      parts {
-         part { name: "button_image";
-            scale: 1;
-            description { state: "default" 0.0;
-               image {
-                  normal: "00_button_01_delete.png";
-                  border: BUTTON_SEARCH_BUTTON_BG_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_delete_press.png";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_delete_dim.png";
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_delete_press.png";
-            }
-         }
-         part { name: "bg";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               min: BUTTON_SEARCH_BUTTON_BG_MIN_INC;
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_SEARCH_BUTTON_VISIBLE_BG_MIN_INC;
-            }
-            description { state: "icononly" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_SEARCH_BUTTON_ICONONLY_BG_MIN_INC;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            clip_to: "clipper";
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "padding_after_icon";
-                  to_y: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "padding_right_bottom";
-               }
-               text {
-                  style: "btn_base_search_cancel";
-                  min: 0 0;
-                  max: 1 0;
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_base_search_cancel_pressed";
-               }
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_base_search_cancel_dim";
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_base_search_cancel_focus";
-               }
-            }
-         }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-/*   group { name: "elm/button/base/style2";
-      alias: "elm/button/base/text_only/style2";
-      alias: "elm/button/base/style2/multiline";
-      data {
-         item: "focus_highlight" "on";
-      }
-      images {
-         image: "00_button_01.png" COMP;
-         image: "00_button_01_press.png" COMP;
-         image: "00_button_01_dim.png" COMP;
-         image: "00_button_01_focus.png" COMP;
-      }
-      script {
-         public button_state = BUTTON_STATE_ENABLED;
-      }
-      parts {
-         part { name: "button_image";
-            scale: 1;
-            description { state: "default" 0.0;
-               image {
-                  normal: "00_button_01.png";
-                  border: BUTTON_TEXT_STYLE2_BG_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_press.png";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_dim.png";
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_press.png";
-            }
-         }
-         part { name: "focus_image";
-            scale: 1;
-            mouse_events: 0;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1.to : "button_image";
-               rel2.to : "button_image";
-               image {
-                  normal: "00_button_01_focus.png";
-                  border: BUTTON_TEXT_STYLE2_BG_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "padding_left_top";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel2.relative: 0.0 0.0;
-               min: BUTTON_TEXT_STYLE2_PADDING_MIN_INC;
-               fixed: 1 1;
-               visible: 0;
-            }
-         }
-         part { name: "bg";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               min: BUTTON_TEXT_STYLE2_BG_MIN_INC;
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_TEXT_STYLE2_VISIBLE_BG_MIN_INC;
-            }
-            description { state: "icononly" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_TEXT_STYLE2_ICONONLY_BG_MIN_INC;
-            }
-         }
-         part { name: "padding_right_bottom";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 1.0 1.0;
-               rel1.relative: 1.0 1.0;
-               min: BUTTON_TEXT_STYLE2_PADDING_MIN_INC;
-               fixed: 1 1;
-               visible: 0;
-            }
-         }
-         part { name: "icon_rect";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 0;
-               min: 0 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "padding_left_top";
-                  to_y: "padding_right_bottom";
-               }
-               align: 0.0 0.5;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC;
-               max: BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC;
-            }
-            description { state: "icononly" 0.0;
-               inherit: "default" 0.0;
-            }
-         }
-         part { name: "padding_after_icon";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0; //when only icon or no icon is there
-               visible: 0;
-               min: 0 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to: "icon_rect";
-               }
-               rel2.to: "icon_rect";
-               align: 0.0 0.0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
-            }
-            description { state: "icononly" 0.0;
-               inherit: "default" 0.0;
-            }
-         }
-         part { name: "padding_before_text";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0; //when only icon or no icon is there
-               align: 1.0 0.5;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.text";
-                  to_y: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.text";
-                  to_y: "padding_right_bottom";
-               }
-               fixed: 1 0;
-               min: BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
-               visible: 0;
-            }
-         }
-         part { name: "elm.swallow.content";
-            type: SWALLOW;
-            scale: 1;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               visible: 0;
-               align: 0.0 0.5;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "padding_left_top";
-                  to_y: "padding_right_bottom";
-               }
-               fixed: 1 0;
-            }
-            description { state: "visible" 0.0;
-               fixed: 1 0;
-               min: BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC;
-               max: BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC;
-               align: 1.0 0.5;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "padding_before_text";
-                  to_y: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "padding_before_text";
-                  to_y: "padding_right_bottom";
-               }
-            }
-            description { state: "icononly" 0.0;
-               min: BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC;
-               max: BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            clip_to: "clipper";
-            effect: SHADOW BOTTOM;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "padding_after_icon";
-                  to_y: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "padding_right_bottom";
-               }
-               color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC;
-               text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_TEXT_STYLE2_FONT_SIZE_INC;
-                  min: 0 0;
-                  max: 1 0;
-                  text_class: "tizen";
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
-               visible: 1;
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC;
-            }
-         }
-         part { name: "over2";
-            type: RECT;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over3";
-            type: RECT;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "clipper";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: BUTTON_DISCLIP_NORMAL_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_DISCLIP_DISABLED_COLOR_INC;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-            after: "text_clicked";
-         }
-         program { name: "text_clicked";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 set_state(PART:"elm.text", "clicked", 0.0);
-            }
-         }
-         program { name: "button_double_click";
-            signal: "mouse,down,1,double";
-            source: "over2";
-            after: "button_click_anim";
-         }
-         program { name: "button_unpress";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-         }
-         program { name: "button_mouseout_clicked";
-            signal: "mouse,up,1";
-            source: "over3";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (strcmp(st, "icononly"))
-                 {
-                    emit("elm,action,default,text,set", "");
-                    set_state(PART:"elm.text", "visible", 0.0);
-                 }
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"button_image", "default", 0.0);
-            }
-            after: button_unpress;
-         }
-         program { name: "touch_snd";
-            signal: "mouse,clicked,1";
-            source: "over2";
-            action: PLAY_SAMPLE "touch_sound" 1.0;
-            after: button_unclick3;
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "text_show";
-            signal: "elm,state,text,visible";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (!strcmp(st, "icononly"))
-                 {
-                    set_state(PART:"elm.swallow.content", "visible", 0.0);
-                    set_state(PART:"icon_rect", "visible", 0.0);
-                    set_state(PART:"padding_after_icon", "visible", 0.0);
-                    set_state(PART:"bg", "visible", 0.0);
-                 }
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
-            }
-         }
-         program { name: "text_hide";
-            signal: "elm,state,text,hidden";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 {
-                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                    set_state(PART:"icon_rect", "icononly", 0.0);
-                    set_state(PART:"padding_after_icon", "icononly", 0.0);
-                    set_state(PART:"bg", "icononly", 0.0);
-                 }
-               set_state(PART:"elm.text", "default", 0.0);
-            }
-         }
-         program { name: "icon_show";
-            signal: "elm,state,icon,visible";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 {
-                    set_state(PART:"elm.swallow.content", "visible", 0.0);
-                    set_state(PART:"icon_rect", "visible", 0.0);
-                    set_state(PART:"padding_after_icon", "visible", 0.0);
-                    set_state(PART:"bg", "visible", 0.0);
-                 }
-               else
-                 {
-                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                    set_state(PART:"icon_rect", "icononly", 0.0);
-                    set_state(PART:"padding_after_icon", "icononly", 0.0);
-                    set_state(PART:"bg", "icononly", 0.0);
-                 }
-            }
-         }
-         program { name: "icon_hide";
-            signal: "elm,state,icon,hidden";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
-            target: "padding_after_icon";
-            target: "icon_rect";
-            target: "bg";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "button_image";
-            target: "clipper";
-            target: "disabler";
-            after: "disable_text";
-         }
-         program { name: "disable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, BUTTON_STATE_DISABLED);
-            }
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "clipper";
-            target: "disabler";
-            after: "enable_text";
-         }
-         program { name: "enable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "disabled_visible"))
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, BUTTON_STATE_ENABLED);
-            }
-         }
-         program { name: "action_focus";
-            signal: "elm,action,focus_highlight,show";
-            source: "elm";
-            action: STATE_SET "focused" 0.0;
-            target: "focus_image";
-         }
-         program { name: "action_unfocus";
-            signal: "elm,action,focus_highlight,hide";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "focus_image";
-         }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/sweep";
-      alias: "elm/button/base/text_only/sweep";
-      alias: "elm/button/base/hidden";
-      alias: "elm/button/base/sweep/multiline";
-      data {
-         item: "focus_highlight" "on";
-      }
-      images {
-         image: "00_button_01.png" COMP;
-         image: "00_button_01_press.png" COMP;
-         image: "00_button_01_dim.png" COMP;
-         image: "00_button_01_focus.png" COMP;
-      }
-      script {
-         public button_state = BUTTON_STATE_ENABLED;
-      }
-      styles{
-         style { name: "btn_sweep_multiline";
-            base: "font=Tizen:style=Regular font_size="BUTTON_SWEEP_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed linegap=-7 ellipsis=1.0 text_class=tizen";
-            tag: "br" "\n";
-            tag: "ps" "ps";
-            tag: "tab" "\t";
-         }
-      }
-      parts {
-         part { name: "button_image";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_SWEEP_BG_NORMAL_MIN_INC;
-               image {
-                  normal: "00_button_01.png";
-                  border: BUTTON_SWEEP_BG_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_press.png";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_dim.png";
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_press.png";
-            }
-         }
-         part { name: "focus_image";
-            scale: 1;
-            mouse_events: 0;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1.to : "button_image";
-               rel2.to : "button_image";
-               image {
-                  normal: "00_button_01_focus.png";
-                  border: BUTTON_SWEEP_BG_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "padding_left_top";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel2.relative: 0.0 0.0;
-               min: BUTTON_SWEEP_PADDING_MIN_INC;
-               fixed: 1 1;
-               visible: 0;
-            }
-         }
-         part { name: "padding_right_bottom";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 1.0 1.0;
-               rel1.relative: 1.0 1.0;
-               min: BUTTON_SWEEP_PADDING_MIN_INC;
-               fixed: 1 1;
-               visible: 0;
-            }
-         }
-         part { name: "icon_rect";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               min: BUTTON_SWEEP_ICON_RECT_MIN_INC;
-               fixed: 1 0;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.swallow.content";
-                  to_y: "padding_left_top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.swallow.content";
-                  to_y: "padding_right_bottom";
-               }
-               align: 0.0 0.5;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "padding_icon_text";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0; //when only icon or no icon is there
-               visible: 0;
-               fixed: 1 0;
-               min: 0 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to: "icon_rect";
-               }
-               rel2.to: "icon_rect";
-               align: 0.0 0.0;
-            }
-            description { state: "visible" 0.0; //when icon is visible
-               inherit: "default" 0.0;
-               min: BUTTON_SWEEP_PADDING_ICON_TEXT_VISIBLE_MIN_INC;
-            }
-            description { state: "icononly" 0.0;
-               inherit: "default" 0.0;
-            }
-         }
-         part { name: "elm.swallow.content";
-            type: SWALLOW;
-            scale: 1;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               visible: 0;
-               align: 0.0 0.5;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "padding_left_top";
-                  to_y: "padding_right_bottom";
-               }
-               fixed: 1 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_SWEEP_ICONONLY_ICON_MIN_INC;
-               max: BUTTON_SWEEP_ICONONLY_ICON_MIN_INC;
-               visible: 1;
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
-            }
-            description { state: "icononly" 0.0;
-               min: BUTTON_SWEEP_ICONONLY_ICON_MIN_INC;
-               max: BUTTON_SWEEP_ICONONLY_ICON_MIN_INC;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            effect: SHADOW BOTTOM;
-            scale: 1;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               visible: 0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "padding_icon_text";
-                  to_y: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "padding_right_bottom";
-               }
-               color: BUTTON_SWEEP_BUTTON_TEXT_NORMAL_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC;
-               text {
-                  style: "btn_sweep_multiline";
-                  align: 0.5 0.45;
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: BUTTON_SWEEP_TEXT_MIN_INC;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 0 0;
-               color: BUTTON_SWEEP_BUTTON_TEXT_PRESSED_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC;
-               visible: 1;
-               min: BUTTON_SWEEP_TEXT_MIN_INC;
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 0 0;
-               color: BUTTON_SWEEP_BUTTON_TEXT_FOCUSED_COLOR_INC;
-            }
-         }
-         part { name: "over2";
-            type: RECT;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over3";
-            type: RECT;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "clipper";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: BUTTON_DISCLIP_NORMAL_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_DISCLIP_DISABLED_COLOR_INC;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-            after: "text_clicked";
-         }
-         program { name: "text_clicked";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 set_state(PART:"elm.text", "clicked", 0.0);
-            }
-         }
-         program { name: "button_double_click";
-            signal: "mouse,down,1,double";
-            source: "over2";
-            after: "button_click_anim";
-         }
-         program { name: "button_unpress";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-         }
-         program { name: "button_mouseout_clicked";
-            signal: "mouse,up,1";
-            source: "over3";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (strcmp(st, "icononly"))
-                 {
-                    emit("elm,action,default,text,set", "");
-                    set_state(PART:"elm.text", "visible", 0.0);
-                 }
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"button_image", "default", 0.0);
-            }
-            after: button_unpress;
-         }
-         program { name: "touch_snd";
-            signal: "mouse,clicked,1";
-            source: "over2";
-            action: PLAY_SAMPLE "touch_sound" 1.0;
-            after: button_unclick3;
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "text_show";
-            signal: "elm,state,text,visible";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (!strcmp(st, "icononly"))
-                 {
-                    set_state(PART:"elm.swallow.content", "visible", 0.0);
-                    set_state(PART:"padding_icon_text", "visible", 0.0);
-                 }
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
-            }
-         }
-         program { name: "text_hide";
-            signal: "elm,state,text,hidden";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 {
-                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                    set_state(PART:"padding_icon_text", "icononly", 0.0);
-                 }
-               set_state(PART:"elm.text", "default", 0.0);
-            }
-         }
-         program { name: "icon_show";
-            signal: "elm,state,icon,visible";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 {
-                    set_state(PART:"elm.swallow.content", "visible", 0.0);
-                    set_state(PART:"padding_icon_text", "visible", 0.0);
-                 }
-               else
-                 {
-                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                    set_state(PART:"padding_icon_text", "icononly", 0.0);
-                 }
-            }
-         }
-         program { name: "icon_hide";
-            signal: "elm,state,icon,hidden";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
-            target: "padding_icon_text";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "button_image";
-            target: "clipper";
-            target: "disabler";
-            after: "disable_text";
-         }
-         program { name: "disable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, BUTTON_STATE_DISABLED);
-            }
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "clipper";
-            target: "disabler";
-            after: "enable_text";
-         }
-         program { name: "enable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "disabled_visible"))
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, BUTTON_STATE_ENABLED);
+               inherit: "default" 0.0;
+               visible: 1;
+               text {
+                  style: "btn_base_search_send_focus";
+               }
             }
          }
-         program { name: "action_focus";
-            signal: "elm,action,focus_highlight,show";
-            source: "elm";
-            action: STATE_SET "focused" 0.0;
-            target: "focus_image";
-         }
-         program { name: "action_unfocus";
-            signal: "elm,action,focus_highlight,hide";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "focus_image";
-         }
       }
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/sweep/delete";
-      inherit: "elm/button/base/sweep";
-      alias: "elm/button/base/sweep/delete/multiline";
+   group { name: "elm/button/base/search_button/cancel";
+      inherit: "elm/button/base/style1";
       images {
-         image: "00_button_01_delete_press.png" COMP;
          image: "00_button_01_delete.png" COMP;
          image: "00_button_01_delete_dim.png" COMP;
+         image: "00_button_01_delete_press.png" COMP;
       }
       styles{
-         style { name: "btn_sweep_delete_multiline";
-            base: "font=Tizen:style=Regular font_size="BUTTON_SWEEP_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed linegap=-7 ellipsis=1.0 text_class=tizen";
+         style { name: "btn_base_search_cancel";
+            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_CANCEL_TEXTBLOCK_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_search_cancel_pressed";
+            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_CANCEL_TEXTBLOCK_PRESSED_COLOR_INC" style=far_shadow,top shadow_color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_search_cancel_dim";
+            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_CANCEL_TEXTBLOCK_DISABLED_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_DIM_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_search_cancel_focus";
+            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_CANCEL_TEXTBLOCK_FOCUSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
             tag: "br" "\n";
             tag: "ps" "ps";
             tag: "tab" "\t";
          part { name: "button_image";
             scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_SWEEP_BG_NORMAL_MIN_INC;
                image {
                   normal: "00_button_01_delete.png";
-                  border: BUTTON_SWEEP_BG_BORDER_INC;
+                  border: BUTTON_SEARCH_BUTTON_BG_BORDER_INC;
                   border_scale: 1;
                }
             }
                image.normal: "00_button_01_delete_press.png";
             }
          }
+         part { name: "bg";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: BUTTON_SEARCH_BUTTON_BG_MIN_INC;
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               min: BUTTON_SEARCH_BUTTON_VISIBLE_BG_MIN_INC;
+            }
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
+               min: BUTTON_SEARCH_BUTTON_ICONONLY_BG_MIN_INC;
+            }
+         }
          part { name: "elm.text";
             type: TEXTBLOCK;
             mouse_events: 0;
-            effect: SHADOW BOTTOM;
             scale: 1;
-            clip_to: "clipper";
             description { state: "default" 0.0;
-               fixed: 1 1;
                visible: 0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "padding_icon_text";
+                  to_x: "padding_after_icon";
                   to_y: "padding_left_top";
                }
                rel2 {
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               color: BUTTON_DELETE_BUTTON_TEXT_NORMAL_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC;
                text {
-                  style: "btn_sweep_multiline";
-                  align: 0.5 0.45;
+                  style: "btn_base_search_cancel";
+                  min: 0 0;
+                  max: 1 0;
                }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: BUTTON_SWEEP_TEXT_MIN_INC;
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: 0 0;
-               color: BUTTON_DELETE_BUTTON_TEXT_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_base_search_cancel_pressed";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_DELETE_BUTTON_TEXT_DISABLED_COLOR_INC;
                visible: 1;
-               min: BUTTON_SWEEP_TEXT_MIN_INC;
+               text {
+                  style: "btn_base_search_cancel_dim";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: 0 0;
-               color: BUTTON_DELETE_BUTTON_TEXT_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_search_cancel_focus";
+               }
             }
          }
       }
    }
-*/
+
 ///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/popup_button/default";
       alias: "elm/button/base/popup_button/menustyle";
             tag: "tab" "\t";
          }
          style { name: "btn_base_popup_button_dim";
-            base: "font=Tizen:style=Bold font_size="BUTTON_POPUP_TEXT_FONT_SIZE_INC" align=center color="BUTTON_POPUP_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            base: "font=Tizen:style=Bold font_size="BUTTON_POPUP_TEXT_FONT_SIZE_INC" align=center color="BUTTON_POPUP_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_POPUP_BUTTON_SHADOW_TEXTBLOCK_DIM_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
             tag: "br" "\n";
             tag: "ps" "ps";
             tag: "tab" "\t";
          part { name: "elm.swallow.content";
             type: SWALLOW;
             scale: 1;
-            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
                align: 0.5 0.5;
             }
          }
+         part { name: "elm.swallow.content.shadow.proxy";
+            type: PROXY;
+            scale: 1;
+            clip_to: "elm.swallow.content.shadow.clipper";
+            description { state: "default" 0.0;
+               source: "elm.swallow.content";
+               proxy.source_clip: 0;
+               rel1 {
+                  to: "elm.swallow.content";
+                  offset: BUTTON_POPUP_NORMAL_TOP_OFFSET_INC;
+               }
+               rel2 {
+                  to: "elm.swallow.content";
+                  offset: BUTTON_POPUP_NORMAL_BOTTOM_OFFSET_INC;
+               }
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               rel1 {
+                  to: "elm.swallow.content";
+                  offset: BUTTON_POPUP_PRESSED_TOP_OFFSET_INC;
+               }
+               rel2 {
+                  to: "elm.swallow.content";
+                  offset: BUTTON_POPUP_PRESSED_BOTTOM_OFFSET_INC;
+               }
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+            }
+         }
+         part { name: "elm.swallow.content.proxy";
+            type: PROXY;
+            scale: 1;
+            clip_to: "icon_clipper";
+            description { state: "default" 0.0;
+               source: "elm.swallow.content";
+               proxy.source_clip: 0;
+               rel1.to: "elm.swallow.content";
+               rel2.to: "elm.swallow.content";
+            }
+         }
+         part { name: "elm.swallow.content.shadow.clipper";
+            scale: 1;
+            type: RECT;
+            description { state: "default" 0.0;
+               color: BUTTON_POPUP_SHADOW_NORMAL_COLOR_INC;
+            }
+            description { state: "clicked" 0.0;
+               color: BUTTON_POPUP_SHADOW_PRESSED_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               color: BUTTON_POPUP_SHADOW_DISABLED_COLOR_INC;
+            }
+         }
+         part { name: "icon_clipper";
+            scale: 1;
+            type: RECT;
+            description { state: "default" 0.0;
+               color: BUTTON_POPUP_ICON_NORMAL_COLOR_INC;
+            }
+            description { state: "clicked" 0.0;
+               color: BUTTON_POPUP_ICON_PRESSED_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               color: BUTTON_POPUP_ICON_DISABLED_COLOR_INC;
+            }
+         }
          part { name: "elm.text";
             type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
-            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
                rel1 {
                color: 0 0 0 0;
             }
          }
-         part { name: "clipper";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: BUTTON_DISCLIP_NORMAL_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_DISCLIP_DISABLED_COLOR_INC;
-            }
-         }
          part { name: "disabler";
             type: RECT;
             description { state: "default" 0.0;
          program { name: "button_click_anim";
             action: STATE_SET "clicked" 0.0;
             target: "button_image";
+            target: "elm.swallow.content.shadow.proxy";
+            target: "elm.swallow.content.shadow.clipper";
+            target: "icon_clipper";
             after: "text_clicked";
          }
          program { name: "text_clicked";
                  }
                if (get_int(button_state) != BUTTON_STATE_DISABLED)
                  set_state(PART:"button_image", "default", 0.0);
+               set_state(PART:"elm.swallow.content.shadow.proxy", "default", 0.0);
+               set_state(PART:"elm.swallow.content.shadow.clipper", "default", 0.0);
+               set_state(PART:"icon_clipper", "default", 0.0);
             }
             after: button_unpress;
          }
             source: "elm";
             action: STATE_SET "disabled" 0.0;
             target: "button_image";
-            target: "clipper";
+            target: "elm.swallow.content.shadow.proxy";
+            target: "elm.swallow.content.shadow.clipper";
+            target: "icon_clipper";
             target: "disabler";
             after: "disable_text";
          }
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "button_image";
-            target: "clipper";
+            target: "elm.swallow.content.shadow.proxy";
+            target: "elm.swallow.content.shadow.clipper";
+            target: "icon_clipper";
             target: "disabler";
             after: "enable_text";
          }
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-#define BUTTON_CIRCLE_STYLES(style_name, image_normal, image_press, min_width, min_height) \
+#define BUTTON_CIRCLE_STYLES(style_name, image_normal, min_width, min_height) \
    group { name: "elm/button/base/"style_name; \
       data { \
          item: "focus_highlight" "on"; \
          image: "00_circle_button_press.png" COMP; \
          image: "00_circle_button_dim.png" COMP; \
          image: image_normal COMP; \
-         image: image_press COMP; \
          image: 00_circle_button_focus.png COMP; \
       } \
       parts { \
          } \
          part { name: "button_center_part"; \
             scale: 1; \
-            clip_to: "icon_clipper"; \
             description { state: "default" 0.0; \
                min: BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC; \
                max: BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC; \
                   to: "right_bottom_padding"; \
                } \
             } \
+         } \
+         part { name: "elm.swallow.icon.shadow.proxy"; \
+            type: PROXY; \
+            clip_to: "elm.icon.proxy.clipper"; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+                source: "button_center_part"; \
+                proxy.source_clip: 0; \
+                rel1 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_CIRCLE_STYLE_NORMAL_TOP_OFFSET_INC; \
+                } \
+                rel2 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_CIRCLE_STYLE_NORMAL_BOTTOM_OFFSET_INC; \
+                } \
+            } \
+            description { state: "clicked" 0.0; \
+                inherit: "default" 0.0; \
+                rel1 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_CIRCLE_STYLE_PRESSED_TOP_OFFSET_INC; \
+                } \
+                rel2 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_CIRCLE_STYLE_PRESSED_BOTTOM_OFFSET_INC; \
+                } \
+            } \
+            description { state: "disabled" 0.0; \
+                inherit: "default" 0.0; \
+            } \
+         } \
+         part { name: "elm.swallow.icon.proxy"; \
+            type: PROXY; \
+            scale: 1; \
+            clip_to: "icon_clipper"; \
+            description { state: "default" 0.0; \
+                source: "button_center_part"; \
+                proxy.source_clip: 0; \
+                rel1.to: "button_center_part"; \
+                rel2.to: "button_center_part"; \
+            } \
+         }\
+         part { name: "elm.icon.proxy.clipper"; \
+            type: RECT; \
+            description { state: "default" 0.0; \
+               color: BUTTON_CIRCLE_STYLE_CLIPPER_DEFAULT_COLOR_INC; \
+            } \
             description { state: "clicked" 0.0; \
-               inherit: "default"; \
-               image.normal: image_press; \
+               color: BUTTON_CIRCLE_STYLE_ICON_CLIPPER_PRESSED_COLOR_INC; \
             } \
             description { state: "disabled" 0.0; \
-               inherit: "default"; \
+               color: BUTTON_CIRCLE_STYLE_ICON_CLIPPER_DISABLED_COLOR_INC; \
             } \
          } \
          part { name: "icon_clipper"; \
          program { name: "button_click_anim"; \
             action: STATE_SET "clicked" 0.0; \
             target: "button_image"; \
-            target: "button_center_part"; \
+            target: "elm.swallow.icon.shadow.proxy"; \
+            target: "elm.icon.proxy.clipper"; \
             target: "icon_clipper"; \
          } \
          program { name: "button_double_click"; \
          program { name: "button_unclick_anim"; \
             action: STATE_SET "default" 0.0; \
             target: "button_image"; \
-            target: "button_center_part"; \
+            target: "elm.swallow.icon.shadow.proxy"; \
+            target: "elm.icon.proxy.clipper"; \
             target: "icon_clipper"; \
          } \
          program { name: "touch_snd"; \
             action: STATE_SET "disabled" 0.0; \
             target: "disabler"; \
             target: "button_image"; \
-            target: "button_center_part"; \
+            target: "elm.swallow.icon.shadow.proxy"; \
+            target: "elm.icon.proxy.clipper"; \
             target: "icon_clipper"; \
          } \
          program { name: "enable"; \
             action: STATE_SET "default" 0.0; \
             target: "disabler"; \
             target: "button_image"; \
-            target: "button_center_part"; \
+            target: "elm.swallow.icon.shadow.proxy"; \
+            target: "elm.icon.proxy.clipper"; \
             target: "icon_clipper"; \
          } \
          program { name: "action_focus"; \
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("reveal","00_button_right.png", "00_button_right_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+   BUTTON_CIRCLE_STYLES("reveal","00_button_right.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("reveal/extended", "00_button_right.png", "00_button_right_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+   BUTTON_CIRCLE_STYLES("reveal/extended", "00_button_right.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("expand/closed", "00_button_expand_closed.png", "00_button_expand_closed_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+   BUTTON_CIRCLE_STYLES("expand/closed", "00_button_expand_closed.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("expand/closed/extended", "00_button_expand_closed.png", "00_button_expand_closed_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+   BUTTON_CIRCLE_STYLES("expand/closed/extended", "00_button_expand_closed.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("expand/opened", "00_button_expand_opened.png", "00_button_expand_opened_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+   BUTTON_CIRCLE_STYLES("expand/opened", "00_button_expand_opened.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("expand/opened/extended", "00_button_expand_opened.png", "00_button_expand_opened_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+   BUTTON_CIRCLE_STYLES("expand/opened/extended", "00_button_expand_opened.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("info", "00_button_info.png", "00_button_info_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+   BUTTON_CIRCLE_STYLES("info", "00_button_info.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("info/extended", "00_button_info.png", "00_button_info_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+   BUTTON_CIRCLE_STYLES("info/extended", "00_button_info.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("rename", "00_button_rename.png", "00_button_rename_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+   BUTTON_CIRCLE_STYLES("rename", "00_button_rename.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("rename/extended", "00_button_rename.png", "00_button_rename_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+   BUTTON_CIRCLE_STYLES("rename/extended", "00_button_rename.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("call", "00_button_call.png", "00_button_call_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+   BUTTON_CIRCLE_STYLES("call", "00_button_call.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("call/extended", "00_button_call.png", "00_button_call_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+   BUTTON_CIRCLE_STYLES("call/extended", "00_button_call.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("plus", "00_button_add.png", "00_button_add_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+   BUTTON_CIRCLE_STYLES("plus", "00_button_add.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("plus/extended", "00_button_add.png", "00_button_add_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+   BUTTON_CIRCLE_STYLES("plus/extended", "00_button_add.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("minus", "00_button_delete.png", "00_button_delete_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+   BUTTON_CIRCLE_STYLES("minus", "00_button_delete.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("minus/extended", "00_button_delete.png", "00_button_delete_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+   BUTTON_CIRCLE_STYLES("minus/extended", "00_button_delete.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("cancel", "00_button_expand_cancel.png", "00_button_expand_cancel_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+   BUTTON_CIRCLE_STYLES("cancel", "00_button_expand_cancel.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("cancel/extended", "00_button_expand_cancel.png", "00_button_expand_cancel_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+   BUTTON_CIRCLE_STYLES("cancel/extended", "00_button_expand_cancel.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("send", "00_button_expand_send.png", "00_button_expand_send_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+   BUTTON_CIRCLE_STYLES("send", "00_button_expand_send.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("send/extended", "00_button_expand_send.png", "00_button_expand_send_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+   BUTTON_CIRCLE_STYLES("send/extended", "00_button_expand_send.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
 ///////////////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("contact", "00_button_contact.png", "00_button_contact_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+   BUTTON_CIRCLE_STYLES("contact", "00_button_contact.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
 ///////////////////////////////////////////////////////////////////////////////////////
 
 #define BUTTON_CIRCLE_WARNING_STYLES(style_name, min_width, min_height) \
          image: "00_circle_button_delete_press.png" COMP; \
          image: "00_circle_button_delete_dim.png" COMP; \
          image: "00_button_warning.png" COMP; \
-         image: "00_button_warning_press.png" COMP; \
       } \
       parts { \
          part { name: "button_image"; \
          } \
          part { name: "button_center_part"; \
             scale: 1; \
-            clip_to: "icon_clipper"; \
             description { state: "default" 0.0; \
+               min: BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC; \
+               max: BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC; \
                image.normal: "00_button_warning.png"; \
+               rel1 { \
+                  relative: 1.0 1.0; \
+                  to: "left_top_padding"; \
+               } \
+               rel2 { \
+                  relative: 0.0 0.0; \
+                  to: "right_bottom_padding"; \
+               } \
+            } \
+         } \
+         part { name: "elm.swallow.icon.shadow.proxy"; \
+            type: PROXY; \
+            clip_to: "elm.icon.proxy.clipper"; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+                source: "button_center_part"; \
+                proxy.source_clip: 0; \
+                rel1 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_WARNING_STYLE_NORMAL_TOP_OFFSET_INC; \
+                } \
+                rel2 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_WARNING_STYLE_NORMAL_BOTTOM_OFFSET_INC; \
+                } \
+            } \
+            description { state: "clicked" 0.0; \
+                inherit: "default" 0.0; \
+                rel1 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_WARNING_STYLE_PRESSED_TOP_OFFSET_INC; \
+                } \
+                rel2 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_WARNING_STYLE_PRESSED_BOTTOM_OFFSET_INC; \
+                } \
+            } \
+            description { state: "disabled" 0.0; \
+                inherit: "default" 0.0; \
+            } \
+         } \
+         part { name: "elm.icon.proxy.clipper"; \
+            type: RECT; \
+            description { state: "default" 0.0; \
+               color: BUTTON_WARNING_STYLE_CLIPPER_NORMAL_COLOR_INC; \
             } \
             description { state: "clicked" 0.0; \
-               inherit: "default"; \
-               image.normal: "00_button_warning_press.png"; \
+               color: BUTTON_WARNING_STYLE_CLIPPER_PRESSED_COLOR_INC; \
             } \
             description { state: "disabled" 0.0; \
-               inherit: "default"; \
+               color: BUTTON_WARNING_STYLE_CLIPPER_DISABLED_COLOR_INC; \
             } \
          } \
          part { name: "icon_clipper"; \
             type: RECT; \
             scale: 1; \
             description { state: "default" 0.0; \
-               color: BUTTON_CIRCLE_STYLE_WARNING_NORMAL_COLOR_INC; \
+               color: BUTTON_WARNING_STYLE_NORMAL_COLOR_INC; \
             } \
             description { state: "clicked" 0.0; \
-               color: BUTTON_CIRCLE_STYLE_WARNING_PRESSED_COLOR_INC; \
+               color: BUTTON_WARNING_STYLE_PRESSED_COLOR_INC; \
             } \
             description { state: "disabled" 0.0; \
-               color: BUTTON_CIRCLE_STYLE_WARNING_DISABLED_COLOR_INC; \
+               color: BUTTON_WARNING_STYLE_DISABLED_COLOR_INC; \
             } \
          } \
          part { name: "over1"; \
          }
          part { name: "elm.swallow.content";
             type: SWALLOW;
-            clip_to: "icon_clipper";
             scale: 1;
             description { state: "default" 0.0;
+               min: BUTTON_CIRCLE_STYLE_CONTENT_MIN_MAX_INC;
+               max: BUTTON_CIRCLE_STYLE_CONTENT_MIN_MAX_INC;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 1.0;
                   relative: 0.0 0.0;
                   to: "right_bottom_padding";
                }
-               visible: 0;
             }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: BUTTON_CIRCLE_STYLE_CONTENT_MIN_MAX_INC;
-               max: BUTTON_CIRCLE_STYLE_CONTENT_MIN_MAX_INC;
+         }
+         part { name: "elm.swallow.icon.shadow.proxy";
+            type: PROXY;
+            clip_to: "elm.icon.proxy.clipper";
+            scale: 1;
+            description { state: "default" 0.0;
+                source: "elm.swallow.content";
+                proxy.source_clip: 0;
+                rel1 {
+                   to: "elm.swallow.content";
+                   offset: BUTTON_CIRCLE_STYLE_NORMAL_TOP_OFFSET_INC;
+                }
+                rel2 {
+                   to: "elm.swallow.content";
+                   offset: BUTTON_CIRCLE_STYLE_NORMAL_BOTTOM_OFFSET_INC;
+                }
+            }
+            description { state: "clicked" 0.0;
+                inherit: "default" 0.0;
+                rel1 {
+                   to: "elm.swallow.content";
+                   offset: BUTTON_CIRCLE_STYLE_PRESSED_TOP_OFFSET_INC;
+                }
+                rel2 {
+                   to: "elm.swallow.content";
+                   offset: BUTTON_CIRCLE_STYLE_PRESSED_BOTTOM_OFFSET_INC;
+                }
+            }
+            description { state: "disabled" 0.0;
+                inherit: "default" 0.0;
+            }
+         }
+         part { name: "elm.swallow.icon.proxy";
+            type: PROXY;
+            scale: 1;
+            clip_to: "icon_clipper";
+            description { state: "default" 0.0;
+                source: "elm.swallow.content";
+                proxy.source_clip: 0;
+                rel1.to: "elm.swallow.content";
+                rel2.to: "elm.swallow.content";
+            }
+         }
+         part { name: "elm.icon.proxy.clipper";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: BUTTON_CIRCLE_STYLE_CLIPPER_DEFAULT_COLOR_INC;
+            }
+            description { state: "clicked" 0.0;
+               color: BUTTON_CIRCLE_STYLE_ICON_CLIPPER_PRESSED_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               color: BUTTON_CIRCLE_STYLE_ICON_CLIPPER_DISABLED_COLOR_INC;
             }
          }
          part { name: "icon_clipper";
          program { name: "button_click_anim";
             action: STATE_SET "clicked" 0.0;
             target: "button_image";
+            target: "elm.swallow.icon.shadow.proxy";
+            target: "elm.icon.proxy.clipper";
             target: "icon_clipper";
          }
          program { name: "button_double_click";
          program { name: "button_unclick_anim";
             action: STATE_SET "default" 0.0;
             target: "button_image";
+            target: "elm.swallow.icon.shadow.proxy";
+            target: "elm.icon.proxy.clipper";
             target: "icon_clipper";
          }
          program { name: "disable";
             action: STATE_SET "disabled" 0.0;
             target: "disabler";
             target: "button_image";
+            target: "elm.swallow.icon.shadow.proxy";
+            target: "elm.icon.proxy.clipper";
             target: "icon_clipper";
          }
          program { name: "enable";
             action: STATE_SET "default" 0.0;
             target: "disabler";
             target: "button_image";
+            target: "elm.swallow.icon.shadow.proxy";
+            target: "elm.icon.proxy.clipper";
             target: "icon_clipper";
          }
-         program { name: "icon_show";
-            signal: "elm,state,icon,visible";
-            source: "elm";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.swallow.content";
-         }
-         program { name: "icon_hide";
-            signal: "elm,state,icon,hidden";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
-         }
          program { name: "action_focus";
             signal: "elm,action,focus_highlight,show";
             source: "elm";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-#define BUTTON_EDIT_STYLES(style_name, image_normal, image_press, min_width, min_height) \
+#define BUTTON_EDIT_STYLES(style_name, image_normal, min_width, min_height) \
    group { name: "elm/button/base/contacts/"style_name; \
    alias: "elm/button/base/"style_name; \
       data { \
          image: "00_circle_button_press.png" COMP; \
          image: "00_circle_button_dim.png" COMP; \
          image: image_normal COMP; \
-         image: image_press COMP; \
          image: 00_circle_button_focus.png COMP;\
       } \
       parts { \
          part { name: "button_center_part"; \
             mouse_events: 0; \
             scale: 1; \
-            clip_to: "icon_clipper"; \
             description { state: "default" 0.0; \
                min: BUTTON_EDIT_STYLE_IMAGE_NORMAL_MIN_MAX_INC; \
                max: BUTTON_EDIT_STYLE_IMAGE_NORMAL_MIN_MAX_INC; \
                image.normal: image_normal; \
             } \
-            description { \
-               state: "clicked" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: image_press; \
+         } \
+         part { name: "elm.swallow.icon.shadow.proxy"; \
+            type: PROXY; \
+            clip_to: "elm.icon.proxy.clipper"; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+                source: "button_center_part"; \
+                proxy.source_clip: 0; \
+                rel1 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_EDIT_STYLE_NORMAL_TOP_OFFSET_INC; \
+                } \
+                rel2 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_EDIT_STYLE_NORMAL_BOTTOM_OFFSET_INC; \
+                } \
+            } \
+            description { state: "clicked" 0.0; \
+                inherit: "default" 0.0; \
+                rel1 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_EDIT_STYLE_PRESSED_TOP_OFFSET_INC; \
+                } \
+                rel2 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_EDIT_STYLE_PRESSED_BOTTOM_OFFSET_INC; \
+                } \
+            } \
+            description { state: "disabled" 0.0; \
+                inherit: "default" 0.0; \
+            } \
+         } \
+         part { name: "elm.swallow.icon.proxy"; \
+            type: PROXY; \
+            scale: 1; \
+            clip_to: "icon_clipper"; \
+            description { state: "default" 0.0; \
+                source: "button_center_part"; \
+                proxy.source_clip: 0; \
+                rel1.to: "button_center_part"; \
+                rel2.to: "button_center_part"; \
+            } \
+         }\
+         part { name: "elm.icon.proxy.clipper"; \
+            type: RECT; \
+            description { state: "default" 0.0; \
+               color: BUTTON_EDIT_STYLE_CLIPPER_DEFAULT_COLOR_INC; \
+            } \
+            description { state: "clicked" 0.0; \
+               color: BUTTON_EDIT_STYLE_ICON_CLIPPER_PRESSED_COLOR_INC; \
+            } \
+            description { state: "disabled" 0.0; \
+               color: BUTTON_EDIT_STYLE_ICON_CLIPPER_DISABLED_COLOR_INC; \
+            } \
+         } \
+         part { name: "icon_clipper"; \
+            type: RECT; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               color: BUTTON_EDIT_STYLE_NORMAL_COLOR_INC; \
+            } \
+            description { state: "clicked" 0.0; \
+               color: BUTTON_EDIT_STYLE_PRESSED_COLOR_INC; \
             } \
             description { state: "disabled" 0.0; \
-               inherit: "default" 0.0; \
+               color: BUTTON_EDIT_STYLE_DISABLED_COLOR_INC; \
             } \
          } \
          part { name: "focus_image"; \
                visible: 1; \
             } \
          } \
-         part { name: "icon_clipper"; \
-            scale: 1; \
-            type: RECT; \
-            description { state: "default" 0.0; \
-               color: BUTTON_EDIT_STYLE_NORMAL_COLOR_INC; \
-            } \
-            description { state: "clicked" 0.0; \
-               color: BUTTON_EDIT_STYLE_PRESSED_COLOR_INC; \
-            } \
-            description { state: "disabled" 0.0; \
-               color: BUTTON_EDIT_STYLE_DISABLED_COLOR_INC; \
-            } \
-         } \
          part { name: "over1"; \
             type: RECT; \
             repeat_events: 1; \
          program { name: "button_click_anim"; \
             action: STATE_SET "clicked" 0.0; \
             target: "button_image"; \
-            target: "button_center_part"; \
+            target: "elm.swallow.icon.shadow.proxy"; \
+            target: "elm.icon.proxy.clipper"; \
             target: "icon_clipper"; \
          } \
          program { name: "button_double_click"; \
          program { name: "button_unclick_anim"; \
             action: STATE_SET "default" 0.0; \
             target: "button_image"; \
-            target: "button_center_part"; \
+            target: "elm.swallow.icon.shadow.proxy"; \
+            target: "elm.icon.proxy.clipper"; \
             target: "icon_clipper"; \
          } \
          program { name: "touch_snd"; \
             action: STATE_SET "disabled" 0.0; \
             target: "disabler"; \
             target: "button_image"; \
-            target: "button_center_part"; \
+            target: "elm.swallow.icon.shadow.proxy"; \
+            target: "elm.icon.proxy.clipper"; \
             target: "icon_clipper"; \
          } \
          program { name: "enable"; \
             action: STATE_SET "default" 0.0; \
             target: "disabler"; \
             target: "button_image"; \
-            target: "button_center_part"; \
+            target: "elm.swallow.icon.shadow.proxy"; \
+            target: "elm.icon.proxy.clipper"; \
             target: "icon_clipper"; \
          } \
          program { name: "action_focus"; \
       } \
    }
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_plus", "00_button_add.png", "00_button_add_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
+   BUTTON_EDIT_STYLES("icon_plus", "00_button_add.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_plus/extended", "00_button_add.png", "00_button_add_press.png", BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC, BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC)
+   BUTTON_EDIT_STYLES("icon_plus/extended", "00_button_add.png", BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC, BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_expand", "00_button_expand_closed.png", "00_button_expand_closed_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
+   BUTTON_EDIT_STYLES("icon_expand", "00_button_expand_closed.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_expand_closed.png", "00_button_expand_closed_press.png", BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC, BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC)
+   BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_expand_closed.png", BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC, BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_expand_closed", "00_button_expand_closed.png", "00_button_expand_closed_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
+   BUTTON_EDIT_STYLES("icon_expand_closed", "00_button_expand_closed.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_expand_opened", "00_button_expand_opened.png", "00_button_expand_opened_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
+   BUTTON_EDIT_STYLES("icon_expand_opened", "00_button_expand_opened.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
 
          image: "00_circle_button_delete_press.png" COMP; \
          image: "00_circle_button_delete_dim.png" COMP; \
          image: "00_button_delete.png" COMP; \
-         image: "00_button_delete_press.png" COMP; \
       } \
       parts { \
          part { name: "button_image"; \
          part { name: "button_center_part"; \
             mouse_events: 0; \
             scale: 1; \
-            clip_to: "icon_clipper"; \
             description { state: "default" 0.0; \
+               min: BUTTON_EDIT_STYLE_IMAGE_NORMAL_MIN_MAX_INC; \
+               max: BUTTON_EDIT_STYLE_IMAGE_NORMAL_MIN_MAX_INC; \
                image.normal: "00_button_delete.png"; \
             } \
-            description { \
-               state: "clicked" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_button_delete_press.png"; \
+         } \
+         part { name: "elm.swallow.icon.shadow.proxy"; \
+            type: PROXY; \
+            clip_to: "elm.icon.proxy.clipper"; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+                source: "button_center_part"; \
+                proxy.source_clip: 0; \
+                rel1 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_CIRCLE_STYLE_MINUS_NORMAL_TOP_OFFSET_INC; \
+                } \
+                rel2 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_CIRCLE_STYLE_MINUS_NORMAL_BOTTOM_OFFSET_INC; \
+                } \
+            } \
+            description { state: "clicked" 0.0; \
+                inherit: "default" 0.0; \
+                rel1 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_CIRCLE_STYLE_MINUS_PRESSED_TOP_OFFSET_INC; \
+                } \
+                rel2 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_CIRCLE_STYLE_MINUS_PRESSED_BOTTOM_OFFSET_INC; \
+                } \
             } \
             description { state: "disabled" 0.0; \
-               inherit: "default" 0.0; \
+                inherit: "default" 0.0; \
+            } \
+         } \
+         part { name: "elm.icon.proxy.clipper"; \
+            type: RECT; \
+            description { state: "default" 0.0; \
+               color: BUTTON_CIRCLE_STYLE_MINUS_SHADOW_NORMAL_COLOR_INC; \
+            } \
+            description { state: "clicked" 0.0; \
+               color: BUTTON_CIRCLE_STYLE_MINUS_SHADOW_PRESSED_COLOR_INC; \
+            } \
+            description { state: "disabled" 0.0; \
+               color: BUTTON_CIRCLE_STYLE_MINUS_SHADOW_DISABLED_COLOR_INC; \
             } \
          } \
          part { name: "icon_clipper"; \
             } \
          } \
          part { name: "jump_image"; \
-            type: IMAGE; \
             scale: 1; \
             description { state: "default" 0.0; \
                min: BUTTON_DEFAULT_STYLE_ICONONLY_ICON_MIN_INC; \
                image.normal: image_normal; \
                aspect: 1.0 1.0; \
                aspect_preference: VERTICAL; \
-               color: BUTTON_JUMP_ICON_NORMAL_COLOR_INC; \
+            } \
+         } \
+         part { name: "jump_image.shadow.proxy"; \
+            type: PROXY; \
+            scale: 1; \
+            clip_to: "elm.swallow.icon.shadow.proxy"; \
+            description { state: "default" 0.0; \
+               source: "jump_image"; \
+               proxy.source_clip: 0; \
+               rel1 { \
+                  to: "jump_image"; \
+                  offset: BUTTON_JUMP_TO_NORMAL_TOP_OFFSET_INC; \
+               } \
+               rel2 { \
+                  to: "jump_image"; \
+                  offset: BUTTON_JUMP_TO_NORMAL_BOTTOM_OFFSET_INC; \
+               } \
             } \
             description { state: "clicked" 0.0; \
                inherit: "default" 0.0; \
-               color: BUTTON_JUMP_ICON_PRESSED_COLOR_INC; \
+               rel1 { \
+                  to: "jump_image"; \
+                  offset: BUTTON_JUMP_TO_PRESSED_TOP_OFFSET_INC; \
+               } \
+               rel2 { \
+                  to: "jump_image"; \
+                  offset: BUTTON_JUMP_TO_PRESSED_BOTTOM_OFFSET_INC; \
+               } \
             } \
             description { state: "disabled" 0.0; \
                inherit: "default" 0.0; \
-               color: BUTTON_JUMP_ICON_DIM_COLOR_INC; \
+            } \
+         } \
+         part { name: "jump_image.proxy"; \
+            type: PROXY; \
+            scale: 1; \
+            clip_to: "elm.swallow.icon.proxy"; \
+            description { state: "default" 0.0; \
+               source: "jump_image"; \
+               proxy.source_clip: 0; \
+               rel1.to: "jump_image"; \
+               rel2.to: "jump_image"; \
+            } \
+         } \
+         part { name: "elm.swallow.icon.shadow.proxy"; \
+            type: RECT; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               color: BUTTON_JUMP_SHADOW_NORMAL_COLOR_INC; \
+            } \
+            description { state: "clicked" 0.0; \
+               color: BUTTON_JUMP_SHADOW_PRESSED_COLOR_INC; \
+            } \
+            description { state: "disabled" 0.0; \
+               color: BUTTON_JUMP_SHADOW_DISABLED_COLOR_INC; \
+            } \
+         } \
+         part { name: "elm.swallow.icon.proxy"; \
+            type: RECT; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               color: BUTTON_JUMP_NORMAL_COLOR_INC; \
+            } \
+            description { state: "clicked" 0.0; \
+               color: BUTTON_JUMP_PRESSED_COLOR_INC; \
+            } \
+            description { state: "disabled" 0.0; \
+               color: BUTTON_JUMP_DISABLED_COLOR_INC; \
             } \
          } \
          part { name: "over1"; \
          program { name: "button_click_anim"; \
             action: STATE_SET "clicked" 0.0; \
             target: "button_image"; \
-            target: "jump_image"; \
+            target: "jump_image.shadow.proxy"; \
+            target: "elm.swallow.icon.shadow.proxy"; \
+            target: "elm.swallow.icon.proxy"; \
          } \
          program { name: "button_double_click"; \
             signal: "mouse,down,1,double"; \
          program { name: "button_unclick_anim"; \
             action: STATE_SET "default" 0.0; \
             target: "button_image"; \
-            target: "jump_image"; \
+            target: "jump_image.shadow.proxy"; \
+            target: "elm.swallow.icon.shadow.proxy"; \
+            target: "elm.swallow.icon.proxy"; \
          } \
          program { name: "touch_snd"; \
             signal: "mouse,clicked,1"; \
             source: "elm"; \
             action: STATE_SET "disabled" 0.0; \
             target: "button_image"; \
-            target: "jump_image"; \
+            target: "jump_image.shadow.proxy"; \
+            target: "elm.swallow.icon.shadow.proxy"; \
+            target: "elm.swallow.icon.proxy"; \
          } \
          program { name: "enable"; \
             signal: "elm,state,enabled"; \
             source: "elm"; \
             action: STATE_SET "default" 0.0; \
             target: "button_image"; \
-            target: "jump_image"; \
+            target: "jump_image.shadow.proxy"; \
+            target: "elm.swallow.icon.shadow.proxy"; \
+            target: "elm.swallow.icon.proxy"; \
          } \
          program { name: "action_focus"; \
             signal: "elm,action,focus_highlight,show"; \
@@ -4048,125 +3459,13 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/multiline";
-      alias: "elm/button/base/text_only/multiline";
-      inherit: "elm/button/base/default";
-      styles{
-         style { name: "btn_multiline_style";
-            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_MULTILINE_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed ellipsis=1.0 text_class=tizen";
-            tag: "br" "\n";
-            tag: "ps" "ps";
-            tag: "tab" "\t";
-         }
-      }
-      parts {
-         part { name: "button_image";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_DEFAULT_STYLE_MULTILINE_BG_MIN_INC;
-               image {
-                  normal: "00_button_01.png";
-                  border: BUTTON_DEFAULT_STYLE_BG_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_press.png";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_dim.png";
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_press.png";
-            }
-         }
-         part { name: "padding_left_top";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel2.relative: 0.0 0.0;
-               min: BUTTON_DEFAULT_STYLE_MULTILINE_PADDING_MIN_INC;
-               fixed: 1 1;
-               visible: 0;
-            }
-         }
-         part { name: "padding_right_bottom";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 1.0 1.0;
-               rel1.relative: 1.0 1.0;
-               min: BUTTON_DEFAULT_STYLE_MULTILINE_PADDING_MIN_INC;
-               fixed: 1 1;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            clip_to: "disclip";
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "padding_icon_text";
-                  to_y: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "padding_right_bottom";
-               }
-               color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
-               text {
-                  style: "btn_multiline_style";
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 80 0;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 0 0;
-               color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
-               visible: 1;
-               min: 80 0;
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 0 0;
-               color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
-            }
-         }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-#define BUTTON_COLORSELECTOR_STYLES(style_name, image_normal, image_press) \
+#define BUTTON_COLORSELECTOR_STYLES(style_name, image_normal) \
    group { name: "elm/button/base/"style_name; \
       data { \
          item: "focus_highlight" "on"; \
       } \
       images { \
          image: image_normal COMP; \
-         image: image_press COMP; \
          image: image_dim COMP; \
          image: "00_button_01.png" COMP; \
          image: "00_button_01_press.png" COMP; \
@@ -4223,33 +3522,77 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
          } \
          part { name: "button_center_part"; \
             scale: 1; \
-            clip_to: "icon_clipper"; \
             description { state: "default" 0.0; \
                min: BUTTON_COLORSELECTOR_IMAGE_MIN_MAX_INC; \
                max: BUTTON_COLORSELECTOR_IMAGE_MIN_MAX_INC; \
                image.normal: image_normal; \
             } \
-            description { \
-               state: "clicked" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: image_press; \
+         } \
+         part { name: "elm.swallow.icon.shadow.proxy"; \
+            type: PROXY; \
+            clip_to: "elm.icon.proxy.clipper"; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+                source: "button_center_part"; \
+                proxy.source_clip: 0; \
+                rel1 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_COLORSELECTOR_NORMAL_TOP_OFFSET_INC; \
+                } \
+                rel2 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_COLORSELECTOR_NORMAL_BOTTOM_OFFSET_INC; \
+                } \
             } \
-            description { \
-               state: "disabled" 0.0; \
-               inherit: "default" 0.0; \
+            description { state: "clicked" 0.0; \
+                inherit: "default" 0.0; \
+                rel1 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_COLORSELECTOR_PRESSED_TOP_OFFSET_INC; \
+                } \
+                rel2 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_COLORSELECTOR_PRESSED_BOTTOM_OFFSET_INC; \
+                } \
+            } \
+            description { state: "disabled" 0.0; \
+                inherit: "default" 0.0; \
+            } \
+         } \
+         part { name: "elm.swallow.icon.proxy"; \
+            type: PROXY; \
+            scale: 1; \
+            clip_to: "icon_clipper"; \
+            description { state: "default" 0.0; \
+                source: "button_center_part"; \
+                proxy.source_clip: 0; \
+                rel1.to: "button_center_part"; \
+                rel2.to: "button_center_part"; \
+            } \
+         }\
+         part { name: "elm.icon.proxy.clipper"; \
+            type: RECT; \
+            description { state: "default" 0.0; \
+               color: BUTTON_COLORSELECTOR_SHADOW_NORMAL_COLOR_INC; \
+            } \
+            description { state: "clicked" 0.0; \
+               color: BUTTON_COLORSELECTOR_SHADOW_PRESSED_COLOR_INC; \
+            } \
+            description { state: "disabled" 0.0; \
+               color: BUTTON_COLORSELECTOR_SHADOW_DISABLED_COLOR_INC; \
             } \
          } \
          part { name: "icon_clipper"; \
             type: RECT; \
             scale: 1; \
             description { state: "default" 0.0; \
-               color: BUTTON_TEXT_COLORSELECTOR_NORMAL_COLOR_INC; \
+               color: BUTTON_COLORSELECTOR_NORMAL_COLOR_INC; \
             } \
             description { state: "clicked" 0.0; \
-               color: BUTTON_TEXT_COLORSELECTOR_PRESSED_COLOR_INC; \
+               color: BUTTON_COLORSELECTOR_PRESSED_COLOR_INC; \
             } \
             description { state: "disabled" 0.0; \
-               color: BUTTON_TEXT_COLORSELECTOR_DISABLED_COLOR_INC; \
+               color: BUTTON_COLORSELECTOR_DISABLED_COLOR_INC; \
             } \
          } \
          part { name: "over1"; \
@@ -4288,7 +3631,8 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
          program { name: "button_click_anim"; \
             action: STATE_SET "clicked" 0.0; \
             target: "button_image"; \
-            target: "button_center_part"; \
+            target: "elm.swallow.icon.proxy"; \
+            target: "elm.icon.proxy.clipper"; \
             target: ""icon_clipper""; \
          } \
          program { name: "button_double_click"; \
@@ -4305,7 +3649,8 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
          program { name: "button_unclick_anim"; \
             action: STATE_SET "default" 0.0; \
             target: "button_image"; \
-            target: "button_center_part"; \
+            target: "elm.swallow.icon.proxy"; \
+            target: "elm.icon.proxy.clipper"; \
             target: ""icon_clipper""; \
          } \
          program { name: "touch_snd"; \
@@ -4323,7 +3668,8 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             action: STATE_SET "disabled" 0.0; \
             target: "disabler"; \
             target: "button_image"; \
-            target: "button_center_part"; \
+            target: "elm.swallow.icon.proxy"; \
+            target: "elm.icon.proxy.clipper"; \
             target: ""icon_clipper""; \
          } \
          program { name: "enable"; \
@@ -4332,7 +3678,8 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             action: STATE_SET "default" 0.0; \
             target: "disabler"; \
             target: "button_image"; \
-            target: "button_center_part"; \
+            target: "elm.swallow.icon.proxy"; \
+            target: "elm.icon.proxy.clipper"; \
             target: ""icon_clipper""; \
          } \
          program { name: "action_focus"; \
@@ -4350,9 +3697,9 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
       } \
    }
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_COLORSELECTOR_STYLES("colorselector/left/default", "00_button_left.png", "00_button_left_press.png")
+   BUTTON_COLORSELECTOR_STYLES("colorselector/left/default", "00_button_left.png")
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_COLORSELECTOR_STYLES("colorselector/right/default", "00_button_right.png", "00_button_right_press.png")
+   BUTTON_COLORSELECTOR_STYLES("colorselector/right/default", "00_button_right.png")
 ///////////////////////////////////////////////////////////////////////////////////////
 
    group { name: "elm/button/base/multibuttonentry";
@@ -4380,7 +3727,7 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             tag: "tab" "\t";
          }
          style { name: "btn_base_multibuttonentry_dim";
-            base: "font=Tizen:style=Regular font_size="BUTTON_CONTACT_FONT_SIZE_INC" align=center color="BUTTON_CONTACT_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            base: "font=Tizen:style=Regular font_size="BUTTON_CONTACT_FONT_SIZE_INC" align=center color="BUTTON_CONTACT_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_CONTACT_BUTTON_TEXTBLOCK_DIM_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
             tag: "br" "\n";
             tag: "ps" "ps";
             tag: "tab" "\t";
@@ -5780,7 +5127,6 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
          }
          part { name: "arrow_expand";
             scale: 1;
-            clip_to: "icon_clipper";
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 0.0 0.5;
@@ -5792,6 +5138,74 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                image.normal:"00_arrow_expand.png";
             }
          }
+         part { name: "arrow_expand.shadow.proxy";
+            type: PROXY;
+            scale: 1;
+            clip_to: "arrow_expand.shadow.clipper";
+            description { state: "default" 0.0;
+               source: "arrow_expand";
+               proxy.source_clip: 0;
+               rel1 {
+                  to: "arrow_expand";
+                  offset: BUTTON_EXPANDABLE_NORMAL_TOP_OFFSET_INC;
+               }
+               rel2 {
+                  to: "arrow_expand";
+                  offset: BUTTON_EXPANDABLE_NORMAL_BOTTOM_OFFSET_INC;
+               }
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               rel1 {
+                  to: "icon_rect";
+                  offset: BUTTON_EXPANDABLE_PRESSED_TOP_OFFSET_INC;
+               }
+               rel2 {
+                  to: "arrow_expand";
+                  offset: BUTTON_EXPANDABLE_PRESSED_BOTTOM_OFFSET_INC;
+               }
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+            }
+         }
+         part { name: "arrow_expand.proxy";
+            type: PROXY;
+            scale: 1;
+            clip_to: "icon_clipper";
+            description { state: "default" 0.0;
+               source: "arrow_expand";
+               proxy.source_clip: 0;
+               rel1.to: "arrow_expand";
+               rel2.to: "arrow_expand";
+            }
+         }
+         part { name: "arrow_expand.shadow.clipper";
+            scale: 1;
+            type: RECT;
+            description { state: "default" 0.0;
+               color: BUTTON_EXPANDABLE_SHADOW_NORMAL_COLOR_INC;
+            }
+            description { state: "clicked" 0.0;
+               color: BUTTON_EXPANDABLE_SHADOW_PRESSED_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               color: BUTTON_EXPANDABLE_SHADOW_DISABLED_COLOR_INC;
+            }
+         }
+         part { name: "icon_clipper";
+            scale: 1;
+            type: RECT;
+            description { state: "default" 0.0;
+               color: BUTTON_NUMBER_ICON_NORMAL_COLOR_INC;
+            }
+            description { state: "clicked" 0.0;
+               color: BUTTON_NUMBER_ICON_PRESSED_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               color: BUTTON_NUMBER_ICON_DISABLED_COLOR_INC;
+            }
+         }
          part { name: "elm.text";
             type: TEXTBLOCK;
             mouse_events: 0;
@@ -5845,19 +5259,6 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                }
             }
          }
-         part { name: "icon_clipper";
-            scale: 1;
-            type: RECT;
-            description { state: "default" 0.0;
-               color: BUTTON_NUMBER_ICON_NORMAL_COLOR_INC;
-            }
-            description { state: "clicked" 0.0;
-               color: BUTTON_NUMBER_ICON_PRESSED_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               color: BUTTON_NUMBER_ICON_DISABLED_COLOR_INC;
-            }
-         }
          part { name: "over2";
             type: RECT;
             repeat_events: 1;
@@ -5895,6 +5296,8 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
          program { name: "button_click_anim";
             action: STATE_SET "clicked" 0.0;
             target: "button_image";
+            target: "arrow_expand.shadow.proxy";
+            target: "arrow_expand.shadow.clipper";
             target: "icon_clipper";
             after: "text_clicked";
          }
@@ -5923,6 +5326,8 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                  {
                     set_state(PART:"button_image", "default", 0.0);
                     set_state(PART:"elm.text", "visible", 0.0);
+                    set_state(PART:"arrow_expand.shadow.proxy", "visible", 0.0);
+                    set_state(PART:"arrow_expand.shadow.clipper", "visible", 0.0);
                     set_state(PART:"icon_clipper", "default", 0.0);
                  }
             }
@@ -5960,6 +5365,8 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             action: STATE_SET "disabled" 0.0;
             target: "button_image";
             target: "disabler";
+            target: "arrow_expand.shadow.proxy";
+            target: "arrow_expand.shadow.clipper";
             target: "icon_clipper";
             after: "disable_text";
          }
@@ -5981,6 +5388,8 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             action: STATE_SET "default" 0.0;
             target: "button_image";
             target: "disabler";
+            target: "arrow_expand.shadow.proxy";
+            target: "arrow_expand.shadow.clipper";
             target: "icon_clipper";
             after: "enable_text";
          }