diff options
| author | ChunEon Park <chuneon.park@samsung.com> | 2012-07-12 18:21:39 +0900 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@localhost> | 2012-07-12 18:21:39 +0900 |
| commit | e9e6ce549c24664610c51df7cbae6a2ad253aef2 (patch) | |
| tree | c90f11ad923f3b580987633a83530e116fdfb88e | |
| parent | 0becdd71f192fdc52c0bd5b7945d759987bf2ebf (diff) | |
| parent | 8a8d8f224b974900aaac175aa2bcc5431054aa5f (diff) | |
| download | efl-theme-tizen-e9e6ce549c24664610c51df7cbae6a2ad253aef2.tar.gz efl-theme-tizen-e9e6ce549c24664610c51df7cbae6a2ad253aef2.tar.bz2 efl-theme-tizen-e9e6ce549c24664610c51df7cbae6a2ad253aef2.zip | |
Merge "sync with grey-theme"
20 files changed, 4 insertions, 3 deletions
diff --git a/themes/images/tizen-hd/00_button_popup_focus.png b/themes/images/tizen-hd/00_button_popup_focus.png Binary files differdeleted file mode 100644 index ca979d49..00000000 --- a/themes/images/tizen-hd/00_button_popup_focus.png +++ /dev/null diff --git a/themes/images/tizen-hd/00_splitscreen_fixed_divider_bottom.png b/themes/images/tizen-hd/00_splitscreen_fixed_divider_bottom.png Binary files differindex 8e20f527..189cb102 100644 --- a/themes/images/tizen-hd/00_splitscreen_fixed_divider_bottom.png +++ b/themes/images/tizen-hd/00_splitscreen_fixed_divider_bottom.png diff --git a/themes/images/tizen-hd/00_splitscreen_fixed_divider_hor_left.png b/themes/images/tizen-hd/00_splitscreen_fixed_divider_hor_left.png Binary files differindex 6a39a9fd..c218268c 100644 --- a/themes/images/tizen-hd/00_splitscreen_fixed_divider_hor_left.png +++ b/themes/images/tizen-hd/00_splitscreen_fixed_divider_hor_left.png diff --git a/themes/images/tizen-hd/00_splitscreen_fixed_divider_hor_middle.png b/themes/images/tizen-hd/00_splitscreen_fixed_divider_hor_middle.png Binary files differindex 5bee1169..43051d96 100644 --- a/themes/images/tizen-hd/00_splitscreen_fixed_divider_hor_middle.png +++ b/themes/images/tizen-hd/00_splitscreen_fixed_divider_hor_middle.png diff --git a/themes/images/tizen-hd/00_splitscreen_fixed_divider_hor_right.png b/themes/images/tizen-hd/00_splitscreen_fixed_divider_hor_right.png Binary files differindex 8d641035..db21872e 100644 --- a/themes/images/tizen-hd/00_splitscreen_fixed_divider_hor_right.png +++ b/themes/images/tizen-hd/00_splitscreen_fixed_divider_hor_right.png diff --git a/themes/images/tizen-hd/00_splitscreen_fixed_divider_middle.png b/themes/images/tizen-hd/00_splitscreen_fixed_divider_middle.png Binary files differindex 58ff5689..bf62ce89 100644 --- a/themes/images/tizen-hd/00_splitscreen_fixed_divider_middle.png +++ b/themes/images/tizen-hd/00_splitscreen_fixed_divider_middle.png diff --git a/themes/images/tizen-hd/00_splitscreen_fixed_divider_top.png b/themes/images/tizen-hd/00_splitscreen_fixed_divider_top.png Binary files differindex 153e02cb..e9521ac5 100644 --- a/themes/images/tizen-hd/00_splitscreen_fixed_divider_top.png +++ b/themes/images/tizen-hd/00_splitscreen_fixed_divider_top.png diff --git a/themes/images/tizen-hd/00_splitscreen_handler_bottom.png b/themes/images/tizen-hd/00_splitscreen_handler_bottom.png Binary files differindex f24a7c9a..24649dd9 100644 --- a/themes/images/tizen-hd/00_splitscreen_handler_bottom.png +++ b/themes/images/tizen-hd/00_splitscreen_handler_bottom.png diff --git a/themes/images/tizen-hd/00_splitscreen_handler_bottom_press.png b/themes/images/tizen-hd/00_splitscreen_handler_bottom_press.png Binary files differindex 3f54c0c2..d33c4578 100644 --- a/themes/images/tizen-hd/00_splitscreen_handler_bottom_press.png +++ b/themes/images/tizen-hd/00_splitscreen_handler_bottom_press.png diff --git a/themes/images/tizen-hd/00_splitscreen_handler_hor_left.png b/themes/images/tizen-hd/00_splitscreen_handler_hor_left.png Binary files differindex b64f78dc..471e73c0 100644 --- a/themes/images/tizen-hd/00_splitscreen_handler_hor_left.png +++ b/themes/images/tizen-hd/00_splitscreen_handler_hor_left.png diff --git a/themes/images/tizen-hd/00_splitscreen_handler_hor_left_press.png b/themes/images/tizen-hd/00_splitscreen_handler_hor_left_press.png Binary files differindex a7b9c782..8ef659bd 100644 --- a/themes/images/tizen-hd/00_splitscreen_handler_hor_left_press.png +++ b/themes/images/tizen-hd/00_splitscreen_handler_hor_left_press.png diff --git a/themes/images/tizen-hd/00_splitscreen_handler_hor_middle.png b/themes/images/tizen-hd/00_splitscreen_handler_hor_middle.png Binary files differindex ad15b1da..4aa9a156 100644 --- a/themes/images/tizen-hd/00_splitscreen_handler_hor_middle.png +++ b/themes/images/tizen-hd/00_splitscreen_handler_hor_middle.png diff --git a/themes/images/tizen-hd/00_splitscreen_handler_hor_middle_press.png b/themes/images/tizen-hd/00_splitscreen_handler_hor_middle_press.png Binary files differindex 6f65ff61..c2ef3215 100644 --- a/themes/images/tizen-hd/00_splitscreen_handler_hor_middle_press.png +++ b/themes/images/tizen-hd/00_splitscreen_handler_hor_middle_press.png diff --git a/themes/images/tizen-hd/00_splitscreen_handler_hor_right.png b/themes/images/tizen-hd/00_splitscreen_handler_hor_right.png Binary files differindex 881a03af..d5bbc85e 100644 --- a/themes/images/tizen-hd/00_splitscreen_handler_hor_right.png +++ b/themes/images/tizen-hd/00_splitscreen_handler_hor_right.png diff --git a/themes/images/tizen-hd/00_splitscreen_handler_hor_right_press.png b/themes/images/tizen-hd/00_splitscreen_handler_hor_right_press.png Binary files differindex a706d563..23040b5c 100644 --- a/themes/images/tizen-hd/00_splitscreen_handler_hor_right_press.png +++ b/themes/images/tizen-hd/00_splitscreen_handler_hor_right_press.png diff --git a/themes/images/tizen-hd/00_splitscreen_handler_middle.png b/themes/images/tizen-hd/00_splitscreen_handler_middle.png Binary files differindex 7fd7b138..50e0345e 100644 --- a/themes/images/tizen-hd/00_splitscreen_handler_middle.png +++ b/themes/images/tizen-hd/00_splitscreen_handler_middle.png diff --git a/themes/images/tizen-hd/00_splitscreen_handler_middle_press.png b/themes/images/tizen-hd/00_splitscreen_handler_middle_press.png Binary files differindex 2978f071..30d64581 100644 --- a/themes/images/tizen-hd/00_splitscreen_handler_middle_press.png +++ b/themes/images/tizen-hd/00_splitscreen_handler_middle_press.png diff --git a/themes/images/tizen-hd/00_splitscreen_handler_top.png b/themes/images/tizen-hd/00_splitscreen_handler_top.png Binary files differindex 39a2abe3..2f9e0eaf 100644 --- a/themes/images/tizen-hd/00_splitscreen_handler_top.png +++ b/themes/images/tizen-hd/00_splitscreen_handler_top.png diff --git a/themes/images/tizen-hd/00_splitscreen_handler_top_press.png b/themes/images/tizen-hd/00_splitscreen_handler_top_press.png Binary files differindex 054c6131..9159bba5 100644 --- a/themes/images/tizen-hd/00_splitscreen_handler_top_press.png +++ b/themes/images/tizen-hd/00_splitscreen_handler_top_press.png diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index 73d9dcdd..60fda238 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved + * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved * * PROPRIETARY/CONFIDENTIAL * @@ -116,6 +116,7 @@ #define GENLIST_HEIGHT_113_INC 113 #define GENLIST_HEIGHT_129_INC 129 #define GENLIST_HEIGHT_161_INC 161 +#define GENLIST_HEIGHT_165_INC 165 #define GENLIST_HEIGHT_177_INC 177 #define GENLIST_HEIGHT_182_INC 182 #define GENLIST_HEIGHT_190_INC 190 @@ -906,8 +907,8 @@ #define MULTIBUTTONENTRY_WIDTH_PAD_INC 15 #define MULTIBUTTONENTRY_HEIGHT_PAD_INC 20 #define MULTIBUTTONENTRY_BUTTON_MAX_SIZE_INC 300 -#define MULTIBUTTONENTRY_BUTTON_BASE_SIZE_INC 66 -#define MULTIBUTTONENTRY_BUTTON_NINEPATCH_INC 5 5 0 0 +#define MULTIBUTTONENTRY_BUTTON_BASE_SIZE_INC 76 +#define MULTIBUTTONENTRY_BUTTON_NINEPATCH_INC 28 28 0 0 #define MULTIBUTTONENTRY_BUTTON_TOP_BUTTOM_PAD_INC 12 #define MULTIBUTTONENTRY_BUTTON_LEFT_INNER_PAD_INC 15 #define MULTIBUTTONENTRY_BUTTON_RIGHT_INNER_PAD_INC 15 |
