From: sumanth Date: Wed, 26 Jun 2013 18:43:10 +0000 (+0530) Subject: [elm_datetime] Timepicker dark theme UX is updated till the GUI guidelines v0.7 X-Git-Tag: submit/tizen/20131004.114939~95 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fefl-theme-tizen.git;a=commitdiff_plain;h=e139348fe3786ee96e72456b9d1df5fbefd931d1 [elm_datetime] Timepicker dark theme UX is updated till the GUI guidelines v0.7 Change-Id: Ifbf3e8bb371afafd3c2f7fd5ffacec2a268dc93f --- diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc index 2584083..1bafaed 100755 --- a/themes/inc/tizen-dark-inc.edc +++ b/themes/inc/tizen-dark-inc.edc @@ -1075,16 +1075,23 @@ #define TICKER_NOTI_DEFAULT_TEXT_COLOR_INC "#ffffff" #define TICKER_NOTI_DEFAULT_TEXT2_COLOR_INC "#ffffff" -#define DATETIME_FIELD_MIN_SIZE_INC 48 112 -#define DATETIME_SEPARATOR_MIN_SIZE_INC 22 112 -#define DATETIME_LEFT_PADDING_SIZE_INC 27 112 -#define DATETIME_TEXT_FONT_SIZE_INC 34 -#define DATETIME_SEPARATOR_TEXT_FONT_SIZE_INC 36 -#define DATETIME_TEXT_NORMAL_COLOR_INC 0 0 0 255 -#define DATETIME_SEPARATOR_TEXT_COLOR_INC 0 0 0 255 +#define DATETIME_WIDGET_HEIGHT 74 +#define DATETIME_FIELD_LEFT_PADDING_SIZE_INC 5 74 +#define DATETIME_FIELD_RIGHT_PADDING_SIZE_INC 5 74 +#define DATETIME_FIELD_PICKER_PADDING_SIZE_INC 30 74 +#define DATETIME_FIELD_MIN_SIZE_INC 0 74 +#define DATETIME_SEPARATOR_MIN_SIZE_INC 10 74 +#define DATETIME_WIDGET_PADDING_SIZE_INC 20 74 +#define DATETIME_TEXT_FONT_SIZE_INC 44 +#define DATETIME_SEPARATOR_TEXT_FONT_SIZE_INC 44 +#define DATETIME_TEXT_NORMAL_COLOR_INC 250 250 250 255 +#define DATETIME_SEPARATOR_TEXT_COLOR_INC 250 250 250 255 #define DATETIME_TEXT_SELECTED_COLOR_INC 255 255 255 255 +#define DATETIME_BG_IMAGE_BORDER_INC 13 13 9 9 +#define DATETIME_PICKER_BG_COLOR_INC 67 69 77 255 +#define DATETIME_LEFT_PADDING_SIZE_INC 27 112 -#define DATETIME_LABEL_TEXT_BLOCK_STYLE_COLOR_INC 0 0 0 255 +#define DATETIME_LABEL_TEXT_BLOCK_STYLE_COLOR_INC 250 250 250 255 #define DATETIME_LABEL_TEXT_BLOCK_STYLE_SELECTED_COLOR_INC 255 255 255 255 #define DATETIME_LABEL_DATE_FIELD_BG_IMAGE_BORDER_INC 8 8 21 22 #define DATETIME_LABEL_DATE_FIELD_MIN_WIDTH_INC 104 diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc index c964d29..368400e 100755 --- a/themes/inc/tizen-light-inc.edc +++ b/themes/inc/tizen-light-inc.edc @@ -1101,14 +1101,21 @@ #define TICKER_NOTI_DEFAULT_TEXT_COLOR_INC "#ffffff" #define TICKER_NOTI_DEFAULT_TEXT2_COLOR_INC "#ffffff" -#define DATETIME_FIELD_MIN_SIZE_INC 48 112 -#define DATETIME_SEPARATOR_MIN_SIZE_INC 22 112 -#define DATETIME_LEFT_PADDING_SIZE_INC 27 112 -#define DATETIME_TEXT_FONT_SIZE_INC 34 -#define DATETIME_SEPARATOR_TEXT_FONT_SIZE_INC 36 +#define DATETIME_WIDGET_HEIGHT 74 +#define DATETIME_FIELD_LEFT_PADDING_SIZE_INC 5 74 +#define DATETIME_FIELD_RIGHT_PADDING_SIZE_INC 5 74 +#define DATETIME_FIELD_PICKER_PADDING_SIZE_INC 30 74 +#define DATETIME_FIELD_MIN_SIZE_INC 0 74 +#define DATETIME_SEPARATOR_MIN_SIZE_INC 10 74 +#define DATETIME_WIDGET_PADDING_SIZE_INC 20 74 +#define DATETIME_TEXT_FONT_SIZE_INC 44 +#define DATETIME_SEPARATOR_TEXT_FONT_SIZE_INC 44 #define DATETIME_TEXT_NORMAL_COLOR_INC 0 0 0 255 #define DATETIME_SEPARATOR_TEXT_COLOR_INC 0 0 0 255 -#define DATETIME_TEXT_SELECTED_COLOR_INC 255 255 255 255 +#define DATETIME_TEXT_SELECTED_COLOR_INC 0 0 0 255 +#define DATETIME_BG_IMAGE_BORDER_INC 13 13 9 9 +#define DATETIME_PICKER_BG_COLOR_INC 67 69 77 255 +#define DATETIME_LEFT_PADDING_SIZE_INC 27 112 #define DATETIME_LABEL_TEXT_BLOCK_STYLE_COLOR_INC 0 0 0 255 #define DATETIME_LABEL_TEXT_BLOCK_STYLE_SELECTED_COLOR_INC 255 255 255 255 diff --git a/themes/widgets/datetime.edc b/themes/widgets/datetime.edc index 0665a46..04a6ce9 100644 --- a/themes/widgets/datetime.edc +++ b/themes/widgets/datetime.edc @@ -20,7 +20,568 @@ // datetime /////////////////////////////////////////////////////////////////////////////// -#define DATETIME_FIELD(_pos, _after) \ +#define DATETIME_FIELD(_pos, prev_part) \ + part {\ + name: "picker.padding"#_pos; \ + type: RECT; \ + scale: 1;\ + clip_to: "clipper";\ + description { state: "default" 0.0; \ + color: 0 0 0 0;\ + min: 0 0;\ + align: 0.0 0.5;\ + fixed: 1 0;\ + rel1 {\ + relative: 1.0 0.0;\ + to: prev_part;\ + }\ + rel2 {\ + relative: 1.0 1.0;\ + to: prev_part;\ + }\ + }\ + description { state: "enable" 0.0;\ + inherit: "default" 0.0;\ + min: DATETIME_FIELD_PICKER_PADDING_SIZE_INC;\ + }\ + }\ + part {\ + name: "field"#_pos".bg"; \ + type: RECT; \ + scale: 1;\ + clip_to: "clipper";\ + description { state: "default" 0.0; \ + visible: 0;\ + align: 0.0 0.5;\ + fixed: 1 0;\ + rel1 {\ + relative: 0.0 0.0;\ + to: "left.padding"#_pos;\ + }\ + rel2 {\ + relative: 1.0 1.0;\ + to: "right.padding"#_pos;\ + }\ + color: DATETIME_PICKER_BG_COLOR_INC;\ + }\ + description { state: "enable" 0.0;\ + inherit: "default" 0.0;\ + visible: 1;\ + }\ + }\ + part {\ + name: "left.padding"#_pos; \ + type: RECT; \ + scale: 1;\ + clip_to: "clipper";\ + description { state: "default" 0.0; \ + color: 0 0 0 0;\ + min: 0 0;\ + align: 0.0 0.5;\ + fixed: 1 0;\ + rel1 {\ + relative: 1.0 0.0;\ + to: "picker.padding"#_pos;\ + }\ + rel2 {\ + relative: 1.0 1.0;\ + to: "picker.padding"#_pos;\ + }\ + }\ + description { state: "enable" 0.0;\ + inherit: "default" 0.0;\ + min: DATETIME_FIELD_LEFT_PADDING_SIZE_INC;\ + }\ + }\ + part {\ + name: "field"#_pos; \ + type: SWALLOW; \ + scale: 1;\ + clip_to: "clipper";\ + repeat_events: 1;\ + description { state: "default" 0.0; \ + visible: 0;\ + min: 0 0;\ + align: 0.0 0.5;\ + fixed: 1 0;\ + rel1 {\ + relative: 1.0 0.0;\ + to: "left.padding"#_pos;\ + }\ + rel2 {\ + relative: 1.0 1.0;\ + to: "left.padding"#_pos;\ + }\ + }\ + description { state: "enable" 0.0;\ + inherit: "default" 0.0;\ + visible: 1;\ + min: DATETIME_FIELD_MIN_SIZE_INC;\ + }\ + }\ + part {\ + name: "separator"#_pos; \ + type: TEXT;\ + scale: 1;\ + clip_to: "clipper";\ + description {\ + state: "default" 0.0;\ + visible: 0;\ + min: 0 0;\ + align: 0.0 0.5;\ + fixed: 1 0;\ + rel1 {\ + relative: 1.0 0.0;\ + to: "field"#_pos;\ + }\ + rel2 {\ + relative: 1.0 1.0;\ + to: "field"#_pos;\ + }\ + color: DATETIME_SEPARATOR_TEXT_COLOR_INC;\ + text {\ + font: "Tizen:style=Regular";\ + size: DATETIME_SEPARATOR_TEXT_FONT_SIZE_INC;\ + min: 1 0; \ + text_class: "tizen";\ + }\ + }\ + description { state: "enable" 0.0;\ + inherit: "default" 0.0;\ + visible: 1;\ + min: DATETIME_SEPARATOR_MIN_SIZE_INC;\ + }\ + }\ + part {\ + name: "right.padding"#_pos; \ + type: RECT;\ + scale: 1;\ + clip_to: "clipper";\ + description {\ + state: "default" 0.0;\ + color: 0 0 0 0;\ + min: 0 0;\ + align: 0.0 0.5;\ + fixed: 1 0;\ + rel1 {\ + relative: 1.0 0.0;\ + to: "separator"#_pos;\ + }\ + rel2 {\ + relative: 1.0 1.0;\ + to: "separator"#_pos;\ + }\ + }\ + description { state: "enable" 0.0;\ + inherit: "default" 0.0;\ + visible: 1;\ + min: DATETIME_FIELD_RIGHT_PADDING_SIZE_INC;\ + }\ + }\ + programs{\ + program {\ + name: "field_"#_pos"enabled";\ + signal: "field"#_pos",enable";\ + source: "elm";\ + action: STATE_SET "enable" 0.0;\ + target: "field"#_pos;\ + target: "left.padding"#_pos;\ + target: "right.padding"#_pos;\ + target: "field"#_pos".bg";\ + }\ + program {\ + name: "field_"#_pos"disabled";\ + signal: "field"#_pos",disable";\ + source: "elm";\ + action: STATE_SET "default" 0.0;\ + target: "field"#_pos;\ + target: "left.padding"#_pos;\ + target: "right.padding"#_pos;\ + target: "field"#_pos".bg";\ + }\ + program {\ + name: "separator"#_pos",enabled";\ + signal: "field"#_pos",separator,enable";\ + source: "elm";\ + action: STATE_SET "enable" 0.0;\ + target: "separator"#_pos;\ + }\ + program {\ + name: "separator"#_pos",disabled";\ + signal: "field"#_pos",separator,disable";\ + source: "elm";\ + action: STATE_SET "default" 0.0;\ + target: "separator"#_pos;\ + }\ + } + +#define DATETIME_DATEPICKER_BG \ + part {\ + name: "date.picker.bg"; \ + scale: 1;\ + clip_to: "clipper";\ + description { state: "default" 0.0; \ + min: 0 0;\ + visible: 0;\ + fixed: 1 0;\ + image {\ + normal: "00_button_01.png";\ + border: DATETIME_BG_IMAGE_BORDER_INC;\ + border_scale: 1;\ + }\ + rel1 {\ + relative: 0.0 0.0;\ + to: "left.padding0";\ + }\ + rel2 {\ + relative: 1.0 1.0;\ + to: "right.padding2";\ + }\ + }\ + description { state: "datefirst" 0.0;\ + inherit: "default" 0.0;\ + visible: 1;\ + }\ + description { state: "timefirst" 0.0;\ + inherit: "default" 0.0;\ + visible: 1;\ + rel1 {\ + relative: 0.0 0.0;\ + to: "left.padding3";\ + }\ + rel2 {\ + relative: 1.0 1.0;\ + to: "right.padding5";\ + }\ + }\ + description { state: "timefirst24hr" 0.0;\ + inherit: "default" 0.0;\ + visible: 1;\ + rel1 {\ + relative: 0.0 0.0;\ + to: "left.padding2";\ + }\ + rel2 {\ + relative: 1.0 1.0;\ + to: "right.padding4";\ + }\ + }\ + }\ + programs{\ + program {\ + name: "datepicker_starting_field0";\ + signal: "datepicker,starting,field0";\ + source: "elm";\ + action: STATE_SET "datefirst" 0.0;\ + target: "date.picker.bg";\ + }\ + program {\ + name: "datepicker_starting_field3";\ + signal: "datepicker,starting,field3";\ + source: "elm";\ + action: STATE_SET "timefirst" 0.0;\ + target: "date.picker.bg";\ + }\ + program {\ + name: "datepicker_starting_field2";\ + signal: "datepicker,starting,field3";\ + source: "elm";\ + action: STATE_SET "timefirst24hr" 0.0;\ + target: "date.picker.bg";\ + }\ + program {\ + name: "datepicker_starting_field1";\ + signal: "datepicker,starting,field1";\ + source: "elm";\ + action: STATE_SET "default" 0.0;\ + target: "date.picker.bg";\ + }\ + program {\ + name: "datepicker_starting_field4";\ + signal: "datepicker,starting,field4";\ + source: "elm";\ + action: STATE_SET "default" 0.0;\ + target: "date.picker.bg";\ + }\ + program {\ + name: "datepicker_starting_field5";\ + signal: "datepicker,starting,field5";\ + source: "elm";\ + action: STATE_SET "default" 0.0;\ + target: "date.picker.bg";\ + }\ + } + +#define DATETIME_TIMEPICKER_BG \ + part {\ + name: "time.picker.bg"; \ + scale: 1;\ + clip_to: "clipper";\ + description { state: "default" 0.0; \ + min: 0 0;\ + visible: 0;\ + fixed: 1 0;\ + image {\ + normal: "00_button_01.png";\ + border: DATETIME_BG_IMAGE_BORDER_INC;\ + border_scale: 1;\ + }\ + rel1 {\ + relative: 0.0 0.0;\ + to: "left.padding3";\ + }\ + rel2 {\ + relative: 1.0 1.0;\ + to: "right.padding5";\ + }\ + }\ + description { state: "datefirst" 0.0;\ + inherit: "default" 0.0;\ + visible: 1;\ + }\ + description { state: "timefirst" 0.0;\ + inherit: "default" 0.0;\ + visible: 1;\ + rel1 {\ + relative: 0.0 0.0;\ + to: "left.padding0";\ + }\ + rel2 {\ + relative: 1.0 1.0;\ + to: "right.padding2";\ + }\ + }\ + description { state: "timefirst24hr" 0.0;\ + inherit: "default" 0.0;\ + visible: 1;\ + rel1 {\ + relative: 0.0 0.0;\ + to: "left.padding0";\ + }\ + rel2 {\ + relative: 1.0 1.0;\ + to: "right.padding1";\ + }\ + }\ + }\ + programs{\ + program {\ + name: "timepicker_starting_field3";\ + signal: "timepicker,starting,field3";\ + source: "elm";\ + action: STATE_SET "datefirst" 0.0;\ + target: "time.picker.bg";\ + }\ + program {\ + name: "timepicker_starting_field0";\ + signal: "timepicker,starting,field0";\ + source: "elm";\ + script {\ + new st[31];\ + new Float:vl;\ + get_state(PART:"date.picker.bg", st, 30, vl);\ + if (!strcmp(st, "timefirst24hr"))\ + set_state(PART:"time.picker.bg", "timefirst24hr", 0.0);\ + else\ + set_state(PART:"time.picker.bg", "timefirst", 0.0);\ + }\ + }\ + program {\ + name: "timepicker_starting_field1";\ + signal: "timepicker,starting,field1";\ + source: "elm";\ + action: STATE_SET "default" 0.0;\ + target: "time.picker.bg";\ + }\ + program {\ + name: "timepicker_starting_field2";\ + signal: "timepicker,starting,field2";\ + source: "elm";\ + action: STATE_SET "default" 0.0;\ + target: "time.picker.bg";\ + }\ + program {\ + name: "timepicker_starting_field4";\ + signal: "timepicker,starting,field4";\ + source: "elm";\ + action: STATE_SET "default" 0.0;\ + target: "time.picker.bg";\ + }\ + program {\ + name: "timepicker_starting_field5";\ + signal: "timepicker,starting,field5";\ + source: "elm";\ + action: STATE_SET "default" 0.0;\ + target: "time.picker.bg";\ + }\ + } + +#define DATETIME_PICKER_BG_PROGRAMS \ + program {\ + name: "datepicker_starting_field2_bg";\ + signal: "datepicker,starting,field2";\ + source: "elm";\ + script {\ + set_state(PART:"picker.padding2", "enable", 0.0);\ + set_state(PART:"picker.padding3", "default", 0.0);\ + }\ + }\ + program {\ + name: "datepicker_starting_field3_bg";\ + signal: "datepicker,starting,field3";\ + source: "elm";\ + script {\ + set_state(PART:"picker.padding3", "enable", 0.0);\ + set_state(PART:"picker.padding2", "default", 0.0);\ + }\ + }\ + program {\ + name: "timepicker_starting_field3_bg";\ + signal: "timepicker,starting,field3";\ + source: "elm";\ + script {\ + set_state(PART:"picker.padding3", "enable", 0.0);\ + set_state(PART:"picker.padding2", "default", 0.0);\ + }\ + }\ + program {\ + name: "timepicker_starting_field0_bg";\ + signal: "timepicker,starting,field0";\ + source: "elm";\ + action: STATE_SET "default" 0.0;\ + target: "picker.padding0";\ + }\ + program {\ + name: "datepicker_starting_field1_bg";\ + signal: "datepicker,starting,field1";\ + source: "elm";\ + action: STATE_SET "default" 0.0;\ + target: "picker.padding0";\ + target: "picker.padding2";\ + target: "picker.padding3";\ + }\ + program {\ + name: "datepicker_starting_field4_bg";\ + signal: "datepicker,starting,field4";\ + source: "elm";\ + action: STATE_SET "default" 0.0;\ + target: "picker.padding0";\ + target: "picker.padding2";\ + target: "picker.padding3";\ + } + +group { name: "elm/datetime/base/default"; + images { + image: "00_button_01.png" COMP; + image: "00_button_01_press.png" COMP; + } + parts { + part { + name: "bg"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + color: 0 0 0 0; + min: 0 DATETIME_WIDGET_HEIGHT; + max: -1 DATETIME_WIDGET_HEIGHT; + } + } + part { + name: "left.padding"; + type: RECT; + scale: 1; + clip_to: "clipper"; + mouse_events: 0; + description { + state: "default" 0.0; + visible: 0; + min: DATETIME_WIDGET_PADDING_SIZE_INC; + align: 0.0 0.5; + fixed: 1 1; + rel1.to: "bg"; + rel2 { + relative: 0.0 1.0; + to: "bg"; + } + } + } + part { + name: "right.padding"; + type: RECT; + scale: 1; + clip_to: "clipper"; + mouse_events: 0; + description { + state: "default" 0.0; + visible: 0; + min: DATETIME_WIDGET_PADDING_SIZE_INC; + align: 1.0 0.5; + fixed: 1 1; + rel2 { + relative: 1.0 0.0; + to: "bg"; + } + rel2.to: "bg"; + } + } + + //DATETIME_DATEPICKER_BG + //DATETIME_TIMEPICKER_BG + + DATETIME_FIELD(0, "left.padding") + DATETIME_FIELD(1, "right.padding0") + DATETIME_FIELD(2, "right.padding1") + DATETIME_FIELD(3, "right.padding2") + DATETIME_FIELD(4, "right.padding3") + DATETIME_FIELD(5, "right.padding4") + + part { + name: "clipper"; + type: RECT; + description { state: "default" 0.0; + color: 255 255 255 255; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + color: 255 255 255 102; + } + } + part { + name: "disabler"; + type: RECT; + description { state: "default" 0.0; + color: 0 0 0 0; + visible: 0; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + } + programs { + program { + name: "disble_datetime"; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "visible" 0.0; + target: "disabler"; + target: "clipper"; + } + program { + name: "enable_datetime"; + signal: "elm,state,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "disabler"; + target: "clipper"; + } + DATETIME_PICKER_BG_PROGRAMS + } +} + +#define DATETIME_FIELD_STYLE1(_pos, _after) \ part {\ name: "field"#_pos; \ type: SWALLOW; \ @@ -64,7 +625,7 @@ }\ } -#define DATETIME_SEPARATOR(_pos) \ +#define DATETIME_SEPARATOR_STYLE1(_pos) \ part {\ name: "separator"#_pos; \ type: TEXT;\ @@ -136,7 +697,7 @@ } -group { name: "elm/datetime/base/default"; +group { name: "elm/datetime/base/style1"; parts { part { name: "bg"; @@ -194,17 +755,17 @@ group { name: "elm/datetime/base/default"; min: DATETIME_FIELD_MIN_SIZE_INC; } } - DATETIME_SEPARATOR(0) - DATETIME_FIELD(1, 0) - DATETIME_SEPARATOR(1) - DATETIME_FIELD(2, 1) - DATETIME_SEPARATOR(2) - DATETIME_FIELD(3, 2) - DATETIME_SEPARATOR(3) - DATETIME_FIELD(4, 3) - DATETIME_SEPARATOR(4) - DATETIME_FIELD(5, 4) - DATETIME_SEPARATOR(5) + DATETIME_SEPARATOR_STYLE1(0) + DATETIME_FIELD_STYLE1(1, 0) + DATETIME_SEPARATOR_STYLE1(1) + DATETIME_FIELD_STYLE1(2, 1) + DATETIME_SEPARATOR_STYLE1(2) + DATETIME_FIELD_STYLE1(3, 2) + DATETIME_SEPARATOR_STYLE1(3) + DATETIME_FIELD_STYLE1(4, 3) + DATETIME_SEPARATOR_STYLE1(4) + DATETIME_FIELD_STYLE1(5, 4) + DATETIME_SEPARATOR_STYLE1(5) part { name: "right.padding"; type: RECT; @@ -292,8 +853,6 @@ group { name: "elm/spinner/base/default"; images { image: "00_picker_arrow_down.png" COMP; image: "00_picker_arrow_up.png" COMP; - image: "00_picker_arrow_down_press_web.png" COMP; - image: "00_picker_arrow_up_press_web.png" COMP; image: "00_button_01.png" COMP; image: "00_button_01_press.png" COMP; } @@ -333,7 +892,7 @@ group { name: "elm/spinner/base/default"; } description { state: "pressed" 0.0; inherit: "default" 0.0; - image.normal: "00_picker_arrow_up_press_web.png"; + image.normal: "00_picker_arrow_up.png"; } } part { name: "down.image"; @@ -364,7 +923,7 @@ group { name: "elm/spinner/base/default"; } description { state: "pressed" 0.0; inherit: "default" 0.0; - image.normal: "00_picker_arrow_down_press_web.png"; + image.normal: "00_picker_arrow_down.png"; } } part { name: "elm.text"; diff --git a/themes/widgets/label.edc b/themes/widgets/label.edc index a31fdf6..01e4578 100644 --- a/themes/widgets/label.edc +++ b/themes/widgets/label.edc @@ -1171,9 +1171,8 @@ base: "font=Tizen:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT } } - group { name: "elm/label/base/datetime/year/default"; - alias: "elm/label/base/datetime/month/default"; - alias: "elm/label/base/datetime"; + group { name: "elm/label/base/datetime/year/style1"; + alias: "elm/label/base/datetime/month/style1"; images { image: "00_picker_button_bg.png" COMP; image: "00_picker_button_bg_press.png" COMP; @@ -1272,10 +1271,10 @@ base: "font=Tizen:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT } } - group { name: "elm/label/base/datetime/hour/default"; - alias: "elm/label/base/datetime/minute/default"; - alias: "elm/label/base/datetime/date/default"; - inherit: "elm/label/base/datetime/year/default"; + group { name: "elm/label/base/datetime/hour/style1"; + alias: "elm/label/base/datetime/minute/style1"; + alias: "elm/label/base/datetime/date/style1"; + inherit: "elm/label/base/datetime/year/style1"; parts { part { name: "bg"; type: RECT; @@ -1318,3 +1317,91 @@ base: "font=Tizen:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT } } } + group { name: "elm/label/base/datetime"; + alias: "elm/label/base/datetime/year/default"; + alias: "elm/label/base/datetime/month/default"; + alias: "elm/label/base/datetime/date/default"; + alias: "elm/label/base/datetime/hour/default"; + alias: "elm/label/base/datetime/minute/default"; + alias: "elm/label/base/datetime/ampm/default"; + parts { + part { name: "bg"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + color: 0 0 0 0; + min: 0 DATETIME_LABEL_DATE_FIELD_HEIGHT_INC; + max: -1 DATETIME_LABEL_DATE_FIELD_HEIGHT_INC; + } + } + part { name: "label.text.clip"; + type: RECT; + description { state: "default" 0.0; + } + } + part { name: "bg.img"; + type: RECT; + scale: 1; + clip_to: "label.text.clip"; + description { state: "default" 0.0; + rel1 { + relative: 0.0 0.0; + to_x: "elm.text"; + } + rel2 { + relative: 1.0 1.0; + to_x: "elm.text"; + } + fixed: 1 1; + color: 0 0 0 0; + min: DATETIME_LABEL_DATE_FIELD_MIN_WIDTH_INC DATETIME_LABEL_DATE_FIELD_HEIGHT_INC; + max: -1 DATETIME_LABEL_DATE_FIELD_HEIGHT_INC; + } + description { state: "selected" 0.0; + inherit: "default" 0.0; + } + } + part { name: "elm.text"; + type: TEXT; + scale: 1; + clip_to: "label.text.clip"; + description { state: "default" 0.0; + color: DATETIME_LABEL_TEXT_BLOCK_STYLE_COLOR_INC; + text { + font: "Tizen:style=Regular"; + size: DATETIME_TEXT_FONT_SIZE_INC; + text_class: "tizen"; + min: 1 0; + max: 1 1; + } + } + description { state: "selected" 0.0; + inherit: "default" 0.0; + color: DATETIME_LABEL_TEXT_BLOCK_STYLE_SELECTED_COLOR_INC; + text { + font: "Tizen:style=Bold"; + size: DATETIME_TEXT_FONT_SIZE_INC; + text_class: "tizen"; + min: 1 0; + max: 1 1; + } + } + } + } + programs { + program { name: "label_select"; + signal: "elm,state,select"; + source: "elm"; + action: STATE_SET "selected" 0.0; + target: "elm.text"; + target: "bg.img"; + } + program { name: "label_unselect"; + signal: "elm,state,unselect"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.text"; + target: "bg.img"; + } + } + }