From c8b24469fa5299a701e2d1a2c23f0368cc6b2955 Mon Sep 17 00:00:00 2001 From: Bora Hwang Date: Fri, 24 May 2013 12:40:55 +0900 Subject: [PATCH] [ctxpopup] According to Winset GUI v5.2, ctxpopup can be as wide as 720px Also, changed horizontal and vertical scroller images Change-Id: I157d47e542427ad60e3e478ce70137faaf3da45f Conflicts: themes/inc/tizen-hd-inc.edc themes/widgets/ctxpopup.edc --- themes/images/tizen-hd/Popup/00_popup_scroll_h.png | Bin 0 -> 2942 bytes .../{00_popup_scroll.png => 00_popup_scroll_v.png} | Bin themes/inc/tizen-hd-inc.edc | 15 ++- themes/widgets/ctxpopup.edc | 121 ++++++++++++++------- 4 files changed, 91 insertions(+), 45 deletions(-) create mode 100755 themes/images/tizen-hd/Popup/00_popup_scroll_h.png rename themes/images/tizen-hd/Popup/{00_popup_scroll.png => 00_popup_scroll_v.png} (100%) mode change 100644 => 100755 diff --git a/themes/images/tizen-hd/Popup/00_popup_scroll_h.png b/themes/images/tizen-hd/Popup/00_popup_scroll_h.png new file mode 100755 index 0000000000000000000000000000000000000000..27b45f9ef926758a33a8e6310980278638589a4d GIT binary patch literal 2942 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 literal 0 HcmV?d00001 diff --git a/themes/images/tizen-hd/Popup/00_popup_scroll.png b/themes/images/tizen-hd/Popup/00_popup_scroll_v.png old mode 100644 new mode 100755 similarity index 100% rename from themes/images/tizen-hd/Popup/00_popup_scroll.png rename to themes/images/tizen-hd/Popup/00_popup_scroll_v.png diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index 7dec94b..3c289fb 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -96,8 +96,10 @@ #define PROGRESSBAR_STATUS_TEXT_FONT_SIZE_INC 20 #define CTXPOPUP_WIDTH_MIN_INC 386 -#define CTXPOPUP_WIDTH_MAX_INC 620 -#define CTXPOPUP_TEXT_MAX_INC 572 +#define CTXPOPUP_WIDTH_MAX_INC 700 +#define CTXPOPUP_TEXT_MAX_INC 660 +#define CTXPOPUP_ICON_TEXT_MAX_INC 603 +#define CTXPOPUP_MORE_TEXT_MAX_INC 603 #define CTXPOPUP_BUBBLE_BG_IMAGE_BORDER 26 26 22 30 #define CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER 8 8 8 8 #define CTXPOPUP_SHADOW_LEFT_PADDING 10 @@ -107,7 +109,8 @@ #define CTXPOPUP_CONTENT_PADDING 4 #define CTXPOPUP_ARROW_PADDING 1 #define CTXPOPUP_SCROLLER_PADDING 8 -#define CTXPOPUP_SCROLLER_MIN_SIZE_INC 9 18 +#define CTXPOPUP_SCROLLER_V_MIN_SIZE_INC 9 18 +#define CTXPOPUP_SCROLLER_H_MIN_SIZE_INC 18 9 #define CTXPOPUP_FRAME_CORNER_ARROW_PADDING 22 #define CTXPOPUP_MAIN_TEXT_COLOR_INC 255 255 255 255 #define CTXPOPUP_MAIN_TEXT_DIM_COLOR_INC 255 255 255 178 @@ -141,7 +144,8 @@ #define CTXPOPUP_TP_BG_IMAGE_BORDER 8 8 8 8 #define CTXPOPUP_TP_ARROW_SIZE_INC 27 18 #define CTXPOPUP_TP_HEIGHT_INC 102 -#define CTXPOPUP_MORE_WIDTH_INC 502 +#define CTXPOPUP_MORE_WIDTH_MIN_INC 502 +#define CTXPOPUP_MORE_WIDTH_MAX_INC 720 #define CTXPOPUP_MORE_ITEM_PADDING_INC 16 #define CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC 110 #define CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC 130 @@ -150,7 +154,8 @@ #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_INC 336 +#define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC 336 +#define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MAX_INC 720 #define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MIN_INC 90 #define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC 130 diff --git a/themes/widgets/ctxpopup.edc b/themes/widgets/ctxpopup.edc index 9fad0a6..c952e0a 100644 --- a/themes/widgets/ctxpopup.edc +++ b/themes/widgets/ctxpopup.edc @@ -692,7 +692,7 @@ /////////////////////////////////////////////////////////////////////////////// group { name: "elm/ctxpopup/layout/more/default"; - max: CTXPOPUP_MORE_WIDTH_INC ((CTXPOPUP_ITEM_HEIGHT_MIN_INC*7)+CTXPOPUP_SHADOW_TOP_PADDING+CTXPOPUP_SHADOW_BOTTOM_PADDING+(CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC*12)-CTXPOPUP_CONTENT_PADDING); + max: CTXPOPUP_MORE_WIDTH_MAX_INC ((CTXPOPUP_ITEM_HEIGHT_MIN_INC*7)+CTXPOPUP_SHADOW_TOP_PADDING+CTXPOPUP_SHADOW_BOTTOM_PADDING+(CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC*12)-CTXPOPUP_CONTENT_PADDING); parts { part { name:"top_padding"; @@ -792,33 +792,28 @@ clip_to: "layout_clip"; description { state: "default" 0.0; - max: CTXPOPUP_MORE_WIDTH_INC 806; visible: 0; } description { state: "show_up" 0.0; - max: CTXPOPUP_MORE_WIDTH_INC 806; rel1 {to_x:"left_padding"; to_y:"top_padding"; relative: 1.0 1.0;} rel2 {to_x:"right_padding"; to_y:"top_padding"; relative: 0.0 1.0;} align: 0.5 0.0; } description { state: "show_down" 0.0; - max: CTXPOPUP_MORE_WIDTH_INC 806; rel1 {to_x:"left_padding"; to_y:"bottom_padding"; relative: 1.0 0.0;} rel2 {to_x:"right_padding"; to_y:"bottom_padding"; relative: 0.0 0.0;} align: 0.5 1.0; } description { state: "show_left" 0.0; - max: CTXPOPUP_MORE_WIDTH_INC 806; rel1 {to_x:"left_padding"; to_y:"top_padding"; relative: 1.0 1.0;} rel2 {to_x:"left_padding"; to_y:"bottom_padding"; relative: 1.0 0.0;} align: 0.0 0.5; } description { state: "show_right" 0.0; - max: CTXPOPUP_MORE_WIDTH_INC 806; rel1 {to_x:"right_padding"; to_y:"top_padding"; relative: 0.0 1.0;} rel2 {to_x:"right_padding"; to_y:"bottom_padding"; relative: 0.0 0.0;} align: 1.0 0.5; @@ -1021,7 +1016,7 @@ group { name: "elm/ctxpopup/layout/landscape/more/default"; inherit: "elm/ctxpopup/layout/landscape/default"; - max: CTXPOPUP_MORE_WIDTH_INC ((CTXPOPUP_ITEM_HEIGHT_MIN_INC*5)+CTXPOPUP_SHADOW_TOP_PADDING+CTXPOPUP_SHADOW_BOTTOM_PADDING+(CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC*8)-CTXPOPUP_CONTENT_PADDING); + max: CTXPOPUP_MORE_WIDTH_MAX_INC ((CTXPOPUP_ITEM_HEIGHT_MIN_INC*5)+CTXPOPUP_SHADOW_TOP_PADDING+CTXPOPUP_SHADOW_BOTTOM_PADDING+(CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC*8)-CTXPOPUP_CONTENT_PADDING); } /////////////////////////////////////////////////////////////////////////////// group { @@ -1051,8 +1046,8 @@ } } images { - image: "00_popup_scroll.png" COMP; - image: "01_scroller.png" COMP; + image: "00_popup_scroll_v.png" COMP; + image: "00_popup_scroll_h.png" COMP; } parts { part { @@ -1147,7 +1142,7 @@ description { state: "default" 0.0; fixed: 1 1; - min: CTXPOPUP_SCROLLER_MIN_SIZE_INC; + min: CTXPOPUP_SCROLLER_V_MIN_SIZE_INC; rel1 { relative: 0.5 0.5; to: "sb_vbar"; @@ -1157,8 +1152,8 @@ to: "sb_vbar"; } image { - normal: "00_popup_scroll.png"; - border: 0 0 5 5; + normal: "00_popup_scroll_v.png"; + border: 0 0 8 8; border_scale: 1; } } @@ -1194,6 +1189,22 @@ } } part { + name: "sb_hbar_padding"; + type: RECT; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + fixed: 1 1; + min: 0 (CTXPOPUP_SCROLLER_PADDING-CTXPOPUP_CONTENT_PADDING); + max: 0 (CTXPOPUP_SCROLLER_PADDING-CTXPOPUP_CONTENT_PADDING); + visible: 0; + align: 0.0 1.0; + rel1 { to:"clipper"; relative: 0.0 1.0; } + rel2 { to:"clipper"; relative: 1.0 1.0; } + } + } + part { name: "sb_hbar"; type: RECT; mouse_events: 0; @@ -1203,8 +1214,8 @@ fixed: 1 1; visible: 0; align: 0.0 1.0; - rel1 {to:"clipper"; relative: 0.0 1.0;} - rel2 {to:"clipper"; relative: 1.0 1.0;} + rel1 {to_x:"clipper"; to_y: "sb_hbar_padding"; relative: 0.0 0.0;} + rel2 {to_x:"clipper"; to_y: "sb_hbar_padding"; relative: 1.0 0.0;} } } part { @@ -1220,12 +1231,12 @@ description { state: "default" 0.0; fixed: 1 1; - min: 32 12; + min: CTXPOPUP_SCROLLER_H_MIN_SIZE_INC; rel1 {relative: 0.5 0.5; to: "sb_hbar";} rel2 {relative: 0.5 0.5; to: "sb_hbar";} image { - normal: "01_scroller.png"; - border: 6 6 0 0; + normal: "00_popup_scroll_h.png"; + border: 8 8 0 0; border_scale: 1; } } @@ -2547,14 +2558,7 @@ group { signal: "elm,state,disabled"; source: "elm"; script { - new st[31]; - new Float:vl; - get_state(PART:"elm.text", st, 30, vl); - if ((!strcmp(st, "ellipsis")) || (!strcmp(st, "ellipsis_disabled"))) - set_state(PART:"elm.text", "ellipsis_disabled", 0.0); - else - set_state(PART:"elm.text", "disabled", 0.0); - + set_state(PART:"elm.text", "disabled", 0.0); set_state(PART:"disclip", "disabled", 0.0); } } @@ -2563,14 +2567,7 @@ group { signal: "elm,state,enabled"; source: "elm"; script { - new st[31]; - new Float:vl; - get_state(PART:"elm.text", st, 30, vl); - if ((!strcmp(st, "ellipsis")) || (!strcmp(st, "ellipsis_disabled"))) - set_state(PART:"elm.text", "ellipsis", 0.0); - else - set_state(PART:"elm.text", "default", 0.0); - + set_state(PART:"elm.text", "default", 0.0); set_state(PART:"disclip", "default", 0.0); } } @@ -3076,6 +3073,11 @@ group { min: (CTXPOPUP_WIDTH_MAX_INC-CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_ICON_WIDTH_INC-(CTXPOPUP_ITEM_ICON_PADDING_INC*2)) CTXPOPUP_ITEM_HEIGHT_MIN_INC; text.min: 0 1; } + description { + state: "ellipsis_disabled" 0.0; + inherit: "ellipsis" 0.0; + color: CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC; + } } part { name: "text_right_padding"; @@ -3289,7 +3291,7 @@ group { state: "default" 0.0; rel1 {to:"frame_shadow_left_top_padding";} rel2 {to:"frame_shadow_right_bottom_padding";} - min: CTXPOPUP_MORE_WIDTH_INC 0; + min: CTXPOPUP_MORE_WIDTH_MIN_INC 0; image { normal: "00_popup_bubble_bg.png"; border: CTXPOPUP_BUBBLE_BG_IMAGE_BORDER; @@ -3567,8 +3569,8 @@ group { description { state: "default" 0.0; visible: 0; - min: (CTXPOPUP_MORE_WIDTH_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) 1; - max: (CTXPOPUP_MORE_WIDTH_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC; + min: (CTXPOPUP_MORE_WIDTH_MIN_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) 1; + max: (CTXPOPUP_MORE_WIDTH_MAX_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC; } description { state: "clicked" 0.0; @@ -3717,7 +3719,7 @@ group { font: "Tizen:style=Roman"; size: CTXPOPUP_MORE_ITEM_TEXT_SIZE_INC; align: 0.0 0.5; - min: 0 1; + min: 1 1; text_class: "list_item"; } } @@ -3731,6 +3733,17 @@ group { inherit: "default" 0.0; color: CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC; } + description { + state: "ellipsis" 0.0; + inherit: "default" 0.0; + min: CTXPOPUP_MORE_TEXT_MAX_INC CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC; + text.min: 0 1; + } + description { + state: "ellipsis_disabled" 0.0; + inherit: "ellipsis" 0.0; + color: CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC; + } } part { name: "text_right_padding"; @@ -3788,6 +3801,13 @@ group { } programs { program { + name: "text_ellipsis"; + signal: "elm,state,text,ellipsis"; + source: "elm"; + action: STATE_SET "ellipsis" 0.0; + target: "elm.text"; + } + program { name: "item_unclick"; signal: "mouse,clicked,1"; source: "over1"; @@ -5202,6 +5222,8 @@ group { image: "00_more_popup_press.png" COMP; } + data.item: "item_max_size" CTXPOPUP_TEXT_MAX_INC; + parts { part { name: "event_blocker"; @@ -5220,8 +5242,8 @@ group { description { state: "default" 0.0; visible: 0; - min: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) 1; - max: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC; + min: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) 1; + max: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MAX_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC; } description { state: "clicked" 0.0; @@ -5316,7 +5338,7 @@ group { font: "Tizen:style=Roman"; size: CTXPOPUP_LIST_MAIN_TEXT_SIZE_INC; align: 0.5 0.5; - min: 0 1; + min: 1 1; text_class: "list_item"; } } @@ -5324,12 +5346,24 @@ group { state: "clicked" 0.0; inherit: "default" 0.0; color: CTXPOPUP_LIST_MAIN_TEXT_PRESS_COLOR_INC; + text.min: 0 1; } description { state: "disabled" 0.0; inherit: "default" 0.0; color: CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC; } + description { + state: "ellipsis" 0.0; + inherit: "default" 0.0; + min: CTXPOPUP_TEXT_MAX_INC CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MIN_INC; + text.min: 0 1; + } + description { + state: "ellipsis_disabled" 0.0; + inherit: "ellipsis" 0.0; + color: CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC; + } } part { name: "right_padding"; @@ -5387,6 +5421,13 @@ group { } programs { program { + name: "text_ellipsis"; + signal: "elm,state,text,ellipsis"; + source: "elm"; + action: STATE_SET "ellipsis" 0.0; + target: "elm.text"; + } + program { name: "item_unclick"; signal: "mouse,clicked,1"; source: "over1"; -- 2.7.4