raster pushed a commit to branch feature/themes/flat. http://git.enlightenment.org/core/efl.git/commit/?id=895d1620772fbb339f6c66c0ea4e525eeb048f96
commit 895d1620772fbb339f6c66c0ea4e525eeb048f96 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Sun Feb 21 13:32:15 2021 +0000 TH - efl.ui calendaer --- data/elementary/themes/edc/efl/calendar.edc | 531 ++++++++++++---------------- data/elementary/themes/edc/elm/calendar.edc | 1 + 2 files changed, 232 insertions(+), 300 deletions(-) diff --git a/data/elementary/themes/edc/efl/calendar.edc b/data/elementary/themes/edc/efl/calendar.edc index 6afbeda728..79f81c218d 100644 --- a/data/elementary/themes/edc/efl/calendar.edc +++ b/data/elementary/themes/edc/efl/calendar.edc @@ -1,12 +1,21 @@ -#define CIT_STYLE\ +#define CIT_STYLES\ style { name: "efl_ui_calendar_date_style";\ - base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 align=center text_class=calendar_day_text color_class=calendar_day_text";\ + base: "font="FN" font_size=10 color=#a0a0a0 align=center text_class=calendar_day_text";\ + }\ + style { name: "efl_ui_calendar_date_holiday_style";\ + base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_holiday";\ }\ style { name: "efl_ui_calendar_date_today_style";\ - base: "font="FN" font_size=10 color=#3399ff style=glow glow_color=#3399ff18 align=center text_class=calendar_day_text_today color_class=calendar_day_text_today";\ + base: "font="FN" font_size=10 color=#ffffff align=center text_class=calendar_day_text_today";\ }\ style { name: "efl_ui_calendar_date_disabled_style";\ - base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffffc0 align=center text_class=calendar_day_text_disabled text_class=calendar_day_text_disabled";\ + base: "font="FN" font_size=10 color=#282828 align=center text_class=calendar_day_text_disabled";\ + }\ + style { name: "efl_ui_calendar_date_weekend1_style";\ + base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_weekend1";\ + }\ + style { name: "efl_ui_calendar_date_weekend2_style";\ + base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_weekend2";\ }\ #define CAL_SPIN(_sufix, _text, _relative)\ @@ -21,8 +30,8 @@ offset: 0 -1;\ }\ align: 0.0 0.5;\ - min: 15 15;\ - max: 15 15;\ + min: 25 25;\ + max: 25 25;\ }\ }\ part { name: "right_bt"#_sufix; type: RECT;\ @@ -36,139 +45,110 @@ offset: -1 -1;\ }\ align: 1.0 0.5;\ - min: 15 15;\ - max: 15 15;\ + min: 25 25;\ + max: 25 25;\ color: 0 0 0 0;\ }\ }\ - part { name: "efl.calendar.button"#_sufix".left";\ - type: SWALLOW;\ + part { name: "efl.calendar.button"#_sufix".left"; type: SWALLOW;\ scale: 1;\ description { state: "default" 0.0;\ fixed: 1 1;\ - rel1.to: "left_bt"#_sufix;\ - rel2.to: "left_bt"#_sufix;\ + rel.to: "left_bt"#_sufix;\ + min: 15 15;\ + max: 15 15;\ }\ description { state: "rtl" 0.0;\ inherit: "default" 0.0;\ - rel1.to: "right_bt"#_sufix;\ - rel2.to: "right_bt"#_sufix;\ + rel.to: "right_bt"#_sufix;\ }\ }\ - part { name: "efl.calendar.button"#_sufix".right";\ - type: SWALLOW;\ + part { name: "efl.calendar.button"#_sufix".right"; type: SWALLOW;\ scale: 1;\ description { state: "default" 0.0;\ fixed: 1 1;\ - rel1.to: "right_bt"#_sufix;\ - rel2.to: "right_bt"#_sufix;\ + rel.to: "right_bt"#_sufix;\ + min: 15 15;\ + max: 15 15;\ }\ description { state: "rtl" 0.0;\ inherit: "default" 0.0;\ - rel1.to: "left_bt"#_sufix;\ - rel2.to: "left_bt"#_sufix;\ + rel.to: "left_bt"#_sufix;\ }\ }\ part { name: #_text; type: TEXT; mouse_events: 0;\ - effect: SHADOW BOTTOM; \ scale: 1;\ description { state: "default" 0.0;\ fixed: 1 1;\ rel1 { relative: 1.0 0.0;\ to: "left_bt"#_sufix;\ + offset: 8 8;\ }\ rel2 { relative: 0.0 1.0;\ to: "right_bt"#_sufix;\ + offset: -9 -9;\ }\ + offscale;\ text { font: FNBD; size: 10;\ min: 0 1;\ text_class: "calendar_"#_text; \ }\ - color_class: "calendar_"#_text; \ + color: 160 160 160 255; \ }\ } #define CH(_pos) \ part { name: "ch_"#_pos"_base"; type: SPACER; \ description { state: "default" 0.0; \ - rel1 { \ - relative: (_pos % 7 / 7) 0.0; \ - to: "header"; \ - } \ - rel2 { \ - relative: (_pos % 7 / 7 + 1 / 7) 1.0; \ - to: "header"; \ - } \ + rel.to: "header";\ + rel1.relative: (_pos % 7 / 7) 0.0; \ + rel2.relative: (_pos % 7 / 7 + 1 / 7) 1.0; \ } \ } \ part { name: "efl.ch_"#_pos".text"; type: TEXT; mouse_events: 0; \ - effect: SHADOW BOTTOM; \ scale: 1; \ clip_to: "ch_"#_pos"_clipper"; \ description { state: "default" 0.0; \ - rel1.to: "ch_"#_pos"_base"; \ - rel2.to: "ch_"#_pos"_base"; \ + rel.to: "ch_"#_pos"_base"; \ + rel1.offset: 0 3; \ + rel2.offset: -1 -4; \ + offscale;\ text { font: FN; size: 8; \ min: 1 1; \ ellipsis: -1; \ text_class: "calendar_weekday_text"; \ } \ - color_class: "calendar_weekday_text"; \ + color: 160 160 160 255; \ } \ } \ part { name: "ch_"#_pos"_clipper"; type: RECT; \ description { state: "default" 0.0; \ - rel1.to: "ch_"#_pos"_base"; \ - rel2.to: "ch_"#_pos"_base"; \ + rel.to: "ch_"#_pos"_base"; \ } \ } #define CIT(_pos) \ part { name: "cit_"#_pos"_rect"; type: SPACER; \ description { state: "default" 0.0; \ - rel1 { \ - relative: (_pos % 7 / 7) \ - (_pos / 7 / 6 - _pos % 7 / 7 / 6); \ - to: "base"; \ - } \ - rel2 { \ - relative: (_pos % 7 / 7 + 1 / 7) \ - (_pos / 7 / 6 + 1 / 6 - _pos % 7 / 7 / 6); \ - to: "base"; \ - } \ + rel.to: "base"; \ + rel1.relative: (_pos % 7 / 7) (_pos / 7 / 6 - _pos % 7 / 7 / 6); \ + rel2.relative: (_pos % 7 / 7 + 1 / 7) (_pos / 7 / 6 + 1 / 6 - _pos % 7 / 7 / 6); \ } \ } \ part { name: "cit_"#_pos"_event"; type: RECT; repeat_events: 1; \ description { state: "default" 0.0; \ - rel1.to: "cit_"#_pos"_rect"; \ - rel2.to: "cit_"#_pos"_rect"; \ + rel.to: "cit_"#_pos"_rect"; \ color: 0 0 0 0; \ } \ - } \ - part { name: "cit_"#_pos"_pat"; mouse_events: 0; \ - description { state: "default" 0.0; \ - rel1.to: "cit_"#_pos"_selected"; \ - rel1.offset: 1 1; \ - rel2.to: "cit_"#_pos"_selected"; \ - rel2.offset: -2 -2; \ - image.normal: "diagonal_stripes.png"; \ - color: 51 153 255 25; \ - TILED_PATTERN(240, 240) \ - color_class: "calendar_day_selected"; \ - visible: 0; \ - } \ - description { state: "selected" 0.0; \ + description { state: "today" 0.0; \ inherit: "default" 0.0; \ - visible: 1; \ + color: 0 0 0 64; \ } \ } \ - part { name: "cit_"#_pos"_selected"; mouse_events: 0; \ + part { name: "cit_"#_pos"_selected"; type: RECT; mouse_events: 0; \ description { state: "default" 0.0; \ - rel1.to: "cit_"#_pos"_rect"; \ - rel2.to: "cit_"#_pos"_rect"; \ - image.normal: "outline.png"; \ - image.border: 4 4 4 4; \ - color: 51 153 255 255; \ + rel.to: "cit_"#_pos"_rect"; \ + color: 51 153 255 128; \ visible: 0; \ } \ description { state: "selected" 0.0; \ @@ -176,32 +156,13 @@ visible: 1; \ } \ } \ - part { name: "cit_"#_pos"_selected2"; mouse_events: 0; \ + part { name: "cit_"#_pos"_focus"; type: RECT; mouse_events: 0; \ description { state: "default" 0.0; \ - rel1.to: "cit_"#_pos"_rect"; \ - rel2.to: "cit_"#_pos"_rect"; \ - image.normal: "outline.png"; \ - image.border: 4 4 4 4; \ - color: 51 153 255 255; \ - color_class: "calendar_day_highlighted"; \ + rel.to: "cit_"#_pos"_rect"; \ + color: 255 153 51 128; \ visible: 0; \ } \ - description { state: "highlighted" 0.0; \ - inherit: "default" 0.0; \ - visible: 1; \ - } \ - } \ - part { name: "cit_"#_pos"_glow"; mouse_events: 0; \ - description { state: "default" 0.0; \ - rel1.to: "cit_"#_pos"_rect"; \ - rel2.to: "cit_"#_pos"_rect"; \ - image.normal: "box_glow.png"; \ - image.border: 12 12 12 12; \ - image.middle: 0; \ - fill.smooth: 0; \ - visible: 0; \ - } \ - description { state: "focused" 0.0; \ + description { state: "selected" 0.0; \ inherit: "default" 0.0; \ visible: 1; \ } \ @@ -209,11 +170,17 @@ part { name: "efl.cit_"#_pos".text"; type: TEXTBLOCK; mouse_events: 0; \ scale: 1; \ description { state: "default" 0.0; \ - rel1.to: "cit_"#_pos"_rect"; \ - rel2.to: "cit_"#_pos"_rect"; \ + rel.to: "cit_"#_pos"_rect"; \ + rel1.offset: 3 0; \ + rel2.offset: -4 -1; \ text.style: "efl_ui_calendar_date_style"; \ text.min: 1 1; \ text.ellipsis: -1; \ + offscale; \ + } \ + description { state: "holiday" 0.0; \ + inherit: "default" 0.0; \ + text.style: "efl_ui_calendar_date_holiday_style"; \ } \ description { state: "today" 0.0; \ inherit: "default" 0.0; \ @@ -223,25 +190,26 @@ inherit: "default" 0.0; \ text.style: "efl_ui_calendar_date_disabled_style"; \ } \ + description { state: "weekend/day1" 0.0; \ + inherit: "default" 0.0; \ + text.style: "efl_ui_calendar_date_weekend1_style"; \ + } \ + description { state: "weekend/day2" 0.0; \ + inherit: "default" 0.0; \ + text.style: "efl_ui_calendar_date_weekend2_style"; \ + } \ } \ part { name: "cit_"#_pos"_check"; mouse_events: 0; \ scale: 1; \ description { state: "default" 0.0; \ fixed: 1 1; \ - rel1 { \ - to: "cit_"#_pos"_rect"; \ - relative: 0.6 0.5; \ - } \ - rel2 { \ - to: "cit_"#_pos"_rect"; \ - relative: 0.6 0.5; \ - } \ - min: 16 16; \ - max: 16 16; \ - aspect: 1 1; \ + rel.to: "cit_"#_pos"_rect"; \ + rel1.relative: 0.6 0.5; \ + min: 15 15; \ + max: 15 15; \ align: 0.0 1.0;\ - image.normal: "icon_border_remember.png"; \ - color_class: "calendar_day_checked"; \ + image.normal: "i-check"; \ + color: 53 153 255 255; \ visible: 0; \ } \ description { state: "visible" 0.0; \ @@ -251,8 +219,7 @@ } \ part { name: "efl.cit_"#_pos".access"; type: RECT; repeat_events: 1; \ description { state: "default" 0.0; \ - rel1.to: "cit_"#_pos"_event"; \ - rel2.to: "cit_"#_pos"_event"; \ + rel.to: "cit_"#_pos"_event"; \ color: 0 0 0 0; \ } \ } \ @@ -262,7 +229,6 @@ signal: "cit_"#_pos",selected"; \ source: "efl"; \ action: STATE_SET "selected" 0.0; \ - target: "cit_"#_pos"_pat"; \ target: "cit_"#_pos"_selected"; \ } \ program { \ @@ -270,7 +236,6 @@ signal: "cit_"#_pos",unselected"; \ source: "efl"; \ action: STATE_SET "default" 0.0; \ - target: "cit_"#_pos"_pat"; \ target: "cit_"#_pos"_selected"; \ } \ program { \ @@ -281,7 +246,7 @@ set_int(item_focus_enabled, 1); \ set_int(last_focused_item, _pos); \ if (get_int(win_focus_enabled) == 1) \ - set_state(PART:"cit_"#_pos"_glow", "focused", 0.0); \ + set_state(PART:"cit_"#_pos"_focus", "selected", 0.0); \ } \ } \ program { \ @@ -290,7 +255,7 @@ source: "efl"; \ script { \ set_int(item_focus_enabled, 0); \ - set_state(PART:"cit_"#_pos"_glow", "default", 0.0); \ + set_state(PART:"cit_"#_pos"_focus", "default", 0.0); \ } \ } \ program { \ @@ -299,6 +264,7 @@ source: "efl"; \ action: STATE_SET "today" 0.0; \ target: "efl.cit_"#_pos".text"; \ + target: "cit_"#_pos"_event";\ } \ program { \ name: "cit_"#_pos"_not_today"; \ @@ -306,6 +272,7 @@ source: "efl"; \ action: STATE_SET "default" 0.0; \ target: "efl.cit_"#_pos".text"; \ + target: "cit_"#_pos"_event";\ } \ program { \ name: "cit_"#_pos"_enable"; \ @@ -330,15 +297,15 @@ source: "cit_"#_pos"_clicked"; \ signal: "mouse,down,1"; \ source: "cit_"#_pos"_event"; \ - action: STATE_SET "highlighted" 0.0; \ - target: "cit_"#_pos"_selected2"; \ + action: STATE_SET "selected" 0.0; \ + target: "cit_"#_pos"_selected"; \ } \ program { \ source: "cit_"#_pos"_clicked"; \ signal: "mouse,up,1"; \ source: "cit_"#_pos"_event"; \ action: STATE_SET "default" 0.0; \ - target: "cit_"#_pos"_selected2"; \ + target: "cit_"#_pos"_selected"; \ } \ program { \ source: "cit_"#_pos"_clicked"; \ @@ -420,15 +387,8 @@ } \ } -group { "efl/calendar"; data.item: "version" "123"; - images.image: "sym_left_light_normal.png" COMP; - images.image: "sym_right_light_normal.png" COMP; - images.image: "sym_left_glow_normal.png" COMP; - images.image: "sym_right_glow_normal.png" COMP; - images.image: "icon_border_remember.png" COMP; - images.image: "outline.png" COMP; - images.image: "box_glow.png" COMP; - images.image: "diagonal_stripes.png" COMP; +group { name: "efl/calendar"; + data.item: "version" "123"; data.item: "focus_highlight" "on"; script { public rtl; @@ -437,32 +397,34 @@ group { "efl/calendar"; data.item: "version" "123"; public last_focused_item; } styles { - CIT_STYLE + CIT_STYLES } parts { part { name: "bg"; type: SPACER; + scale: 1; description { state: "default" 0.0; - rel1.offset: 1 1; - rel2.offset: -2 -2; + rel1.offset: 8 8; + rel2.offset: -9 -9; + offscale; } } part { name: "efl.background"; type: SWALLOW; description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; + rel.to: "bg"; } } part { name: "spinner-base1"; type: SPACER; + scale: 1; description { state: "default" 0.0; min: 24 16; max: 999999 16; - rel1.to: "bg"; - rel2.to: "bg"; + rel.to: "bg"; rel2.relative: 1.0 (1/8); align: 0.5 0.0; } } part { name: "table-base"; type: SPACER; + scale: 1; description { state: "default" 0.0; min: 70 60; rel1.to_x: "bg"; @@ -471,29 +433,31 @@ group { "efl/calendar"; data.item: "version" "123"; rel1.relative: 0.0 1.0; rel2.to: "bg"; rel2.offset: -4 -4; + offscale; } } part { name: "header"; type: SPACER; description { state: "default" 0.0; - rel1.to: "table-base"; - rel2.to: "table-base"; + rel.to: "table-base"; rel2.relative: 1.0 (1/7); align: 0.5 0.0; - min: 0 16; + min: 0 25; } } - part { name: "header_separator"; mouse_events: 0; + part { name: "header_separator"; type: RECT; mouse_events: 0; + scale: 1; description { state: "default" 0.0; fixed: 1 1; - rel1.to: "header"; + rel.to: "header"; rel1.relative: 0.0 1.0; - rel1.offset: 0 -2; - rel2.to: "header"; - image.normal: "separator_horiz.png"; - fill.smooth: 0; + rel1.offset: 8 -1; + rel2.offset: -9 -1; + color: 80 80 80 255; + offscale; } } part { name: "base"; type: SPACER; + scale: 1; description { state: "default" 0.0; rel1.to_x: "table-base"; rel1.to_y: "header"; @@ -501,6 +465,7 @@ group { "efl/calendar"; data.item: "version" "123"; rel1.offset: 3 0; rel2.to: "table-base"; rel2.offset: -3 0; + offscale; } } @@ -537,182 +502,148 @@ group { "efl/calendar"; data.item: "version" "123"; } } -#undef CAL_SPIN -#undef CIT -#undef CH - - group { name: "efl/calendar/inc_button"; data.item: "version" "123"; - images.image: "sym_right_light_normal.png" COMP; - images.image: "sym_right_glow_normal.png" COMP; - images.image: "sym_right_dark_normal.png" COMP; - script { - public mouse_down = 0; - public multi_down = 0; - } - parts { - part { name: "arrow.image"; - scale: 1; - description { state: "default" 0.0; - min: 15 15; - max: 15 15; - color_class: "F032L1"; - image.normal: "sym_right_light_normal.png"; - } - description { state: "pressed" 0.0; - inherit: "default" 0.0; - image.normal: "sym_right_glow_normal.png"; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "sym_right_dark_normal.png"; - } +group { name: "efl/calendar/inc_button"; + data.item: "version" "123"; + script { + public mouse_down = 0; + public multi_down = 0; + } + parts { + part { name: "arrow.image"; + scale: 1; + description { state: "default" 0.0; + min: 15 15; max: 15 15; + color: 160 160 160 255; + image.normal: "i-arrow-r"; } - part { name: "over"; - type: RECT; - repeat_events: 1; - description { state: "default" 0.0; - color: 0 0 0 0; - } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; } - part { name: "disabler"; - type: RECT; - description { state: "default" 0.0; - color: 0 0 0 0; - visible: 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 1; - } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 96 96 96 255; } } - programs { - program { name: "button_press"; - signal: "mouse,down,1"; - source: "over"; - script { - if ((get_int(multi_down) == 0) && - (get_int(mouse_down) == 0)) { - set_int(mouse_down, 1); - run_program(PROGRAM:"button_press2"); - } - } + part { name: "over"; type: RECT; + repeat_events: 1; + description { state: "default" 0.0; + color: 0 0 0 0; } - program { name: "button_press2"; - action: SIGNAL_EMIT "efl,action,press" ""; - after: "button_press_anim"; + } + part { name: "disabler"; type: RECT; + description { state: "default" 0.0; + color: 0 0 0 0; + visible: 0; } - program { name: "button_press_anim"; - action: STATE_SET "pressed" 0.0; - target: "arrow.image"; + description { state: "disabled" 0.0; + inherit: "default" 0.0; + visible: 1; } - program { name: "button_unpress"; - signal: "mouse,up,1"; - source: "over"; - script { - if (get_int(mouse_down) == 1) { - set_int(mouse_down, 0); - run_program(PROGRAM:"button_unpress2"); - run_program(PROGRAM:"button_unpress_anim"); - } + } + } + programs { + program { signal: "mouse,down,1"; source: "over"; + script { + if ((get_int(multi_down) == 0) && + (get_int(mouse_down) == 0)) { + set_int(mouse_down, 1); + run_program(PROGRAM:"button_press2"); } } - program { name: "button_unpress2"; - action: SIGNAL_EMIT "efl,action,unpress" ""; - } - program { name: "button_unpress_anim"; - action: STATE_SET "default" 0.0; - target: "arrow.image"; - } - program { name: "button_click"; - signal: "mouse,clicked,1"; - source: "over"; - script { - if (get_int(multi_down) == 0) { - run_program(PROGRAM:"button_click2"); - } + } + program { name: "button_press2"; + action: SIGNAL_EMIT "efl,action,press" ""; + after: "button_press_anim"; + } + program { name: "button_press_anim"; + action: STATE_SET "pressed" 0.0; + target: "arrow.image"; + } + program { signal: "mouse,up,1"; source: "over"; + script { + if (get_int(mouse_down) == 1) { + set_int(mouse_down, 0); + run_program(PROGRAM:"button_unpress2"); + run_program(PROGRAM:"button_unpress_anim"); } } - program { name: "action_unpressed"; - signal: "efl,action,unpressed"; - source: "efl"; - after: "button_unpress_anim"; - } - program { name: "action_pressed"; - signal: "efl,action,pressed"; - source: "efl"; - after: "button_press_anim"; - } - program { name: "button_click2"; - action: SIGNAL_EMIT "efl,action,click" ""; - } - program { name: "access_pressed"; - signal: "efl,state,animation,activated"; - source: "efl"; - action: STATE_SET "pressed" 0.0; - target: "arrow.image"; - after: "access_pressed_anim"; - } - program { name: "access_pressed_anim"; - action: STATE_SET "default" 0.0; - transition: DECELERATE 0.1; - target: "arrow.image"; - } - program { name: "disable"; - signal: "efl,state,disabled"; - source: "efl"; - action: STATE_SET "disabled" 0.0; - target: "arrow.image"; - target: "disabler"; - } - program { name: "enable"; - signal: "efl,state,enabled"; - source: "efl"; - action: STATE_SET "default" 0.0; - target: "arrow.image"; - target: "disabler"; - } - program { - name: "multi_down"; - signal: "efl,action,multi,down"; - source: "efl"; - script { - set_int(multi_down, 1); + } + program { name: "button_unpress2"; + action: SIGNAL_EMIT "efl,action,unpress" ""; + } + program { name: "button_unpress_anim"; + action: STATE_SET "default" 0.0; + target: "arrow.image"; + } + program { signal: "mouse,clicked,1"; source: "over"; + script { + if (get_int(multi_down) == 0) { + run_program(PROGRAM:"button_click2"); } } - program { - name: "multi_up"; - signal: "efl,action,multi,up"; - source: "efl"; - script { - set_int(multi_down, 0); - } + } + program { signal: "efl,action,unpressed"; source: "efl"; + after: "button_unpress_anim"; + } + program { signal: "efl,action,pressed"; source: "efl"; + after: "button_press_anim"; + } + program { name: "button_click2"; + action: SIGNAL_EMIT "efl,action,click" ""; + } + program { signal: "efl,state,animation,activated"; source: "efl"; + action: STATE_SET "pressed" 0.0; + target: "arrow.image"; + after: "access_pressed_anim"; + } + program { name: "access_pressed_anim"; + action: STATE_SET "default" 0.0; + transition: DECELERATE 0.1; + target: "arrow.image"; + } + program { signal: "efl,state,disabled"; source: "efl"; + action: STATE_SET "disabled" 0.0; + target: "arrow.image"; + target: "disabler"; + } + program { signal: "efl,state,enabled"; source: "efl"; + action: STATE_SET "default" 0.0; + target: "arrow.image"; + target: "disabler"; + } + program { signal: "efl,action,multi,down"; source: "efl"; + script { + set_int(multi_down, 1); + } + } + program { signal: "efl,action,multi,up"; source: "efl"; + script { + set_int(multi_down, 0); } } } +} - group { name: "efl/calendar/dec_button"; - inherit: "efl/calendar/inc_button"; - data.item: "version" "123"; - images.image: "sym_left_light_normal.png" COMP; - images.image: "sym_left_glow_normal.png" COMP; - images.image: "sym_left_dark_normal.png" COMP; - parts { - part { name: "arrow.image"; - scale: 1; - description { state: "default" 0.0; - min: 15 15; - max: 15 15; - image.normal: "sym_left_light_normal.png"; - } - description { state: "pressed" 0.0; - inherit: "default" 0.0; - image.normal: "sym_left_glow_normal.png"; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "sym_left_dark_normal.png"; - } +group { name: "efl/calendar/dec_button"; + inherit: "efl/calendar/inc_button"; + data.item: "version" "123"; + parts { + part { name: "arrow.image"; + scale: 1; + description { state: "default" 0.0; + image.normal: "i-arrow-l"; + } + description { state: "pressed" 0.0; + image.normal: "i-arrow-l"; + } + description { state: "disabled" 0.0; + image.normal: "i-arrow-l"; } } } +} +#undef CIT_STYLES +#undef CAL_SPIN +#undef CIT +#undef CH diff --git a/data/elementary/themes/edc/elm/calendar.edc b/data/elementary/themes/edc/elm/calendar.edc index 9a9a4901a4..73bad621be 100644 --- a/data/elementary/themes/edc/elm/calendar.edc +++ b/data/elementary/themes/edc/elm/calendar.edc @@ -537,6 +537,7 @@ group { name: "elm/calendar/base/double_spinners"; } } +#undef CIT_STYLES #undef CAL_SPIN #undef CIT #undef CH --
