summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoungbok Shin <youngb.shin@samsung.com>2016-01-04 14:37:25 -0800
committerCedric BAIL <cedric@osg.samsung.com>2016-01-04 14:37:59 -0800
commit999b8b311484fd6d79493da7d13b0381b0223890 (patch)
treec1c601f323b276e7eeda4ef1bb7d2e47d6f60d36
parent66a3262f34aa4dbc4945c7b88e5392db9167a698 (diff)
entry: add new text classes and color classes for Entry widget
Summary: Add new text classes and color classes for Entry widget according to consistency with other widget's class. And it removes legacy classes. If we need to support backward compatibility, the legacy classes have to be maintained in each widget. Test Plan: N/A Reviewers: cedric, woohyun, jaehwan, kimcinoo, raster Subscribers: CHAN Differential Revision: https://phab.enlightenment.org/D3486 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
-rw-r--r--data/themes/colorclasses.edc13
-rw-r--r--data/themes/edc/elm/entry.edc34
-rw-r--r--src/lib/elm_config.c11
3 files changed, 38 insertions, 20 deletions
diff --git a/data/themes/colorclasses.edc b/data/themes/colorclasses.edc
index 5f92a14cb..d62534475 100644
--- a/data/themes/colorclasses.edc
+++ b/data/themes/colorclasses.edc
@@ -179,13 +179,22 @@ color_classes {
179 desc: "Text in a disabled datetime separator area"; 179 desc: "Text in a disabled datetime separator area";
180 } 180 }
181 color_class { name: "entry_text"; 181 color_class { name: "entry_text";
182 color: FN_COL_DEFAULT_BASIC; 182 color: FN_COL_DEFAULT;
183 desc: "Text in an entry box"; 183 desc: "Text in an entry box";
184 } 184 }
185 color_class { name: "entry_text_disabled"; 185 color_class { name: "entry_text_disabled";
186 color: FN_COL_DEFAULT_BASIC; 186 color: FN_COL_DISABLE;
187 desc: "Text in a disabled entry box"; 187 desc: "Text in a disabled entry box";
188 } 188 }
189 color_class { name: "entry_guide_text";
190 color: 0 0 0 255;
191 color3: 255 255 255 25;
192 desc: "Guide Text in a entry box";
193 }
194 color_class { name: "entry_scrollframe_base";
195 color: DARK_GREY_BG_COLOR;
196 desc: "Base of a entry's scroller widget";
197 }
189 color_class { name: "label_text"; 198 color_class { name: "label_text";
190 color: FN_COL_DEFAULT; 199 color: FN_COL_DEFAULT;
191 desc: "Text of a generic label"; 200 desc: "Text of a generic label";
diff --git a/data/themes/edc/elm/entry.edc b/data/themes/edc/elm/entry.edc
index 390a9552e..7214080f2 100644
--- a/data/themes/edc/elm/entry.edc
+++ b/data/themes/edc/elm/entry.edc
@@ -214,8 +214,7 @@ group { name: "elm/scroller/entry_single/default";
214 description { state: "default" 0.0; 214 description { state: "default" 0.0;
215 rel1.to: "elm.swallow.background"; 215 rel1.to: "elm.swallow.background";
216 rel2.to: "elm.swallow.background"; 216 rel2.to: "elm.swallow.background";
217 color: DARK_GREY_BG_COLOR; 217 color_class: "entry_scrollframe_base";
218 color_class: "scrollframe_base";
219 } 218 }
220 } 219 }
221 part { name: "clipper"; type: RECT; 220 part { name: "clipper"; type: RECT;
@@ -395,6 +394,7 @@ group { name: "elm/entry/cursor/default";
395 image.border: 4 4 4 4; 394 image.border: 4 4 4 4;
396 fill.smooth: 0; 395 fill.smooth: 0;
397 color: 255 255 255 0; 396 color: 255 255 255 0;
397 color_class: "entry_cursor";
398 min: 9 10; 398 min: 9 10;
399 } 399 }
400 description { state: "visible" 0.0; 400 description { state: "visible" 0.0;
@@ -530,23 +530,23 @@ group { name: "elm/entry/base/default";
530 530
531 styles { 531 styles {
532 style { name: "entry_style"; 532 style { name: "entry_style";
533 base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=word text_class=entry color_class=entry left_margin=2 right_margin=2"; 533 base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=word text_class=entry_text color_class=entry_text left_margin=2 right_margin=2";
534 ENABLED_TEXTBLOCK_TAGS 534 ENABLED_TEXTBLOCK_TAGS
535 } 535 }
536 style { name: "entry_nowrap_style"; 536 style { name: "entry_nowrap_style";
537 base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 text_class=entry color_class=entry left_margin=2 right_margin=2"; 537 base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 text_class=entry_text color_class=entry_text left_margin=2 right_margin=2";
538 ENABLED_TEXTBLOCK_TAGS 538 ENABLED_TEXTBLOCK_TAGS
539 } 539 }
540 style { name: "entry_disabled_style"; 540 style { name: "entry_disabled_style";
541 base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=word text_class=entry color_class=entry_disabled left_margin=2 right_margin=2"; 541 base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=word text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2";
542 DISABLED_TEXTBLOCK_TAGS 542 DISABLED_TEXTBLOCK_TAGS
543 } 543 }
544 style { name: "entry_nowrap_disabled_style"; 544 style { name: "entry_nowrap_disabled_style";
545 base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 text_class=entry color_class=entry_disabled left_margin=2 right_margin=2"; 545 base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2";
546 DISABLED_TEXTBLOCK_TAGS 546 DISABLED_TEXTBLOCK_TAGS
547 } 547 }
548 style { name: "entry_guide_style"; 548 style { name: "entry_guide_style";
549 base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=word text_class=entry color_class=entry_guide left_margin=2 right_margin=2 ellipsis=0.0"; 549 base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=word text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0";
550 DISABLED_TEXTBLOCK_TAGS 550 DISABLED_TEXTBLOCK_TAGS
551 } 551 }
552 } 552 }
@@ -654,15 +654,15 @@ group { name: "elm/entry/base-mixedwrap/default";
654 inherit: "elm/entry/base/default"; 654 inherit: "elm/entry/base/default";
655 styles { 655 styles {
656 style { name: "entry_style_mixedwrap"; 656 style { name: "entry_style_mixedwrap";
657 base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=mixed text_class=entry color_class=entry left_margin=2 right_margin=2"; 657 base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=mixed text_class=entry_text color_class=entry_text left_margin=2 right_margin=2";
658 ENABLED_TEXTBLOCK_TAGS 658 ENABLED_TEXTBLOCK_TAGS
659 } 659 }
660 style { name: "entry_disabled_style_mixedwrap"; 660 style { name: "entry_disabled_style_mixedwrap";
661 base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=mixed text_class=entry color_class=entry_disabled left_margin=2 right_margin=2"; 661 base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=mixed text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2";
662 DISABLED_TEXTBLOCK_TAGS 662 DISABLED_TEXTBLOCK_TAGS
663 } 663 }
664 style { name: "entry_guide_style_mixedwrap"; 664 style { name: "entry_guide_style_mixedwrap";
665 base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=mixed text_class=entry color_class=entry_guide left_margin=2 right_margin=2 ellipsis=0.0"; 665 base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=mixed text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0";
666 DISABLED_TEXTBLOCK_TAGS 666 DISABLED_TEXTBLOCK_TAGS
667 } 667 }
668 } 668 }
@@ -704,15 +704,15 @@ group { name: "elm/entry/base-charwrap/default";
704 inherit: "elm/entry/base/default"; 704 inherit: "elm/entry/base/default";
705 styles { 705 styles {
706 style { name: "entry_style_charwrap"; 706 style { name: "entry_style_charwrap";
707 base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=char text_class=entry color_class=entry left_margin=2 right_margin=2"; 707 base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=char text_class=entry_text color_class=entry_text left_margin=2 right_margin=2";
708 ENABLED_TEXTBLOCK_TAGS 708 ENABLED_TEXTBLOCK_TAGS
709 } 709 }
710 style { name: "entry_disabled_style_charwrap"; 710 style { name: "entry_disabled_style_charwrap";
711 base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=char text_class=entry color_class=entry_disabled left_margin=2 right_margin=2"; 711 base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=char text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2";
712 DISABLED_TEXTBLOCK_TAGS 712 DISABLED_TEXTBLOCK_TAGS
713 } 713 }
714 style { name: "entry_guide_style_charwrap"; 714 style { name: "entry_guide_style_charwrap";
715 base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=char text_class=entry color_class=entry_guide left_margin=2 right_margin=2 ellipsis=0.0"; 715 base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=char text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0";
716 DISABLED_TEXTBLOCK_TAGS 716 DISABLED_TEXTBLOCK_TAGS
717 } 717 }
718 } 718 }
@@ -790,15 +790,15 @@ group { name: "elm/entry/base-single/default";
790 inherit: "elm/entry/base/default"; 790 inherit: "elm/entry/base/default";
791 styles { 791 styles {
792 style { name: "entry_single_style"; 792 style { name: "entry_single_style";
793 base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=none text_class=entry color_class=entry left_margin=2 right_margin=2"; 793 base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=none text_class=entry_text color_class=entry_text left_margin=2 right_margin=2";
794 ENABLED_TEXTBLOCK_TAGS 794 ENABLED_TEXTBLOCK_TAGS
795 } 795 }
796 style { name: "entry_single_disabled_style"; 796 style { name: "entry_single_disabled_style";
797 base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=none text_class=entry color_class=entry_disabled left_margin=2 right_margin=2"; 797 base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=none text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2";
798 DISABLED_TEXTBLOCK_TAGS 798 DISABLED_TEXTBLOCK_TAGS
799 } 799 }
800 style { name: "entry_single_guide_style"; 800 style { name: "entry_single_guide_style";
801 base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=none text_class=entry color_class=entry_guide left_margin=2 right_margin=2 ellipsis=0.0"; 801 base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=none text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0";
802 DISABLED_TEXTBLOCK_TAGS 802 DISABLED_TEXTBLOCK_TAGS
803 } 803 }
804 } 804 }
@@ -1077,6 +1077,7 @@ group { name: "elm/entry/handler/start/default";
1077 min: 21 27; // 42 54 1077 min: 21 27; // 42 54
1078 image.normal: "handle_pick_up_left.png"; 1078 image.normal: "handle_pick_up_left.png";
1079 align: (29/42) (11/54); 1079 align: (29/42) (11/54);
1080 color_class: "entry_selection_handler";
1080 visible: 0; 1081 visible: 0;
1081 } 1082 }
1082 description { state: "visible" 0.0; 1083 description { state: "visible" 0.0;
@@ -1124,6 +1125,7 @@ group { name: "elm/entry/handler/end/default";
1124 min: 21 27; // 42 54 1125 min: 21 27; // 42 54
1125 image.normal: "handle_pick_up_right.png"; 1126 image.normal: "handle_pick_up_right.png";
1126 align: (12/42) (11/54); 1127 align: (12/42) (11/54);
1128 color_class: "entry_selection_handler";
1127 visible: 0; 1129 visible: 0;
1128 } 1130 }
1129 description { state: "visible" 0.0; 1131 description { state: "visible" 0.0;
diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index 2618277d3..9e01f44fc 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -67,7 +67,9 @@ static const Elm_Text_Class _elm_text_classes[] = {
67 {"datetime_separator_text", "Datetime Separator Text"}, 67 {"datetime_separator_text", "Datetime Separator Text"},
68 {"datetime_separator_text_disabled", "Datetime Separator Disabled Text"}, 68 {"datetime_separator_text_disabled", "Datetime Separator Disabled Text"},
69 {"label", "Label"}, 69 {"label", "Label"},
70 {"entry", "Entry"}, 70 {"entry_text", "Entry Text"},
71 {"entry_text_disabled", "Entry Disabled Text"},
72 {"entry_guide_text", "Entry Guide Text"},
71 {"title_bar", "Title Bar"}, 73 {"title_bar", "Title Bar"},
72 {"list_item", "List Items"}, 74 {"list_item", "List Items"},
73 {"grid_item", "Grid Items"}, 75 {"grid_item", "Grid Items"},
@@ -100,7 +102,12 @@ static const Elm_Color_Class _elm_color_classes[] = {
100 {"hoversel_text_disabled", "Hoversel Item Disabled Text"}, 102 {"hoversel_text_disabled", "Hoversel Item Disabled Text"},
101 {"radio_text", "Radio Text"}, 103 {"radio_text", "Radio Text"},
102 {"frame", "Frame Text"}, 104 {"frame", "Frame Text"},
103 {"entry", "Entry Text"}, 105 {"entry_text", "Entry Text"},
106 {"entry_text_disabled", "Entry Disabled Text"},
107 {"entry_guide_text", "Entry Guide Text"},
108 {"entry_cursor", "Entry Cursor"},
109 {"entry_selection_handler", "Entry Selection Handler"},
110 {"entry_scrollframe_base", "Entry Scrollframe Base"},
104 {"check_text", "Check Text"}, 111 {"check_text", "Check Text"},
105 {"check_on_text", "Check On Text"}, 112 {"check_on_text", "Check On Text"},
106 {"check_off_text", "Check Off Text"}, 113 {"check_off_text", "Check Off Text"},