From: Bora Hwang Date: Mon, 24 Jun 2013 03:52:59 +0000 (+0900) Subject: [ctxpopup] update Winset dark GUI v0.7 X-Git-Tag: submit/tizen_2.2/20130714.144922~97 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4c47b4f7a1296c414709bda2d19543cb67fbfa1c;p=framework%2Fuifw%2Fefl-theme-tizen.git [ctxpopup] update Winset dark GUI v0.7 1. toolbar segmentedcontrol style is removed 2. color and opacity of horizontal divider are changed 3. some values are changed for maximum width Change-Id: I4c73632d2060c3acfb2eac6ba775ba2c4da97a56 --- diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc index 866ac27..edf5123 100755 --- a/themes/inc/tizen-dark-inc.edc +++ b/themes/inc/tizen-dark-inc.edc @@ -82,9 +82,9 @@ #define CTXPOPUP_WIDTH_MIN_INC 386 #define CTXPOPUP_WIDTH_MAX_INC 692 -#define CTXPOPUP_TEXT_MAX_INC 660 -#define CTXPOPUP_ICON_TEXT_MAX_INC 603 -#define CTXPOPUP_MORE_TEXT_MAX_INC 603 +#define CTXPOPUP_TEXT_MAX_INC 652 +#define CTXPOPUP_ICON_TEXT_MAX_INC 595 +#define CTXPOPUP_MORE_TEXT_MAX_INC 599 #define CTXPOPUP_BUBBLE_BG_IMAGE_BORDER 26 26 26 26 #define CTXPOPUP_BUBBLE_MORE_BG_IMAGE_BORDER 26 26 25 0 #define CTXPOPUP_BG_PRESS_COLOR_INC 43 58 175 255 @@ -114,8 +114,8 @@ #define CTXPOPUP_SEPARATOR_PADDING_INC 20 #define CTXPOPUP_SEPARATOR_COLOR_INC 29 38 60 255 #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_1_COLOR_INC 29 38 60 0 +#define CTXPOPUP_HORIZONTAL_SEPARATOR_2_COLOR_INC 255 255 255 64 #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 @@ -137,7 +137,7 @@ #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_MIN_INC 502 +#define CTXPOPUP_MORE_WIDTH_MIN_INC 412 #define CTXPOPUP_MORE_WIDTH_MAX_INC 720 #define CTXPOPUP_MORE_WIDTH_LANDSCAPE_MAX_INC 1280 #define CTXPOPUP_MORE_ITEM_PADDING_INC 16 @@ -146,7 +146,6 @@ #define CTXPOPUP_MORE_ICON_WIDTH_INC 45 #define CTXPOPUP_MORE_ICON_HEIGHT_INC 45 #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 334 #define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MAX_INC 720 diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc index 1407d97..3690d9e 100755 --- a/themes/inc/tizen-light-inc.edc +++ b/themes/inc/tizen-light-inc.edc @@ -109,9 +109,9 @@ #define CTXPOPUP_WIDTH_MIN_INC 386 #define CTXPOPUP_WIDTH_MAX_INC 692 -#define CTXPOPUP_TEXT_MAX_INC 660 -#define CTXPOPUP_ICON_TEXT_MAX_INC 603 -#define CTXPOPUP_MORE_TEXT_MAX_INC 603 +#define CTXPOPUP_TEXT_MAX_INC 652 +#define CTXPOPUP_ICON_TEXT_MAX_INC 595 +#define CTXPOPUP_MORE_TEXT_MAX_INC 599 #define CTXPOPUP_BUBBLE_BG_IMAGE_BORDER 26 26 26 26 #define CTXPOPUP_BUBBLE_MORE_BG_IMAGE_BORDER 26 26 25 0 #define CTXPOPUP_BG_PRESS_COLOR_INC 43 58 175 255 @@ -164,7 +164,7 @@ #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_MIN_INC 502 +#define CTXPOPUP_MORE_WIDTH_MIN_INC 412 #define CTXPOPUP_MORE_WIDTH_MAX_INC 720 #define CTXPOPUP_MORE_WIDTH_LANDSCAPE_MAX_INC 1280 #define CTXPOPUP_MORE_ITEM_PADDING_INC 16 @@ -173,7 +173,6 @@ #define CTXPOPUP_MORE_ICON_WIDTH_INC 45 #define CTXPOPUP_MORE_ICON_HEIGHT_INC 45 #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 334 #define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MAX_INC 720 diff --git a/themes/widgets/ctxpopup.edc b/themes/widgets/ctxpopup.edc index 8e5b3b2..1cd0959 100644 --- a/themes/widgets/ctxpopup.edc +++ b/themes/widgets/ctxpopup.edc @@ -2731,7 +2731,7 @@ group { scale: 1; description { state: "default" 0.0; - color: CTXPOPUP_SEPARATOR_COLOR_INC; + color: CTXPOPUP_HORIZONTAL_SEPARATOR_1_COLOR_INC; align: 0 0.5; min: CTXPOPUP_HORIZONTAL_SEPARATOR_MIN_SIZE_INC; max: CTXPOPUP_HORIZONTAL_SEPARATOR_MAX_SIZE_INC; @@ -2750,7 +2750,7 @@ group { scale: 1; description { state: "default" 0.0; - color: CTXPOPUP_SEPARATOR2_COLOR_INC; + color: CTXPOPUP_HORIZONTAL_SEPARATOR_2_COLOR_INC; rel1 { relative: 1.0 0.0; to_x: "separator1"; } align: 0 0.5; min: CTXPOPUP_HORIZONTAL_SEPARATOR_MIN_SIZE_INC; @@ -3678,8 +3678,8 @@ group { description { state: "default" 0.0; visible: 0; - min: (CTXPOPUP_MORE_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC; - max: (CTXPOPUP_MORE_SEPARATOR_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC; + min: (CTXPOPUP_MORE_ITEM_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC; + max: (CTXPOPUP_MORE_ITEM_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC; fixed: 1 0; align: 1.0 0.5; } @@ -4212,357 +4212,3 @@ group { } } } -/////////////////////////////////////////////////////////////////////////////// -group { - name: "elm/ctxpopup/text_style_item/toolbar_segmentedcontrol"; - - images { - image: "00_more_popup_press.png" COMP; - } - - data.item: "item_max_size" CTXPOPUP_TEXT_MAX_INC; - - parts { - part { - name: "event_blocker"; - type: RECT; - mouse_events: 1; - description { - state: "default" 0.0; - color: 0 0 0 0; - } - } - part { - name: "bg"; - mouse_events: 0; - type: IMAGE; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - min: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING_WIDTH*2) 1; - max: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MAX_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC; - } - description { - state: "clicked" 0.0; - visible: 1; - rel1 {to_x: "bg_press_left_padding"; to_y: "bg_press_top_padding"; relative: 1.0 1.0;} - rel2 {to_x: "bg_press_right_padding"; to_y: "bg_press_bottom_padding"; relative: 0.0 0.0;} - image { - normal: "00_more_popup_press.png"; - border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER; - border_scale: 1; - } - } - } - part { - name: "bg_press_left_padding"; - mouse_events: 0; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - min: CTXPOPUP_PRESS_PADDING CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MIN_INC; - max: CTXPOPUP_PRESS_PADDING CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC; - align: 0 0.5; - } - } - part { - name: "bg_press_right_padding"; - mouse_events: 0; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - min: CTXPOPUP_PRESS_PADDING CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MIN_INC; - max: CTXPOPUP_PRESS_PADDING CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC; - align: 1 0.5; - } - } - part { - name: "bg_press_top_padding"; - mouse_events: 0; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - min: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_PRESS_PADDING2; - max: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_PRESS_PADDING2; - rel1 {to: "separator2"; relative: 0.0 1.0;} - align: 0.5 0; - } - } - part { - name: "bg_press_bottom_padding"; - mouse_events: 0; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - min: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_PRESS_PADDING2; - max: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_PRESS_PADDING2; - align: 0.5 1; - } - } - part { - name: "separator1"; - mouse_events: 0; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - color: CTXPOPUP_SEPARATOR_COLOR_INC; - rel1 { relative: 0.0 0.0; } - rel2 { relative: 1.0 1.0; } - align: 0.5 0; - min: 0 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; - max: 999999 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; - visible: 0; - } - description { - state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { - name: "separator2"; - mouse_events: 0; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - color: CTXPOPUP_SEPARATOR2_COLOR_INC; - rel1 { relative: 0.0 1.0; to: "separator1";} - rel2 { relative: 1.0 1.0; to: "separator1"; offset: 0 0; } - align: 0.5 0; - fixed: 0 1; - min: 0 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; - max: 999999 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC; - visible: 0; - } - description { - state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { - name: "left_padding"; - type: RECT; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - min: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MIN_INC; - max: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC; - align: 0 0; - fixed: 1 1; - visible: 0; - } - } - part { - name: "elm.text"; - type: TEXT; - mouse_events: 0; - scale: 1; - description { - state: "default" 0.0; - min: 1 CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MIN_INC; - align: 0.5 0.5; - rel1 {relative: 1.0 0.0; to_x: "left_padding"; to_y: "bg";} - rel2 {relative: 0.0 1.0; to_x: "right_padding"; to_y: "bg";} - color: CTXPOPUP_LIST_MAIN_TEXT_COLOR_INC; - text { - font: "Tizen:style=Regular"; - size: CTXPOPUP_LIST_MAIN_TEXT_SIZE_INC; - size_range: CTXPOPUP_LIST_MAIN_TEXT_SIZE_INC CTXPOPUP_LIST_MAIN_TEXT_MAX_SIZE_INC; - align: 0.5 0.5; - min: 1 1; - text_class: "list_item"; - } - } - description { - 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"; - type: RECT; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 0; - min: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MIN_INC; - max: (CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_CONTENT_PADDING_WIDTH) CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC; - fixed: 1 1; - align: 1.0 1.0; - } - } - part { - name: "over1"; - type: RECT; - mouse_events: 1; - repeat_events: 1; - description { - state: "default" 0.0; - color: 0 0 0 0; - } - } - part { - name: "over2"; - type: RECT; - mouse_events: 1; - repeat_events: 1; - dragable { - x: 1 1 0; - y: 1 1 0; - } - description { - state: "default" 0.0; - rel1.to:"bg"; - rel2.to:"bg"; - color: 0 0 0 0; - } - } - part { - name: "disclip"; - type: RECT; - description { - state: "default" 0.0; - visible: 0; - } - description { - state: "disabled" 0.0; - visible: 1; - color: CTXPOPUP_ITEM_DISABLED_COLOR; - } - } - } - 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"; - action: SIGNAL_EMIT "elm,action,click" ""; - after: "touch_snd"; - } - program { - name: "touch_snd"; - action: PLAY_SAMPLE "touch_sound" 1.0; - } - program { - name: "disable"; - 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:"disclip", "disabled", 0.0); - } - } - program { - name: "enable"; - 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:"disclip", "default", 0.0); - } - } - program { - name: "default"; - signal: "elm,state,default"; - source: "elm"; - script { - set_state(PART:"separator1", "default", 0.0); - set_state(PART:"separator2", "default", 0.0); - } - } - program { - name: "separator"; - signal: "elm,state,separator"; - source: "elm"; - script { - set_state(PART:"separator1", "visible", 0.0); - set_state(PART:"separator2", "visible", 0.0); - } - } - program { - name: "item_click2"; - signal: "mouse,down,1"; - source: "over2"; - script { - set_state(PART:"elm.text", "clicked", 0.0); - set_state(PART:"bg", "clicked", 0.0); - } - } - program { - name: "drag"; - signal: "drag"; - source: "over2"; - script { - new Float:dx, Float:dy; - get_drag(PART:"over2", dx, dy); - if ((abs(dx) > 20) || (abs(dy) > 20)) { - set_drag(PART:"over2", 0.0, 0.0); - set_state(PART:"bg", "default", 0.0); - } - set_drag(PART:"over2", 0.0, 0.0); - } - } - program { - name: "item_unclick2"; - signal: "mouse,up,1"; - source: "over2"; - script { - set_drag(PART:"over2", 0.0, 0.0); - set_state(PART:"bg", "default", 0.0); - } - } - } -}