X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=themes%2Finc%2Ftizen-light-inc.edc;h=472960428d2ab714ca6b0324af2da6ca4f786e98;hb=78a3bc2565392ff7879bfc94c8cf740826cb1f2a;hp=738cabcfd3ee17226a216e1aefa04e01b9b7b997;hpb=db83996ac3380bd5654e0555d2cfe3a9677e6f4c;p=platform%2Fcore%2Fuifw%2Fefl-theme-tizen.git

diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc
index 738cabc..4729604 100755
--- a/themes/inc/tizen-light-inc.edc
+++ b/themes/inc/tizen-light-inc.edc
@@ -70,7 +70,6 @@
 #define NAVIFRAME_PADDING_INC 16 0
 #define NAVIFRAME_LANDSCAPE_PADDING_INC 34 0
 #define NAVIFRAME_PADDING2_INC 9 0
-#define NAVIFRAME_PADDING_BADGE_INC 2 0
 #define NAVIFRAME_PADDING3_INC 8 0
 #define NAVIFRAME_MIDDLE_PADDING_INC 0 12
 #define NAVIFRAME_BOTTOM_TEXT_PADDING_INC 0 11
@@ -78,10 +77,12 @@
 #define NAVIFRAME_BOTTOM_PADDING_INC 0 12
 #define NAVIFRAME_LANDSCAPE_BOTTOM_PADDING_INC 0 5
 #define NAVIFRAME_BADGE_PADDING_INC 85 0
+#define NAVIFRAME_BADGE_LEFT_PADDING_INC 8 0
 #define NAVIFRAME_BADGE_TOP_PADDING_INC 0 3
-#define NAVIFRAME_BADGE_LEFT_TEXT_PADDING_INC 10 0
+#define NAVIFRAME_BADGE_TEXT_LEFT_PADDING_INC 12 54
 #define NAVIFRAME_BADGE_TEXT_H_INC 26
-#define NAVIFRAME_BADGE_TEXT_W_INC 42
+#define NAVIFRAME_BADGE_TEXT_MIN_W_INC 30
+#define NAVIFRAME_BADGE_TEXT_MAX_W_INC 60
 #define NAVIFRAME_BADGE_BG_IMAGE_SIZE_INC 54 54
 #define NAVIFRAME_BADGE_BG_IMAGE_BORDER_INC 29 24 0 0
 #define NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC 112 0
@@ -93,8 +94,10 @@
 #define NAVIFRAME_SUBTITLE_TEXT_COLOR_INC 59 115 182 255
 #define NAVIFRAME_SUBTITLE_FONT_SIZE_INC 32
 #define NAVIFRAME_LANDSCAPE_SUBTITLE_FONT_SIZE_INC 28
-#define NAVIFRAME_SUBTITLE_HEIGHT_INC 34
-#define NAVIFRAME_LANDSCAPE_SUBTITLE_HEIGHT_INC 30
+#define NAVIFRAME_SUBTITLE_H_INC 34
+#define NAVIFRAME_LANDSCAPE_SUBTITLE_H_INC 30
+#define NAVIFRAME_SUBTITLE_TOP_PADDING_H_INC 6
+#define NAVIFRAME_LANDSCAPE_SUBTITLE_TOP_PADDING_H_INC 4
 #define NAVIFRAME_TITLE_TEXT_UNSELECTED_COLOR_INC 153 153 153 255
 #define NAVIFRAME_BADGE_TEXT_COLOR_INC 10 100 208 255;
 #define NAVIFRAME_DUAL_TITLE_DIVIDER_LEFT_COLOR_INC 211 209 203 255
@@ -118,17 +121,21 @@
 #define CTXPOPUP_SHADOW_TOP_PADDING 14
 #define CTXPOPUP_SHADOW_BOTTOM_PADDING 14
 #define CTXPOPUP_CONTENT_PADDING_WIDTH 1
-#define CTXPOPUP_CONTENT_PADDING_HEIGHT 8
+#define CTXPOPUP_CONTENT_PADDING_HEIGHT 1
+#define CTXPOPUP_PRESS_PADDING 4
+#define CTXPOPUP_PRESS_PADDING2 3
 #define CTXPOPUP_ARROW_PADDING 1
 #define CTXPOPUP_SCROLLER_PADDING 8
 #define CTXPOPUP_SCROLLER_V_MIN_SIZE_INC 9 18
 #define CTXPOPUP_SCROLLER_H_MIN_SIZE_INC 18 9
 #define CTXPOPUP_FRAME_CORNER_ARROW_PADDING 18
+#define CTXPOPUP_ICON_CLIP_DEFAULT_COLOR_INC 255 255 255 255
+#define CTXPOPUP_ICON_CLIP_DIM_COLOR_INC 255 255 255 76
 #define CTXPOPUP_MAIN_TEXT_COLOR_INC 255 255 255 255
-#define CTXPOPUP_MAIN_TEXT_DIM_COLOR_INC 255 255 255 178
+#define CTXPOPUP_MAIN_TEXT_DIM_COLOR_INC 255 255 255 76
 #define CTXPOPUP_MAIN_TEXT_PRESS_COLOR_INC 255 255 255 255
 #define CTXPOPUP_LIST_MAIN_TEXT_COLOR_INC 255 255 255 255
-#define CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC 255 255 255 178
+#define CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC 255 255 255 76
 #define CTXPOPUP_LIST_MAIN_TEXT_PRESS_COLOR_INC 255 255 255 255
 #define CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC 1
 #define CTXPOPUP_SEPARATOR_PADDING_INC 20
@@ -136,8 +143,8 @@
 #define CTXPOPUP_SEPARATOR2_COLOR_INC 98 102 117 255
 #define CTXPOPUP_HORIZONTAL_SEPARATOR_1_COLOR_INC 29 38 60 255
 #define CTXPOPUP_HORIZONTAL_SEPARATOR_2_COLOR_INC 98 102 117 255
-#define CTXPOPUP_HORIZONTAL_SEPARATOR_MIN_SIZE_INC 1 74
-#define CTXPOPUP_HORIZONTAL_SEPARATOR_MAX_SIZE_INC 1 74
+#define CTXPOPUP_HORIZONTAL_SEPARATOR_MIN_SIZE_INC 1 96
+#define CTXPOPUP_HORIZONTAL_SEPARATOR_MAX_SIZE_INC 1 96
 #define CTXPOPUP_ITEM_DISABLED_COLOR 0 0 0 0
 #define CTXPOPUP_LIST_MAIN_TEXT_SIZE_INC 40
 #define CTXPOPUP_LIST_MAIN_TEXT_MAX_SIZE_INC (CTXPOPUP_LIST_MAIN_TEXT_SIZE_INC * 2)
@@ -159,6 +166,7 @@
 #define CTXPOPUP_TP_HEIGHT_INC 102
 #define CTXPOPUP_MORE_WIDTH_MIN_INC 502
 #define CTXPOPUP_MORE_WIDTH_MAX_INC 720
+#define CTXPOPUP_MORE_WIDTH_LANDSCAPE_MAX_INC 1280
 #define CTXPOPUP_MORE_ITEM_PADDING_INC 16
 #define CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC 110
 #define CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC 130
@@ -167,7 +175,7 @@
 #define CTXPOPUP_MORE_ITEM_TEXT_SIZE_INC 40
 #define CTXPOPUP_MORE_SEPARATOR_PADDING_INC 20
 #define CTXPOPUP_MOVE_PAD_INC 40
-#define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC 336
+#define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC 334
 #define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MAX_INC 720
 #define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MIN_INC 90
 #define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC 130
@@ -422,15 +430,15 @@
 #define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_PRESSED_COLOR_INC 64 127 247 255
 #define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DISABLED_COLOR_INC 101 101 101 76
 
-#define BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC 58 58 58 255
-#define BUTTON_NAVIFRAME_TITLE_TEXT_PRESSED_COLOR_INC 255 255 255 255
-#define BUTTON_NAVIFRAME_TITLE_TEXT_FOCUSED_COLOR_INC 255 255 255 255
-#define BUTTON_NAVIFRAME_TITLE_TEXT_DISABLED_COLOR_INC 58 58 58 76
+#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_NORMAL_COLOR_INC 58 58 58 255
+#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_PRESSED_COLOR_INC 255 255 255 255
+#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_FOCUSED_COLOR_INC 255 255 255 255
+#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_DISABLED_COLOR_INC 58 58 58 76
 
-#define BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_NORMAL_COLOR_INC "#3A3A3AFF"
-#define BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_PRESSED_COLOR_INC "#FFFFFFFF"
-#define BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_FOCUSED_COLOR_INC "#FFFFFFFF"
-#define BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_DISABLED_COLOR_INC "#3A3A3A4C"
+#define BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_NORMAL_COLOR_INC "#3A3A3AFF"
+#define BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_PRESSED_COLOR_INC "#FFFFFFFF"
+#define BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_FOCUSED_COLOR_INC "#FFFFFFFF"
+#define BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_DISABLED_COLOR_INC "#3A3A3A4C"
 
 #define BUTTON_CIRCLE_STYLE_NORMAL_COLOR_INC 101 101 101 255
 #define BUTTON_CIRCLE_STYLE_PRESSED_COLOR_INC 255 255 255 255
@@ -568,18 +576,24 @@
 #define BUTTON_NAVIFRAME_TITLE_ICON_TOP_PADDING_INC 0 34
 #define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_TOP_PADDING_INC 0 17
 
-#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MIN_INC 182 72
-#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MAX_INC 496 72
-#define BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_MIN_INC 126 70
-#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC 35 35 35 35
-#define BUTTON_NAVIFRAME_TITLE_TEXT_PADDING_MIN_INC 28 5
+#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_MIN_MAX_INC 124 96
+#define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_MIN_MAX_INC 124 91
+#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC 8 8 8 8
 #define BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC 32
-#define BUTTON_NAVIFRAME_TITLE_VISIBLE_PADDING_ICON_TEXT_MIN_INC 8 0
-#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_COLOR_INC 249 249 249 255
+#define BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC "#FAFAFA"
+#define BUTTON_NAVIFRAME_TITLE_TEXT_SHADOW_NORMAL_COLOR_INC "#000000"
 
-#define BUTTON_NAVIFRAME_TITLE_TEXT_LANDSCAPE_BG_NORMAL_MIN_INC 330 72
-#define BUTTON_NAVIFRAME_TITLE_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC 1012 72
-#define BUTTON_NAVIFRAME_TITLE_LANDSCAPE_TEXTBLOCK_MIN_INC 274 70
+#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MIN_INC 182 72
+#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MAX_INC 496 72
+#define BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_MIN_INC 126 70
+#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_PRESSED_BORDER_INC 35 35 35 35
+#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_PADDING_MIN_INC 28 5
+#define BUTTON_NAVIFRAME_TOOLBAR_VISIBLE_PADDING_ICON_TEXT_MIN_INC 8 0
+#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_COLOR_INC 249 249 249 255
+
+#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MIN_INC 330 72
+#define BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC 1012 72
+#define BUTTON_NAVIFRAME_TOOLBAR_LANDSCAPE_TEXTBLOCK_MIN_INC 274 70
 
 #define BUTTON_TOOLBAR_SEGMENTEDCONTROL_TEXT_FONT_SIZE_INC 32
 #define BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_NORMAL_MIN_INC 190 70
@@ -590,8 +604,8 @@
 #define BUTTON_TOOLBAR_SEGMENTEDCONTROL_TEXTBLOCK_MIN_INC 110 70
 #define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_MIN_INC 16 16
 
-#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_NORMAL_COLOR_INC 58 58 58 255
-#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_PRESSED_COLOR_INC 255 255 255 255
+#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_NORMAL_COLOR_INC 250 250 250 255
+#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_PRESSED_COLOR_INC 250 250 250 255
 
 #define BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC 85 98
 #define BUTTON_NAVIFRAME_LANDSCAPE_MORE_BG_MIN_MAX_INC 85 85
@@ -609,7 +623,7 @@
 
 #define BUTTON_COLORSELECTOR_BG_DEFAULT_MIN_INC 74 74
 #define BUTTON_COLORSELECTOR_BG_BORDER_INC 13 13 13 13
-#define BUTTON_COLORSELECTOR_IMAGE_MIN_MAX_INC 74 74
+#define BUTTON_COLORSELECTOR_IMAGE_MIN_MAX_INC 45 45
 
 #define BUTTON_DEFAULT_STYLE_BG_MIN_INC 100 74
 #define BUTTON_DEFAULT_STYLE_BG_BORDER_INC 13 13 13 13
@@ -639,6 +653,9 @@
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_DISABLED_COLOR_INC 128 128 128 76
 
 #define BUTTON_SEARCH_CLEAR_BUTTON_MIN_MAX_INC 45 45
+#define BUTTON_SEARCH_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 128 128 128 76
 
 #define BUTTON_JUMP_STYLE_BG_MIN_INC 72 72
 #define BUTTON_JUMP_ICON_NORMAL_COLOR_INC 58 58 58 255
@@ -815,9 +832,7 @@
 #define MULTIBUTTONENTRY_GUIDE_TEXT_COLOR_INC "#79838A" //same as editfield
 #define MULTIBUTTONENTRY_BUTTON_HEIGHT_INC 66
 #define MULTIBUTTONENTRY_BUTTON_PAD_INC 12
-#define MULTIBUTTONENTRY_BUTTON_MAX_INC 394
-#define MULTIBUTTONENTRY_BUTTON_TEXT_MAX_INC 382
-#define MULTIBUTTONENTRY_BUTTON_NINEPATCH_INC 8 8 6 8
+#define MULTIBUTTONENTRY_BUTTON_NINEPATCH_INC 8 8 17 17
 #define MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC 32
 #define MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INC "#FFFFFF"
 #define MULTIBUTTONENTRY_NUMBER_TEXT_COLOR_INC 128 128 128 255 // same as multibuttonentry label
@@ -885,6 +900,8 @@
 #define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MIN_INC 900 0
 #define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MAX_INC 900 720
 #define POPUP_BASE_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC 26 26 32 47
+#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC 26 26 32 47
+#define POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC 26 26 32 47
 #define POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC 636 78
 #define POPUP_BASE_DEFAULT_TITLE_LANDSCAPE_MIN_INC 816 78
 #define POPUP_BASE_DEFAULT_TITLE_VOLUMEBAR_MIN_INC 648 68
@@ -901,6 +918,8 @@
 #define POPUP_LABEL_DESC_TOP_PADDING 32
 #define POPUP_LABEL_DESC_BOTTOM_PADDING 32
 #define POPUP_ACTION_DESC_TOP_PADDING 20
+#define POPUP_TITLE_LEFT_PADDING 42
+#define POPUP_TITLE_RIGHT_PADDING 42
 #define POPUP_TITLE_TOP_PADDING 20
 #define POPUP_TITLE_BOTTOM_PADDING 0
 #define POPUP_TITLE_ICON_TEXT_PADDING_INC 16 0
@@ -984,6 +1003,8 @@
 #define MAGNIFIER_HEIGHT_FIXED 134
 #define MAGNIFIER_WIDTH_FIXED 312
 
+#define ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC 36
+
 #define ENTRY_BUBBLE_EX_PAD 58
 #define ENTRY_BUBBLE_EX_CALLERID_PAD 178
 #define ENTRY_BUBBLE_IX_PAD 20
@@ -1089,7 +1110,8 @@
 #define COLORSELECTOR_BUTTON_WIDTH 74
 #define COLORSELECTOR_BUTTON_HEIGHT 74
 #define COLORSELECTOR_BUTTON_BORDER 6 6 6 6
-#define COLORSELECTOR_PADDING_COLOR_INC 225 223 218 255
+#define COLORSELECTOR_PADDING_COLOR_TOP_INC 185 184 178 255
+#define COLORSELECTOR_PADDING_COLOR_BOTTOM_INC 225 223 218 255
 
 #define COLORSELECTOR_PALETTE_COLORBG_MIN_WIDTH_INC 86
 #define COLORSELECTOR_PALETTE_COLORBG_MIN_HEIGHT_INC 86