From 36af1761b485372d6ec72795f08b94c5cd0dd58f Mon Sep 17 00:00:00 2001 From: Tae-Hwan Kim Date: Thu, 26 Jul 2012 04:10:43 +0900 Subject: [PATCH] Fix dialogue group title Change-Id: I1e6a3539409f8b17628b2aa47537aa6cd4d4515b --- themes/inc/tizen-hd-inc.edc | 13 ++++++- themes/widgets/genlist/genlist_group_index.edc | 2 +- themes/widgets/genlist/genlist_macro.edc | 23 ++++++++++++ themes/widgets/genlist/genlist_normal.edc | 51 ++++++++++---------------- 4 files changed, 56 insertions(+), 33 deletions(-) diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index 5799304..2acb027 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -118,6 +118,15 @@ //FIXME: Change from GENLIST_TREESIZE_DEFAULT to below macro #define GENLIST_TREESIZE_DEFAULT 32 +// Group Title +#define GENLIST_GT_PAD_T_H 36 +#define GENLIST_GT_PAD_B_H 10 +#define GENLIST_GT_TEXT_H 36 +#define GENLIST_GT_PAD_L_W 16 +#define GENLIST_GT_PAD_R_W 36 +#define GENLIST_GT_PAD_M_W 16 +#define GENLIST_GT_H GENLIST_GT_PAD_T_H + GENLIST_GT_PAD_B_H + GENLIST_GT_TEXT_H + #define GENLIST_HEIGHT_1_INC 1 #define GENLIST_HEIGHT_16_INC 16 #define GENLIST_HEIGHT_33_INC 33 @@ -310,6 +319,8 @@ #define GENLIST_PART_EDIT_1PIXEL_LINE_COLOR_INC 68 68 68 255 #define GENLIST_PART_BUBBLE_DATE_BG_COLOR_INC 66 66 66 255 #define GENLIST_PART_BUBBLE_1PIXEL_LINE_COLOR_INC 153 153 153 255 + +// Remove this, use GENLIST_PART_BASE_EVENT_OFF instead #define GENLIST_PART_INDEX_LIST_BASE_EVENT_INC \ part { name: "base_event";\ type: RECT;\ @@ -333,7 +344,7 @@ #define GENLIST_PART_TEXT_PRESS_STYLE_COLOR_INC "#F9F9F9FF" #define GENLIST_PART_MATCH_TAG_COLOR_INC "+ color=#3F8DAD" -#define GENLIST_DIALOGUE_FONT_SUB_TITLE_COLOR_INC 102 102 102 255 +#define GENLIST_DIALOGUE_GT_TEXT_COLOR 102 102 102 255 #define GENLIST_DIALOGUE_FONT_EDIT_MODE_TEXT_01_COLOR_INC 153 153 153 255 #define GENLIST_DIALOGUE_FONT_EDIT_MODE_TEXT_01_FOCUS_COLOR_INC 249 249 249 255 #define GENLIST_DIALOGUE_FONT_EDIT_MODE_TEXT_02_COLOR_INC 63 141 173 255 diff --git a/themes/widgets/genlist/genlist_group_index.edc b/themes/widgets/genlist/genlist_group_index.edc index 9ea7735..700e34c 100644 --- a/themes/widgets/genlist/genlist_group_index.edc +++ b/themes/widgets/genlist/genlist_group_index.edc @@ -245,7 +245,7 @@ relative: 0.0 1.0; to_x: "elm.padding.right"; } - color: GENLIST_DIALOGUE_FONT_SUB_TITLE_COLOR_INC; + color: GENLIST_DIALOGUE_GT_TEXT_COLOR; text { font: "SLP:style=Medium"; size: GENLIST_FONT_28_INC; diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc index f3757e8..d864fe3 100644 --- a/themes/widgets/genlist/genlist_macro.edc +++ b/themes/widgets/genlist/genlist_macro.edc @@ -27,6 +27,16 @@ } \ } +/// This block events +#define GENLIST_PART_BASE_EVENT_OFF \ + part { name: "base_event";\ + type: RECT;\ + repeat_events: 0;\ + description { state: "default" 0.0;\ + color: 0 0 0 0;\ + }\ + } + #define GENLIST_PART_BG \ part { name: "bg"; \ type: RECT; \ @@ -172,6 +182,19 @@ } \ } +#define GENLIST_DIALOGUE_PART_BASE( param_item_height ) \ + part { name: "base_part"; \ + type: RECT; \ + clip_to: "disclip"; \ + repeat_events: 1; \ + scale: 1; \ + description { state: "default" 0.0; \ + min: 0 param_item_height; \ + color: LAYOUT_GROUP_LIST_BG_COLOR_INC; \ + } \ + } + +// FIXME: Use above instead #define GENLIST_PART_DIALOGUE_BASE( param_item_height ) \ part { name: "base"; \ type: RECT; \ diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc index 054e91e..d84d9fe 100644 --- a/themes/widgets/genlist/genlist_normal.edc +++ b/themes/widgets/genlist/genlist_normal.edc @@ -15278,12 +15278,17 @@ } } -// 4.3.4 +// 2.4.4.1 group { name : "elm/genlist/item/dialogue/title/default"; alias: "elm/genlist/item_odd/dialogue/title/default"; alias: "elm/genlist/item_compress/dialogue/title/default"; alias: "elm/genlist/item_compress_odd/dialogue/title/default"; alias: "elm/layout/dialogue/title"; + alias: "elm/genlist/item/dialogue/grouptitle/default"; + alias: "elm/genlist/item_odd/dialogue/grouptitle/default"; + alias: "elm/genlist/item_compress/dialogue/grouptitle/default"; + alias: "elm/genlist/item_compress_odd/dialogue/grouptitle/default"; + alias: "elm/layout/dialogue/grouptitle"; data.item: "stacking" "above"; data.item: "selectraise" "on"; @@ -15292,25 +15297,31 @@ data.item: "treesize" "GENLIST_TREESIZE_DEFAULT"; parts { - GENLIST_PART_DIALOGUE_BASE( GENLIST_HEIGHT_77_INC ) - GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC ) - GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC ) - GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC ) + // GENLIST_PART_BASE_EVENT_OFF + GENLIST_PART_DISCLIP + GENLIST_DIALOGUE_PART_BASE( GENLIST_GT_H ) + GENLIST_PART_PADDING_TOP( GENLIST_GT_PAD_T_H ) + GENLIST_PART_PADDING_BOTTOM( GENLIST_GT_PAD_B_H ) + GENLIST_PART_PADDING_LEFT( GENLIST_GT_PAD_L_W ) + GENLIST_PART_PADDING_RIGHT( GENLIST_GT_PAD_R_W ) GENLIST_PART_BOTTOM_LINE part { name: "elm.text"; type: TEXT; scale: 1; description { state: "default" 0.0; + align: 0.0 0.0; rel1 { - relative: 1.0 0.0; + relative: 1.0 1.0; to_x: "elm.padding.left"; + to_y: "elm.padding.top"; } rel2 { relative: 0.0 0.0; - to_x: "elm.padding.icon.left"; + offset: GENLIST_GT_PAD_M_W 0; + to_x: "elm.icon"; to_y: "elm.padding.bottom"; } - color: GENLIST_DIALOGUE_FONT_SUB_TITLE_COLOR_INC; + color: GENLIST_DIALOGUE_GT_TEXT_COLOR; text { font: "SLP:style=Medium"; size: GENLIST_FONT_28_INC; @@ -15327,12 +15338,7 @@ min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; fixed: 1 1; - align: 1.0 1.0; - rel1 { - relative: 0.0 0.0; - to_x: "elm.padding.right"; - to_y: "elm.padding.bottom"; - } + align: 1.0 1.0; rel2 { relative: 0.0 0.0; to_x: "elm.padding.right"; @@ -15340,23 +15346,6 @@ } } } - part { name: "elm.padding.icon.left"; - type: RECT; - scale: 1; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - min: GENLIST_SIZE_16_INC 0; - fixed: 1 0; - align: 1.0 0.5; - rel1.to_x: "elm.icon"; - rel2 { - relative: 0.0 1.0; - to_x: "elm.icon"; - } - } - } - GENLIST_PART_DISCLIP } } -- 2.7.4