diff options
author | Thiep Ha <thiep.ha@samsung.com> | 2015-08-12 13:28:46 +0900 |
---|---|---|
committer | Gerrit Code Review <gerrit@tizensrc> | 2015-08-12 13:28:46 +0900 |
commit | 74a1299329f9f1619b07cee5606596c64106c8a3 (patch) | |
tree | 221b8a0a17fe5dfdde3578872fce2c1bcb3cce6a /mobile/widgets/entry.edc | |
parent | 78886a5fd6786ddee2db0e2358e22700719ad2eb (diff) | |
parent | 808030fec0a0afcf333922cddf59c2440f39d39f (diff) | |
download | efl-theme-tizen-mobile-74a1299329f9f1619b07cee5606596c64106c8a3.tar.gz efl-theme-tizen-mobile-74a1299329f9f1619b07cee5606596c64106c8a3.tar.bz2 efl-theme-tizen-mobile-74a1299329f9f1619b07cee5606596c64106c8a3.zip |
Merge "[2.4][entry] Add font size data item" into tizen_2.4
Diffstat (limited to 'mobile/widgets/entry.edc')
-rw-r--r-- | mobile/widgets/entry.edc | 57 |
1 files changed, 21 insertions, 36 deletions
diff --git a/mobile/widgets/entry.edc b/mobile/widgets/entry.edc index 1cc04526..3f64281a 100644 --- a/mobile/widgets/entry.edc +++ b/mobile/widgets/entry.edc @@ -100,9 +100,7 @@ group { name: "elm/entry/emoticon/worried/default"; images.image: group { name: "elm/entry/base/default"; alias: "elm/entry/base-mixedwrap/default"; - data.item: "default_font_size" "24"; - data.item: "min_font_size" "8"; - data.item: "max_font_size" "60"; + data.item: "default_font_size" ENTRY_FONT_SIZE_INC; data.item: "focus_highlight" "on"; styles { style { name: "entry_textblock_style"; @@ -259,6 +257,7 @@ group { name: "elm/entry/base/default"; group { name: "elm/entry/base/vcenter_align"; alias: "elm/entry/base-mixedwrap/vcenter_align"; inherit: "elm/entry/base/default"; + data.item: "default_font_size" ENTRY_FONT_SIZE_INC; parts { part { name: "elm.guide"; type: TEXTBLOCK; @@ -317,9 +316,7 @@ group { name: "elm/entry/base/vcenter_align"; group { name: "elm/entry/base-charwrap/default"; alias: "elm/entry/base/char_wrap"; - data.item: "default_font_size" "24"; - data.item: "min_font_size" "8"; - data.item: "max_font_size" "60"; + data.item: "default_font_size" ENTRY_FONT_SIZE_INC; styles { style { name: "entry_textblock_char_wrap_style"; base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#000000ff wrap=char left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" text_class=entry"; @@ -475,6 +472,7 @@ group { name: "elm/entry/base-charwrap/default"; group { name: "elm/entry/base-charwrap/vcenter_align"; alias: "elm/entry/base/vcenter_align"; inherit: "elm/entry/base-charwrap/default"; + data.item: "default_font_size" ENTRY_FONT_SIZE_INC; parts { part { name: "elm.guide"; type: TEXTBLOCK; @@ -532,9 +530,7 @@ group { name: "elm/entry/base-charwrap/vcenter_align"; } group { name: "elm/entry/base-nowrap/default"; - data.item: "default_font_size" "24"; - data.item: "min_font_size" "8"; - data.item: "max_font_size" "60"; + data.item: "default_font_size" ENTRY_FONT_SIZE_INC; data { item: context_menu_orientation "horizontal"; } @@ -640,6 +636,7 @@ group { name: "elm/entry/base-nowrap/default"; group { name: "elm/entry/base-nowrap/vcenter_align"; inherit: "elm/entry/base-nowrap/default"; + data.item: "default_font_size" ENTRY_FONT_SIZE_INC; parts { part { name: "elm.guide"; type: TEXTBLOCK; @@ -697,9 +694,7 @@ group { name: "elm/entry/base-nowrap/vcenter_align"; group { name: "elm/entry/base-single/default"; alias: "elm/entry/base-single/vcenter_align"; - data.item: "default_font_size" "24"; - data.item: "min_font_size" "8"; - data.item: "max_font_size" "60"; + data.item: "default_font_size" ENTRY_FONT_SIZE_INC; styles { style { name: "entry_single_textblock_style"; base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#000000ff wrap=none left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" text_class=entry"; @@ -858,9 +853,7 @@ group { name: "elm/entry/base-single/default"; group { name: "elm/entry/base-single/spinner/default"; alias: "elm/entry/base-single/spinner/horizontal"; - data.item: "default_font_size" "24"; - data.item: "min_font_size" "8"; - data.item: "max_font_size" "60"; + data.item: "default_font_size" "80"; // FIXME: SamsungNum3L has to be applied. styles { style { name: "entry_single_spinner_textblock_style"; @@ -1021,6 +1014,7 @@ group { name: "elm/entry/base-single/spinner/default"; group { name: "elm/entry/base-single/spinner/vertical"; alias: "elm/entry/base-single/spinner/vertical_time_picker"; alias: "elm/entry/base-single/spinner/datetime"; + data.item: "default_font_size" "106"; styles { style { name: "entry_single_spinner_vertical_textblock_style"; base: "font=TizenSans:style=Light font_size=106 color=#000000ff align=center"; @@ -1185,6 +1179,7 @@ group { name: "elm/entry/base-single/spinner/vertical"; group { name: "elm/entry/base-single/spinner/vertical_date_picker"; inherit: "elm/entry/base-single/spinner/vertical"; + data.item: "default_font_size" "90"; styles { style { name: "entry_single_spinner_vertical_date_picker_textblock_style"; base: "font=Tizen:style=Light font_size=90 color=#000000ff align=center text_class=tizen"; @@ -1295,9 +1290,7 @@ group { name: "elm/entry/base-single/spinner/vertical_date_picker"; } group { name: "elm/entry/base-single/multibuttonentry"; - data.item: "default_font_size" "24"; - data.item: "min_font_size" "8"; - data.item: "max_font_size" "60"; + data.item: "default_font_size" ENTRY_FONT_SIZE_INC; styles { style { name: "multibuttonentry_single_textblock_style"; base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#000000ff wrap=none left_margin=1 right_margin=3 text_class=entry"; @@ -1422,9 +1415,7 @@ group { name: "elm/entry/base-single/multibuttonentry"; group { name: "elm/entry/base-single-noedit/default"; alias: "elm/entry/base-single-noedit/vcenter_align"; - data.item: "default_font_size" "24"; - data.item: "min_font_size" "8"; - data.item: "max_font_size" "60"; + data.item: "default_font_size" ENTRY_FONT_SIZE_INC; data { item: context_menu_orientation "horizontal"; } @@ -1526,9 +1517,7 @@ group { name: "elm/entry/base-single-noedit/default"; } group { name: "elm/entry/base-noedit/default"; - data.item: "default_font_size" "24"; - data.item: "min_font_size" "8"; - data.item: "max_font_size" "60"; + data.item: "default_font_size" ENTRY_FONT_SIZE_INC; data { item: context_menu_orientation "horizontal"; } @@ -1631,6 +1620,7 @@ group { name: "elm/entry/base-noedit/default"; group { name: "elm/entry/base-noedit/vcenter_align"; inherit: "elm/entry/base-noedit/default"; + data.item: "default_font_size" ENTRY_FONT_SIZE_INC; parts { part { name: "elm.guide"; type: TEXTBLOCK; @@ -1685,9 +1675,7 @@ group { name: "elm/entry/base-noedit/vcenter_align"; } group { name: "elm/entry/base-noedit-charwrap/default"; - data.item: "default_font_size" "24"; - data.item: "min_font_size" "8"; - data.item: "max_font_size" "60"; + data.item: "default_font_size" ENTRY_FONT_SIZE_INC; data { item: context_menu_orientation "horizontal"; } @@ -1790,6 +1778,7 @@ group { name: "elm/entry/base-noedit-charwrap/default"; group { name: "elm/entry/base-noedit-charwrap/vcenter_align"; inherit: "elm/entry/base-noedit-charwrap/default"; + data.item: "default_font_size" ENTRY_FONT_SIZE_INC; parts { part { name: "elm.guide"; type: TEXTBLOCK; @@ -1844,9 +1833,7 @@ group { name: "elm/entry/base-noedit-charwrap/vcenter_align"; } group { name: "elm/entry/base-noedit-mixedwrap/default"; - data.item: "default_font_size" "24"; - data.item: "min_font_size" "8"; - data.item: "max_font_size" "60"; + data.item: "default_font_size" ENTRY_FONT_SIZE_INC; data { item: context_menu_orientation "horizontal"; } @@ -1949,6 +1936,7 @@ group { name: "elm/entry/base-noedit-mixedwrap/default"; group { name: "elm/entry/base-noedit-mixedwrap/vcenter_align"; inherit: "elm/entry/base-noedit-mixedwrap/default"; + data.item: "default_font_size" ENTRY_FONT_SIZE_INC; parts { part { name: "elm.guide"; type: TEXTBLOCK; @@ -2003,9 +1991,7 @@ group { name: "elm/entry/base-noedit-mixedwrap/vcenter_align"; } group { name: "elm/entry/base-nowrap-noedit/default"; - data.item: "default_font_size" "24"; - data.item: "min_font_size" "8"; - data.item: "max_font_size" "60"; + data.item: "default_font_size" ENTRY_FONT_SIZE_INC; data { item: context_menu_orientation "horizontal"; } @@ -2107,6 +2093,7 @@ group { name: "elm/entry/base-nowrap-noedit/default"; group { name: "elm/entry/base-nowrap-noedit/vcenter_align"; inherit: "elm/entry/base-nowrap-noedit/default"; + data.item: "default_font_size" ENTRY_FONT_SIZE_INC; parts { part { name: "elm.guide"; type: TEXTBLOCK; @@ -2161,9 +2148,7 @@ group { name: "elm/entry/base-nowrap-noedit/vcenter_align"; group { name: "elm/entry/base-password/default"; alias: "elm/entry/base-password/vcenter_align"; - data.item: "default_font_size" "24"; - data.item: "min_font_size" "8"; - data.item: "max_font_size" "60"; + data.item: "default_font_size" ENTRY_FONT_SIZE_INC; data { item: context_menu_orientation "horizontal"; } |