diff options
-rw-r--r-- | mobile/widgets/datetime.edc | 41 | ||||
-rw-r--r-- | mobile/widgets/spinner.edc | 56 |
2 files changed, 39 insertions, 58 deletions
diff --git a/mobile/widgets/datetime.edc b/mobile/widgets/datetime.edc index 1d50ca26..c5e086ef 100644 --- a/mobile/widgets/datetime.edc +++ b/mobile/widgets/datetime.edc @@ -901,7 +901,17 @@ group { "elm/datetime/base/time_layout_24hr"; group { "elm/spinner/base/datetime/default"; alias: "elm/spinner/base/datetime/date_layout"; - inherit: "elm/spinner/base/vertical_date_picker"; + alias: "elm/spinner/base/vertical_date_picker"; + inherit: "elm/spinner/base/vertical"; + parts { + spacer { "base"; + scale; + desc { "default"; + min: SPINNER_VERTICAL_DATE_PICKER_BG_SIZE_INC; + } + } + } + part_remove: "bg"; // vertical_date_picker has bg in itself. } group { "elm/spinner/base/datetime/time_layout"; @@ -916,6 +926,8 @@ group { "elm/spinner/base/datetime/time_layout_24hr"; group { "elm/button/base/spinner/increase/datetime/default"; alias: "elm/button/base/spinner/increase/datetime/date_layout"; + alias: "elm/button/base/spinner/increase/vertical_date_picker"; + alias: "elm/button/base/spinner/increase/datetime"; inherit: "elm/button/base/spinner/increase/vertical"; parts { rect { "clipper_bg_effect"; @@ -943,6 +955,7 @@ group { "elm/button/base/spinner/increase/datetime/default"; } group { "elm/button/base/spinner/increase/datetime/time_layout"; + alias: "elm/button/base/spinner/increase/vertical_time_picker"; inherit: "elm/button/base/spinner/increase/vertical"; parts { rect { "clipper_bg_effect"; @@ -998,6 +1011,8 @@ group { "elm/button/base/spinner/increase/datetime/time_layout_24hr"; group { "elm/button/base/spinner/decrease/datetime/default"; alias: "elm/button/base/spinner/decrease/datetime/date_layout"; + alias: "elm/button/base/spinner/decrease/vertical_date_picker"; + alias: "elm/button/base/spinner/decrease/datetime"; inherit: "elm/button/base/spinner/decrease/vertical"; parts { rect { "clipper_bg_effect"; @@ -1025,6 +1040,7 @@ group { "elm/button/base/spinner/decrease/datetime/default"; } group { "elm/button/base/spinner/decrease/datetime/time_layout"; + alias: "elm/button/base/spinner/decrease/vertical_time_picker"; inherit: "elm/button/base/spinner/decrease/vertical"; parts { rect { "clipper_bg_effect"; @@ -1080,16 +1096,36 @@ group { "elm/button/base/spinner/decrease/datetime/time_layout_24hr"; group { "elm/button/base/spinner/datetime/default"; alias: "elm/button/base/spinner/datetime/date_layout"; - inherit: "elm/button/base/spinner/vertical_date_picker"; + alias: "elm/button/base/spinner/vertical_date_picker"; + alias: "elm/button/base/spinner/datetime"; + inherit: "elm/button/base/spinner/vertical"; parts { + spacer { "base"; + scale; + desc { "default"; + min: SPINNER_VERTICAL_DATE_PICKER_TEXT_BUTTON_SIZE_INC; + } + } text { "elm.text"; + scale; desc { "default"; + min: 0 SPINNER_TEXT_HEIGHT_INC; + max: -1 SPINNER_TEXT_HEIGHT_INC; + fixed: 1 1; + rel.to: "base"; + text { + font: "BreezeSans:weight=Light"; + size: 85; + ellipsis: 0.0; + } color_class: "datetime/default/text"; } desc { "pressed"; + inherit: "default"; color_class: "datetime/default/text_pressed"; } desc { "disabled"; + inherit: "default"; color_class: "datetime/default/text_disabled"; } } @@ -1097,6 +1133,7 @@ group { "elm/button/base/spinner/datetime/default"; } group { "elm/button/base/spinner/datetime/time_layout"; + alias: "elm/button/base/spinner/vertical_time_picker"; inherit: "elm/button/base/spinner/vertical"; parts { text { "elm.text"; diff --git a/mobile/widgets/spinner.edc b/mobile/widgets/spinner.edc index 905ffa9d..c6c06670 100644 --- a/mobile/widgets/spinner.edc +++ b/mobile/widgets/spinner.edc @@ -522,19 +522,6 @@ group { "elm/spinner/base/vertical"; } } -group { "elm/spinner/base/vertical_date_picker"; - inherit: "elm/spinner/base/vertical"; - parts { - spacer { "base"; - scale; - desc { "default"; - min: SPINNER_VERTICAL_DATE_PICKER_BG_SIZE_INC; - } - } - } - part_remove: "bg"; // vertical_date_picker has bg in itself. -} - #define BUTTON_SPINNER_BG_EFFECT_PARTS(corner_size, ratio, sizer_bg_effect, clipper_bg_effect, top_left, top_right, mid, bottom_left, bottom_right) \ vector { "bg_effect_top_left"; \ clip: clipper_bg_effect; \ @@ -961,9 +948,6 @@ group { "elm/button/base/spinner/default"; // Vertical ///////////// ///////////////////////// group { "elm/button/base/spinner/increase/vertical"; - alias: "elm/button/base/spinner/increase/vertical_time_picker"; - alias: "elm/button/base/spinner/increase/vertical_date_picker"; - alias: "elm/button/base/spinner/increase/datetime"; inherit: "elm/button/base/spinner/increase/default"; //data.item: "focus_highlight" "on"; // We need to set data item after applying focus_image properly. images { @@ -1029,9 +1013,6 @@ group { "elm/button/base/spinner/increase/vertical"; group { "elm/button/base/spinner/decrease/vertical"; inherit: "elm/button/base/spinner/increase/vertical"; - alias: "elm/button/base/spinner/decrease/vertical_time_picker"; - alias: "elm/button/base/spinner/decrease/vertical_date_picker"; - alias: "elm/button/base/spinner/decrease/datetime"; images { image: "core_icon_picker_arrow_down.png" COMP; } @@ -1055,8 +1036,6 @@ group { "elm/button/base/spinner/decrease/vertical"; #undef BUTTON_SPINNER_BG_EFFECT_PARTS group { "elm/button/base/spinner/vertical"; - alias: "elm/button/base/spinner/vertical_time_picker"; - alias: "elm/button/base/spinner/datetime"; inherit: "elm/button/base/spinner/default"; //data.item: "focus_highlight" "on"; // We need to set data item after applying focus_image properly. parts { @@ -1086,38 +1065,3 @@ group { "elm/button/base/spinner/vertical"; } } } - -group { "elm/button/base/spinner/vertical_date_picker"; - inherit: "elm/button/base/spinner/vertical"; - parts { - spacer { "base"; - scale; - desc { "default"; - min: SPINNER_VERTICAL_DATE_PICKER_TEXT_BUTTON_SIZE_INC; - } - } - text { "elm.text"; - scale; - desc { "default"; - min: 0 SPINNER_TEXT_HEIGHT_INC; - max: -1 SPINNER_TEXT_HEIGHT_INC; - fixed: 1 1; - rel.to: "base"; - text { - font: "BreezeSans:weight=Light"; - size: 85; - ellipsis: 0.0; - } - color_class:"spinner/default/text"; - } - desc { "pressed"; - inherit: "default"; - color_class:"spinner/default/text_pressed"; - } - desc { "disabled"; - inherit: "default"; - color_class:"spinner/default/text_disabled"; - } - } - } -} |