From: prince Date: Fri, 5 Apr 2013 16:07:33 +0000 (+0530) Subject: [Gengrid] UX v4.4 implementation. Two new styles added. Unnecessary one deleted. X-Git-Tag: 2.1b_release~15 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0fe054b8bef27c3ba0b95a3477a804dcd13ac985;p=framework%2Fuifw%2Fefl-theme-tizen.git [Gengrid] UX v4.4 implementation. Two new styles added. Unnecessary one deleted. Change-Id: Ia38afc4ffebd5d13344eb4583766bf59535dd6d7 --- diff --git a/themes/images/tizen-hd/Content_views/Gengrid/00_sub_depth_thumbs_bg.png b/themes/images/tizen-hd/Content_views/Gengrid/00_sub_depth_thumbs_bg.png new file mode 100644 index 0000000..14d90f4 Binary files /dev/null and b/themes/images/tizen-hd/Content_views/Gengrid/00_sub_depth_thumbs_bg.png differ diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index 7d5d91d..bd87702 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -163,14 +163,14 @@ #define LABEL_TEXT_BLOCK_STYLE_COLOR_INC "#000000" #define LABEL_FONT_SIZE_INC 36 -#define GENGRID_FONT_STYLE_18_INC "26" +#define GENGRID_FONT_STYLE_24_INC "24" #define GENGRID_PART_BG_COLOR_INC 0 0 0 0 #define GENGRID_PART_REORDER_DEFAULT_BG_COLOR_INC 0 0 0 77 #define GENGRID_PART_REORDER_BG_COLOR_INC 0 0 0 77 #define GENGRID_PART_TEXTBLOCK_STYLE_COLOR_INC "#000000" #define GENGRID_PART_BACKGROUND_COLOR_INC 0 0 0 0 #define GENGRID_EDIT_MODE_CHECK_TOP_RIGHT_INC 6 6 -#define GENGRID_EDIT_MODE_CHECK_SIZE_INC 54 54 +#define GENGRID_EDIT_MODE_CHECK_SIZE_INC 63 63 #define GENGRID_EDIT_MODE_CHECK_BG_COLOR_INC 0 0 0 154 #define GENGRID_ITEM_CHECK_TOP_RIGHT_PADDING_INC 6 6 @@ -182,17 +182,24 @@ #define GENGRID_DEFAULT_LEFT_TOP_FOCUS_PADDING_INC 2 2 #define GENGRID_DEFAULT_RIGHT_BOTTOM_FOCUS_PADDING_INC 2 2 -#define GENGRID_LANDSCAPE_LEFT_TOP_PADDING_INC 5 5 -#define GENGRID_LANDSCAPE_RIGHT_BOTTOM_PADDING_INC 5 5 -#define GENGRID_LANDSCAPE_LEFT_TOP_FOCUS_PADDING_INC 4 4 -#define GENGRID_LANDSCAPE_RIGHT_BOTTOM_FOCUS_PADDING_INC 4 4 -#define GENGRID_LANDSCAPE_GRID_TEXT_LEFT_TOP_PADDING_INC 5 5 -#define GENGRID_LANDSCAPE_GRID_TEXT_RIGHT_BOTTOM_PADDING_INC 5 59 -#define GENGRID_LANDSCAPE_GRID_TEXT_LEFT_TOP_FOCUS_PADDING_INC 4 4 -#define GENGRID_LANDSCAPE_GRID_TEXT_RIGHT_BOTTOM_FOCUS_PADDING_INC 4 60 - -#define GENGRID_GRID_TEXT_LEFT_TOP_PADDING_INC 2 2 -#define GENGRID_GRID_TEXT_RIGHT_BOTTOM_PADDING_INC 2 62 +#define GENGRID_GALLERY_LEFT_TOP_PADDING_INC 3 3 +#define GENGRID_GALLERY_RIGHT_BOTTOM_PADDING_INC 3 3 +#define GENGRID_GALLERY_ITEM_BG_LEFT_TOP_PADDING_INC 1 1 +#define GENGRID_GALLERY_ITEM_BG_RIGHT_BOTTOM_PADDING_INC 1 1 +#define GENGRID_GALLERY_ITEM_REAL_BG_RIGHT_PADDING_INC 0 0 +#define GENGRID_GALLERY_LEFT_TOP_FOCUS_PADDING_INC 1 1 +#define GENGRID_GALLERY_RIGHT_BOTTOM_FOCUS_PADDING_INC 1 1 + +#define GENGRID_MYFILE_LEFT_TOP_PADDING_INC 6 6 +#define GENGRID_MYFILE_RIGHT_BOTTOM_PADDING_INC 6 6 +#define GENGRID_MYFILE_ITEM_BG_LEFT_TOP_PADDING_INC 0 0 +#define GENGRID_MYFILE_ITEM_BG_RIGHT_BOTTOM_PADDING_INC 0 0 +#define GENGRID_MYFILE_ITEM_REAL_BG_RIGHT_PADDING_INC 0 0 +#define GENGRID_MYFILE_LEFT_TOP_FOCUS_PADDING_INC 4 4 +#define GENGRID_MYFILE_RIGHT_BOTTOM_FOCUS_PADDING_INC 4 4 + +#define GENGRID_GRID_TEXT_LEFT_TOP_PADDING_INC 6 6 +#define GENGRID_GRID_TEXT_RIGHT_BOTTOM_PADDING_INC 6 64 #define GENGRID_GRID_TEXT_ITEM_BG_LEFT_TOP_PADDING_INC 1 1 #define GENGRID_GRID_TEXT_ITEM_BG_RIGHT_BOTTOM_PADDING_INC 1 1 #define GENGRID_GRID_TEXT_ITEM_REAL_BG_RIGHT_PADDING_INC 0 0 diff --git a/themes/widgets/check.edc b/themes/widgets/check.edc index 1448bb6..1a0e701 100644 --- a/themes/widgets/check.edc +++ b/themes/widgets/check.edc @@ -1596,11 +1596,11 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE align: 0.0 0.0; fixed: 1 1; rel1 { - relative: 0.0 1.0; + relative: 1.0 1.0; to: "top_left_padding"; } rel2 { - relative: 0.0 1.0; + relative: 1.0 1.0; to: "top_left_padding"; } image.normal: "00_check_bg.png"; diff --git a/themes/widgets/gengrid.edc b/themes/widgets/gengrid.edc index 1f106bd..92fd27d 100644 --- a/themes/widgets/gengrid.edc +++ b/themes/widgets/gengrid.edc @@ -26,7 +26,7 @@ styles { style { name: "gengrid_textblock_style"; - base: "font=Tizen:style=Bold font_size="GENGRID_FONT_STYLE_18_INC" color="GENGRID_PART_TEXTBLOCK_STYLE_COLOR_INC" align=center wrap=mixed ellipsis=1.0 text_class=tizen"; + base: "font=Tizen:style=Bold font_size="GENGRID_FONT_STYLE_24_INC" color="GENGRID_PART_TEXTBLOCK_STYLE_COLOR_INC" align=center wrap=mixed ellipsis=1.0 text_class=tizen"; tag: "br" "\n"; tag: "ps" "ps"; tag: "tab" "\t"; @@ -95,7 +95,7 @@ } part { name: "item_bg_left_top_padding"; type: RECT; - scale : 1; + scale: 1; description { state: "default" 0.0; min: GENGRID_DEFAULT_ITEM_BG_LEFT_TOP_PADDING_INC; align: 0.0 0.0; @@ -110,7 +110,7 @@ } part { name: "item_bg_right_bottom_padding"; type: RECT; - scale : 1; + scale: 1; description { state: "default" 0.0; min: GENGRID_DEFAULT_ITEM_BG_RIGHT_BOTTOM_PADDING_INC; align: 1.0 1.0; @@ -139,7 +139,7 @@ } part { name: "item_real_bg_left_top_padding"; type: RECT; - scale : 1; + scale: 1; description { state: "default" 0.0; min: GENGRID_DEFAULT_ITEM_REAL_BG_RIGHT_PADDING_INC; align: 0.0 0.0; @@ -154,7 +154,7 @@ } part { name: "item_real_bg_right_bottom_padding"; type: RECT; - scale : 1; + scale: 1; description { state: "default" 0.0; min: GENGRID_DEFAULT_ITEM_REAL_BG_RIGHT_PADDING_INC; align: 1.0 1.0; @@ -290,34 +290,184 @@ } } - group { name: "elm/gengrid/item/landscape_grid/default"; + group { name: "elm/gengrid/item/gallery_grid/default"; inherit: "elm/gengrid/item/default_grid/default"; parts { part { name: "left_top_padding"; description { state: "default" 0.0; - min: GENGRID_LANDSCAPE_LEFT_TOP_PADDING_INC; + min: GENGRID_GALLERY_LEFT_TOP_PADDING_INC; } } part { name: "right_bottom_padding"; description { state: "default" 0.0; - min: GENGRID_LANDSCAPE_RIGHT_BOTTOM_PADDING_INC; + min: GENGRID_GALLERY_RIGHT_BOTTOM_PADDING_INC; + } + } + part { name: "item_bg"; + type: IMAGE; + description { state: "default" 0.0; + image.normal: "00_thumbs_loading_bg.png"; + } + } + part { name: "item_bg_left_1pxl_inner_padding"; + type: RECT; + description { state: "default" 0.0; + min: GENGRID_DEFAULT_ITEM_BG_LEFT_TOP_PADDING_INC; + align: 0.0 0.5; + fixed: 1 0; + rel1.to: "item_bg"; + rel2 { + relative: 0.0 1.0; + to: "item_bg"; + } + color: 91 86 86 255; + } + } + part { name: "item_bg_top_1pxl_inner_padding"; + type: RECT; + description { state: "default" 0.0; + min: GENGRID_DEFAULT_ITEM_BG_LEFT_TOP_PADDING_INC; + align: 0.5 0.0; + fixed: 0 1; + rel1 { + relative: 1.0 0.0; + to_x: "item_bg_left_1pxl_inner_padding"; + to_y: "item_bg"; + } + rel2 { + relative: 0.0 0.0; + to_x: "item_bg_right_1pxl_inner_padding"; + to_y: "item_bg"; + } + color: 91 86 86 255; + } + } + part { name: "item_bg_right_1pxl_inner_padding"; + type: RECT; + description { state: "default" 0.0; + min: GENGRID_DEFAULT_ITEM_BG_LEFT_TOP_PADDING_INC; + align: 1.0 0.5; + fixed: 1 0; + rel1 { + relative: 1.0 0.0; + to: "item_bg"; + } + rel2 { + relative: 1.0 1.0; + to: "item_bg"; + } + color: 91 86 86 255; + } + } + part { name: "item_bg_bottom_1pxl_inner_padding"; + type: RECT; + description { state: "default" 0.0; + min: GENGRID_DEFAULT_ITEM_BG_LEFT_TOP_PADDING_INC; + align: 0.5 1.0; + fixed: 0 1; + rel1 { + relative: 1.0 1.0; + to_x: "item_bg_left_1pxl_inner_padding"; + to_y: "item_bg"; + } + rel2 { + relative: 0.0 1.0; + to_x: "item_bg_right_1pxl_inner_padding"; + to_y: "item_bg"; + } + color: 91 86 86 255; + } + } + part { name: "item_real_bg"; + description { state: "default" 0.0; + visible: 0; + rel1 { + relative: 1.0 1.0; + to_x: "item_bg_left_1pxl_inner_padding"; + to_y: "item_bg_top_1pxl_inner_padding"; + } + rel2 { + relative: 0.0 0.0; + to_x: "item_bg_right_1pxl_inner_padding"; + to_y: "item_bg_bottom_1pxl_inner_padding"; + } } } part { name: "focus_bg_left_top_padding"; description { state: "default" 0.0; - min: GENGRID_LANDSCAPE_LEFT_TOP_FOCUS_PADDING_INC; + min: GENGRID_GALLERY_LEFT_TOP_FOCUS_PADDING_INC; } } part { name: "focus_bg_right_bottom_padding"; description { state: "default" 0.0; - min: GENGRID_LANDSCAPE_RIGHT_BOTTOM_FOCUS_PADDING_INC; + min: GENGRID_GALLERY_RIGHT_BOTTOM_FOCUS_PADDING_INC; } } } } + group { name: "elm/gengrid/item/myfile_grid/default"; + inherit: "elm/gengrid/item/default_grid/default"; + images { + image : "00_sub_depth_thumbs_bg.png" COMP; + } + parts { + part { name: "left_top_padding"; + description { state: "default" 0.0; + min: GENGRID_MYFILE_LEFT_TOP_PADDING_INC; + } + } + part { name: "right_bottom_padding"; + description { state: "default" 0.0; + min: GENGRID_MYFILE_RIGHT_BOTTOM_PADDING_INC; + } + } + part { name: "item_bg"; + type: IMAGE; + description { state: "default" 0.0; + image.normal: "00_sub_depth_thumbs_bg.png"; + image.border: 13 13 13 13; + } + } + part { name: "item_bg_left_top_padding"; + description { state: "default" 0.0; + min: GENGRID_MYFILE_ITEM_BG_LEFT_TOP_PADDING_INC; + } + } + part { name: "item_bg_right_bottom_padding"; + description { state: "default" 0.0; + min: GENGRID_MYFILE_ITEM_BG_RIGHT_BOTTOM_PADDING_INC; + } + } + part { name: "item_real_bg"; + description { state: "default" 0.0; + visible: 0; + rel1 { + relative: 1.0 1.0; + to: "item_bg_left_top_padding"; + } + rel2 { + relative: 0.0 0.0; + to: "item_bg_right_bottom_padding"; + } + } + } + part { name: "focus_bg_left_top_padding"; + description { state: "default" 0.0; + min: GENGRID_MYFILE_LEFT_TOP_FOCUS_PADDING_INC; + } + } + part { name: "focus_bg_right_bottom_padding"; + description { state: "default" 0.0; + min: GENGRID_MYFILE_RIGHT_BOTTOM_FOCUS_PADDING_INC; + } + } + } + } + group { name: "elm/gengrid/item/default_gridtext/default"; inherit: "elm/gengrid/item/default_grid/default"; + alias: "elm/gengrid/item/myfile_gridtext/default"; data.item: "texts" "elm.text"; data.item: "contents" "elm.swallow.icon elm.swallow.block elm.swallow.end"; parts { @@ -331,6 +481,13 @@ min: GENGRID_GRID_TEXT_RIGHT_BOTTOM_PADDING_INC; } } + part { name: "item_bg"; + type: IMAGE; + description { state: "default" 0.0; + image.normal: "00_sub_depth_thumbs_bg.png"; + image.border: 13 13 13 13; + } + } part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 0; @@ -393,32 +550,8 @@ } } - group { name: "elm/gengrid/item/landscape_gridtext/default"; - inherit: "elm/gengrid/item/default_gridtext/default"; - parts { - part { name: "left_top_padding"; - description { state: "default" 0.0; - min: GENGRID_LANDSCAPE_GRID_TEXT_LEFT_TOP_PADDING_INC; - } - } - part { name: "right_bottom_padding"; - description { state: "default" 0.0; - min: GENGRID_LANDSCAPE_GRID_TEXT_RIGHT_BOTTOM_PADDING_INC; - } - } - part { name: "focus_bg_left_top_padding"; - description { state: "default" 0.0; - min: GENGRID_LANDSCAPE_GRID_TEXT_LEFT_TOP_FOCUS_PADDING_INC; - } - } - part { name: "focus_bg_right_bottom_padding"; - description { state: "default" 0.0; - min: GENGRID_LANDSCAPE_GRID_TEXT_RIGHT_BOTTOM_FOCUS_PADDING_INC; - } - } - } - } + group { name: "elm/gengrid/item/default_gridtext2/default"; inherit: "elm/gengrid/item/default_gridtext/default"; parts {