diff options
author | Woochan Lee <wc0917.lee@samsung.com> | 2017-03-10 15:47:58 +0900 |
---|---|---|
committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2017-03-09 23:02:05 -0800 |
commit | 72c22f1275c591bc2a5bde6107798563e9469108 (patch) | |
tree | 40395664150cc1100748fecc9dbbc3d9d6ca950f | |
parent | e4c693f3e12a0e0ff29cff46f02a857ac79c7317 (diff) | |
download | efl-theme-tizen-mobile-72c22f1275c591bc2a5bde6107798563e9469108.tar.gz efl-theme-tizen-mobile-72c22f1275c591bc2a5bde6107798563e9469108.tar.bz2 efl-theme-tizen-mobile-72c22f1275c591bc2a5bde6107798563e9469108.zip |
Spinner: text button part changed to textblock and give fit option for long text.
Change-Id: I3a8c212e0ebe3404717bbc3ac0a5b7079b572e29
-rw-r--r-- | mobile/HD-inc.edc | 2 | ||||
-rw-r--r-- | mobile/widgets/datetime.edc | 34 | ||||
-rw-r--r-- | mobile/widgets/entry.edc | 58 | ||||
-rw-r--r-- | mobile/widgets/spinner.edc | 29 |
4 files changed, 82 insertions, 41 deletions
diff --git a/mobile/HD-inc.edc b/mobile/HD-inc.edc index 814e00f6..7e2ab239 100644 --- a/mobile/HD-inc.edc +++ b/mobile/HD-inc.edc @@ -823,7 +823,7 @@ #define SPINNER_DEFAULT_BG_SIZE_INC 346 146 #define SPINNER_VERTICAL_BG_SIZE_INC 146 346 #define SPINNER_VERTICAL_DATE_PICKER_BG_SIZE_INC 158 262 -#define SPINNER_VERTICAL_DATE_PICKER_TEXT_BUTTON_SIZE_INC 206 188 +#define SPINNER_VERTICAL_DATE_PICKER_TEXT_BUTTON_SIZE_INC 206 146 #define SPINNER_TEXT_HEIGHT_INC 146 #define SPINNER_BUTTON_CORNER_RADIUS 10 diff --git a/mobile/widgets/datetime.edc b/mobile/widgets/datetime.edc index c5e086ef..f6cdb64f 100644 --- a/mobile/widgets/datetime.edc +++ b/mobile/widgets/datetime.edc @@ -1106,27 +1106,27 @@ group { "elm/button/base/spinner/datetime/default"; min: SPINNER_VERTICAL_DATE_PICKER_TEXT_BUTTON_SIZE_INC; } } - text { "elm.text"; + textblock { "elm.text"; scale; desc { "default"; - min: 0 SPINNER_TEXT_HEIGHT_INC; - max: -1 SPINNER_TEXT_HEIGHT_INC; + min: SPINNER_VERTICAL_DATE_PICKER_TEXT_BUTTON_SIZE_INC; + max: SPINNER_VERTICAL_DATE_PICKER_TEXT_BUTTON_SIZE_INC; fixed: 1 1; rel.to: "base"; text { - font: "BreezeSans:weight=Light"; - size: 85; - ellipsis: 0.0; + style: "entry_single_spinner_datetime_date_layout_textblock_style"; + size_range: 40 90; + fit: 1 0; + size: 90; } - color_class: "datetime/default/text"; } desc { "pressed"; inherit: "default"; - color_class: "datetime/default/text_pressed"; + text.style: "entry_single_spinner_datetime_date_layout_textblock_pressed_style"; } desc { "disabled"; inherit: "default"; - color_class: "datetime/default/text_disabled"; + text.style: "entry_single_spinner_datetime_date_layout_textblock_disabled_style"; } } } @@ -1136,15 +1136,15 @@ 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"; + textblock { "elm.text"; desc { "default"; - color_class: "datetime/time_layout/text"; + text.style: "entry_single_spinner_datetime_time_layout_textblock_style"; } desc { "pressed"; - color_class: "datetime/time_layout/text_pressed"; + text.style: "entry_single_spinner_datetime_time_layout_textblock_pressed_style"; } desc { "disabled"; - color_class: "datetime/time_layout/text_disabled"; + text.style: "entry_single_spinner_datetime_time_layout_textblock_disabled_style"; } } } @@ -1153,15 +1153,15 @@ group { "elm/button/base/spinner/datetime/time_layout"; group { "elm/button/base/spinner/datetime/time_layout_24hr"; inherit: "elm/button/base/spinner/vertical"; parts { - text { "elm.text"; + textblock { "elm.text"; desc { "default"; - color_class: "datetime/time_layout_24hr/text"; + text.style: "entry_single_spinner_datetime_time_layout_24hr_textblock_style"; } desc { "pressed"; - color_class: "datetime/time_layout_24hr/text_pressed"; + text.style: "entry_single_spinner_datetime_time_layout_24hr_textblock_pressed_style"; } desc { "disabled"; - color_class: "datetime/time_layout_24hr/text_disabled"; + text.style: "entry_single_spinner_datetime_time_layout_24hr_textblock_disabled_style"; } } } diff --git a/mobile/widgets/entry.edc b/mobile/widgets/entry.edc index 9ea953dd..119838e2 100644 --- a/mobile/widgets/entry.edc +++ b/mobile/widgets/entry.edc @@ -190,13 +190,43 @@ styles { ENTRY_SINGLELINE_TAGS ENTRY_PREEDIT_TAGS } + style { "entry_single_spinner_textblock_pressed_style"; + base: "font=Tizen:weight=Light font_size=106 color=#fff align=center color_class=spinner/default/text_pressed"; + ENTRY_SINGLELINE_TAGS + ENTRY_PREEDIT_TAGS + } + style { "entry_single_spinner_textblock_disabled_style"; + base: "font=Tizen:weight=Light font_size=106 color=#fff align=center color_class=spinner/default/text_disabled"; + ENTRY_SINGLELINE_TAGS + ENTRY_PREEDIT_TAGS + } style { "entry_single_spinner_vertical_textblock_style"; base: "font=Tizen:weight=Light font_size=106 color=#fff align=center color_class=spinner/vertical/text"; ENTRY_SINGLELINE_TAGS ENTRY_PREEDIT_TAGS } + style { "entry_single_spinner_vertical_textblock_pressed_style"; + base: "font=Tizen:weight=Light font_size=106 color=#fff align=center color_class=spinner/vertical/text_pressed_"; + ENTRY_SINGLELINE_TAGS + ENTRY_PREEDIT_TAGS + } + style { "entry_single_spinner_vertical_textblock_disabled_style"; + base: "font=Tizen:weight=Light font_size=106 color=#fff align=center color_class=spinner/vertical/text_disabled"; + ENTRY_SINGLELINE_TAGS + ENTRY_PREEDIT_TAGS + } style { "entry_single_spinner_datetime_date_layout_textblock_style"; - base: "font=Tizen:weight=Light font_size=85 color=#fff align=center text_class=tizen color_class=datetime/default/text"; + base: "font=Tizen:weight=Light font_size=90 color=#fff align=center text_class=tizen color_class=datetime/default/text"; + ENTRY_SINGLELINE_TAGS + ENTRY_PREEDIT_TAGS + } + style { "entry_single_spinner_datetime_date_layout_textblock_pressed_style"; + base: "font=Tizen:weight=Light font_size=90 color=#fff align=center text_class=tizen color_class=datetime/default/text_pressed"; + ENTRY_SINGLELINE_TAGS + ENTRY_PREEDIT_TAGS + } + style { "entry_single_spinner_datetime_date_layout_textblock_disabled_style"; + base: "font=Tizen:weight=Light font_size=90 color=#fff align=center text_class=tizen color_class=datetime/default/text_disabled"; ENTRY_SINGLELINE_TAGS ENTRY_PREEDIT_TAGS } @@ -205,11 +235,31 @@ styles { ENTRY_SINGLELINE_TAGS ENTRY_PREEDIT_TAGS } + style { "entry_single_spinner_datetime_time_layout_textblock_pressed_style"; + base: "font=Tizen:weight=Light font_size=106 color=#fff align=center color_class=datetime/time_layout/text_pressed"; + ENTRY_SINGLELINE_TAGS + ENTRY_PREEDIT_TAGS + } + style { "entry_single_spinner_datetime_time_layout_textblock_disabled_style"; + base: "font=Tizen:weight=Light font_size=106 color=#fff align=center color_class=datetime/time_layout/text_disabled"; + ENTRY_SINGLELINE_TAGS + ENTRY_PREEDIT_TAGS + } style { "entry_single_spinner_datetime_time_layout_24hr_textblock_style"; base: "font=Tizen:weight=Light font_size=106 color=#fff align=center color_class=datetime/time_layout_24hr/text"; ENTRY_SINGLELINE_TAGS ENTRY_PREEDIT_TAGS } + style { "entry_single_spinner_datetime_time_layout_24hr_textblock_pressed_style"; + base: "font=Tizen:weight=Light font_size=106 color=#fff align=center color_class=datetime/time_layout_24hr/text_pressed"; + ENTRY_SINGLELINE_TAGS + ENTRY_PREEDIT_TAGS + } + style { "entry_single_spinner_datetime_time_layout_24hr_textblock_disabled_style"; + base: "font=Tizen:weight=Light font_size=106 color=#fff align=center color_class=datetime/time_layout_24hr/text_disabled"; + ENTRY_SINGLELINE_TAGS + ENTRY_PREEDIT_TAGS + } style { "multibuttonentry_single_textblock_style"; base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=none text_class=entry color_class=multibuttonentry/default/text_edit"; ENTRY_SINGLELINE_TAGS @@ -1605,10 +1655,12 @@ group { "elm/entry/base-single/spinner/datetime/default"; source5: "elm/entry/anchor/spinner/datetime/default"; // anchor under desc { "default"; min: SPINNER_VERTICAL_DATE_PICKER_TEXT_BUTTON_SIZE_INC; + max: SPINNER_VERTICAL_DATE_PICKER_TEXT_BUTTON_SIZE_INC; text { style: "entry_single_spinner_datetime_date_layout_textblock_style"; - min: 1 1; - align: 0.0 0.5; + size_range: 40 90; + fit: 1 0; + size: 90; } } desc { "focused"; diff --git a/mobile/widgets/spinner.edc b/mobile/widgets/spinner.edc index c656765a..7acd9030 100644 --- a/mobile/widgets/spinner.edc +++ b/mobile/widgets/spinner.edc @@ -234,7 +234,7 @@ group { "elm/button/base/spinner/template"; desc { "default"; } } - text { "elm.text"; + textblock { "elm.text"; desc { "default"; rel.to: "base"; } @@ -879,27 +879,22 @@ group { "elm/button/base/spinner/default"; public sound_disable = 0; } parts { - text { "elm.text"; + textblock { "elm.text"; scale; desc { "default"; min: 0 SPINNER_TEXT_HEIGHT_INC; max: -1 SPINNER_TEXT_HEIGHT_INC; fixed: 0 1; rel.to: "base"; - text { - font: "Tizen:weight=Light"; - size: 106; - text_class: "tizen"; - } - color_class:"spinner/default/text"; + text.style: "entry_single_spinner_textblock_style"; } desc { "pressed"; inherit: "default"; - color_class:"spinner/default/text_pressed"; + text.style: "entry_single_spinner_textblock_pressed_style"; } desc { "disabled"; inherit: "default"; - color_class:"spinner/default/text_disabled"; + text.style: "entry_single_spinner_textblock_disabled_style"; } } spacer { "focus_image"; @@ -1063,28 +1058,22 @@ group { "elm/button/base/spinner/vertical"; inherit: "elm/button/base/spinner/default"; //data.item: "focus_highlight" "on"; // We need to set data item after applying focus_image properly. parts { - text { "elm.text"; + textblock { "elm.text"; scale; desc { "default"; min: 0 SPINNER_TEXT_HEIGHT_INC; max: -1 SPINNER_TEXT_HEIGHT_INC; fixed: 0 1; rel.to: "base"; - text { - font: "Tizen:weight=Light"; - size: 106; - text_class: "tizen"; - ellipsis: -1.0; - } - color_class:"spinner/vertical/text"; + text.style: "entry_single_spinner_vertical_textblock_style"; } desc { "pressed"; inherit: "default"; - color_class:"spinner/vertical/text_pressed"; + text.style: "entry_single_spinner_vertical_textblock_pressed_style"; } desc { "disabled"; inherit: "default" 0.0; - color_class:"spinner/vertical/text_disabled"; + text.style: "entry_single_spinner_vertical_textblock_disabled_style"; } } } |