summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwoochan lee <wc0917.lee@samsung.com>2016-01-04 14:39:08 -0800
committerCedric BAIL <cedric@osg.samsung.com>2016-01-04 14:40:07 -0800
commit128481c6cc4fa6392f96a0b57feb9673cf1abf3b (patch)
tree22c92c113d8ce378d0ff6054e04299ac5af49939
parent999b8b311484fd6d79493da7d13b0381b0223890 (diff)
index: add color classes and text classes.
Summary: The following new color classes and text classes for index widget are added. "index_bg", "Index Background" "index_item_bg", "Index Item Background" "index_highlight_text," "Index Highlight Text" "index_item_text," "Index Items Text" "index_item_text_selected," "Index Selected Items Text" @feature Reviewers: raster, cedric, Hermet, kimcinoo, woohyun Subscribers: SanghyeonLee, eagleeye, id213sin Differential Revision: https://phab.enlightenment.org/D3487 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
-rw-r--r--data/themes/colorclasses.edc20
-rw-r--r--data/themes/edc/elm/index.edc36
-rw-r--r--src/lib/elm_config.c9
3 files changed, 60 insertions, 5 deletions
diff --git a/data/themes/colorclasses.edc b/data/themes/colorclasses.edc
index d62534475..093f26fad 100644
--- a/data/themes/colorclasses.edc
+++ b/data/themes/colorclasses.edc
@@ -195,6 +195,26 @@ color_classes {
195 color: DARK_GREY_BG_COLOR; 195 color: DARK_GREY_BG_COLOR;
196 desc: "Base of a entry's scroller widget"; 196 desc: "Base of a entry's scroller widget";
197 } 197 }
198 color_class { name: "index_bg";
199 color: 0 0 0 0;
200 desc: "Background of a index widget";
201 }
202 color_class { name: "index_highlight_text";
203 color: FN_COL_HIGHLIGHT;
204 desc: "Text of a hlghlight item text";
205 }
206 color_class { name: "index_item_bg";
207 color: 0 0 0 0;
208 desc: "Background of a index item object";
209 }
210 color_class { name: "index_item_text";
211 color: FN_COL_DEFAULT;
212 desc: "Text of a index item";
213 }
214 color_class { name: "index_item_text_selected";
215 color: FN_COL_HIGHLIGHT;
216 desc: "Text of a selected index item";
217 }
198 color_class { name: "label_text"; 218 color_class { name: "label_text";
199 color: FN_COL_DEFAULT; 219 color: FN_COL_DEFAULT;
200 desc: "Text of a generic label"; 220 desc: "Text of a generic label";
diff --git a/data/themes/edc/elm/index.edc b/data/themes/edc/elm/index.edc
index 0f88ef6a6..ce592946c 100644
--- a/data/themes/edc/elm/index.edc
+++ b/data/themes/edc/elm/index.edc
@@ -1,5 +1,12 @@
1group { name: "elm/index/base/vertical/default"; 1group { name: "elm/index/base/vertical/default";
2 parts { 2 parts {
3 part { name: "bg"; type: RECT;
4 description { state: "default" 0.0;
5 rel1.to: "elm.swallow.index.0";
6 rel2.to: "elm.swallow.index.0";
7 color_class: "index_bg";
8 }
9 }
3 part { name: "clip"; type: RECT; mouse_events: 0; 10 part { name: "clip"; type: RECT; mouse_events: 0;
4 description { state: "default" 0.0; 11 description { state: "default" 0.0;
5 visible: 0; 12 visible: 0;
@@ -55,13 +62,14 @@ group { name: "elm/index/base/vertical/default";
55 relative: 0.0 0.5; 62 relative: 0.0 0.5;
56 offset: -16 -1; 63 offset: -16 -1;
57 } 64 }
58 color: FN_COL_HIGHLIGHT; 65 color_class: "index_highlight_text";
59 text { 66 text {
60 font: FN; 67 font: FN;
61 size: 20; 68 size: 20;
62 min: 1 1; 69 min: 1 1;
63 ellipsis: -1; 70 ellipsis: -1;
64 align: 1.0 0.5; 71 align: 1.0 0.5;
72 text_class: "index_highlight_text";
65 } 73 }
66 } 74 }
67 } 75 }
@@ -143,6 +151,13 @@ group { name: "elm/index/item/vertical/default";
143 image: "darken_rounded_square_half.png" COMP; 151 image: "darken_rounded_square_half.png" COMP;
144 } 152 }
145 parts { 153 parts {
154 part { name: "bg"; type: RECT;
155 description { state: "default" 0.0;
156 rel1.to: "base";
157 rel2.to: "base";
158 color_class: "index_item_bg";
159 }
160 }
146 part { name: "base"; mouse_events: 0; 161 part { name: "base"; mouse_events: 0;
147 description { state: "default" 0.0; 162 description { state: "default" 0.0;
148 image { 163 image {
@@ -171,13 +186,14 @@ group { name: "elm/index/item/vertical/default";
171 relative: 0.5 1.0; 186 relative: 0.5 1.0;
172 offset: -1 -1; 187 offset: -1 -1;
173 } 188 }
174 color: FN_COL_DEFAULT; 189 color_class: "index_item_text";
175 text { 190 text {
176 font: FN; 191 font: FN;
177 size: 10; 192 size: 10;
178 min: 1 1; 193 min: 1 1;
179 ellipsis: -1; 194 ellipsis: -1;
180 align: 0.5 0.5; 195 align: 0.5 0.5;
196 text_class: "index_item_text";
181 } 197 }
182 } 198 }
183 description { state: "active" 0.0; 199 description { state: "active" 0.0;
@@ -201,13 +217,14 @@ group { name: "elm/index/item/vertical/default";
201 relative: 0.5 1.0; 217 relative: 0.5 1.0;
202 offset: -1 -1; 218 offset: -1 -1;
203 } 219 }
204 color: FN_COL_HIGHLIGHT; 220 color_class: "index_item_text_selected";
205 text { 221 text {
206 font: FN; 222 font: FN;
207 size: 10; 223 size: 10;
208 min: 0 0; 224 min: 0 0;
209 align: 0.5 0.5; 225 align: 0.5 0.5;
210 text_source: "elm.text"; 226 text_source: "elm.text";
227 text_class: "index_item_text_selected";
211 } 228 }
212 } 229 }
213 description { state: "active" 0.0; 230 description { state: "active" 0.0;
@@ -248,6 +265,13 @@ group { name: "elm/index/item_odd/vertical/default";
248 data.item: "stacking" "above"; 265 data.item: "stacking" "above";
249 data.item: "selectraise" "on"; 266 data.item: "selectraise" "on";
250 parts { 267 parts {
268 part { name: "bg"; type: RECT;
269 description { state: "default" 0.0;
270 rel1.to: "base";
271 rel2.to: "base";
272 color_class: "index_item_bg";
273 }
274 }
251 part { name: "base"; mouse_events: 0; 275 part { name: "base"; mouse_events: 0;
252 description { state: "default" 0.0; 276 description { state: "default" 0.0;
253 image { 277 image {
@@ -276,13 +300,14 @@ group { name: "elm/index/item_odd/vertical/default";
276 relative: 0.5 1.0; 300 relative: 0.5 1.0;
277 offset: -1 -1; 301 offset: -1 -1;
278 } 302 }
279 color: FN_COL_DEFAULT; 303 color_class: "index_item_text";
280 text { 304 text {
281 font: FN; 305 font: FN;
282 size: 10; 306 size: 10;
283 min: 1 1; 307 min: 1 1;
284 ellipsis: -1; 308 ellipsis: -1;
285 align: 0.5 0.5; 309 align: 0.5 0.5;
310 text_class: "index_item_text";
286 } 311 }
287 } 312 }
288 description { state: "active" 0.0; 313 description { state: "active" 0.0;
@@ -306,13 +331,14 @@ group { name: "elm/index/item_odd/vertical/default";
306 relative: 0.5 1.0; 331 relative: 0.5 1.0;
307 offset: -1 -1; 332 offset: -1 -1;
308 } 333 }
309 color: FN_COL_HIGHLIGHT; 334 color_class: "index_item_text_selected";
310 text { 335 text {
311 font: FN; 336 font: FN;
312 size: 10; 337 size: 10;
313 min: 0 0; 338 min: 0 0;
314 align: 0.5 0.5; 339 align: 0.5 0.5;
315 text_source: "elm.text"; 340 text_source: "elm.text";
341 text_class: "index_item_text_selected";
316 } 342 }
317 } 343 }
318 description { state: "active" 0.0; 344 description { state: "active" 0.0;
diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index 9e01f44fc..0f0b12c95 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -70,6 +70,10 @@ static const Elm_Text_Class _elm_text_classes[] = {
70 {"entry_text", "Entry Text"}, 70 {"entry_text", "Entry Text"},
71 {"entry_text_disabled", "Entry Disabled Text"}, 71 {"entry_text_disabled", "Entry Disabled Text"},
72 {"entry_guide_text", "Entry Guide Text"}, 72 {"entry_guide_text", "Entry Guide Text"},
73 {"entry", "Entry"},
74 {"index_highlight_text," "Index Highlight Text"},
75 {"index_item_text," "Index Items Text"},
76 {"index_item_text_selected," "Index Selected Items Text"},
73 {"title_bar", "Title Bar"}, 77 {"title_bar", "Title Bar"},
74 {"list_item", "List Items"}, 78 {"list_item", "List Items"},
75 {"grid_item", "Grid Items"}, 79 {"grid_item", "Grid Items"},
@@ -118,6 +122,11 @@ static const Elm_Color_Class _elm_color_classes[] = {
118 {"grid_item", "Grid Item Text"}, 122 {"grid_item", "Grid Item Text"},
119 {"grid_item_disabled", "Grid Item Disabled Text"}, 123 {"grid_item_disabled", "Grid Item Disabled Text"},
120 {"grid_item_selected", "Grid Item Selected Text"}, 124 {"grid_item_selected", "Grid Item Selected Text"},
125 {"index_bg", "Index Background"},
126 {"index_item_bg", "Index Item Background"},
127 {"index_highlight_text," "Index Highlight Text"},
128 {"index_item_text," "Index Items Text"},
129 {"index_item_text_selected," "Index Selected Items Text"},
121 {"toolbar_item", "Toolbar Item Text"}, 130 {"toolbar_item", "Toolbar Item Text"},
122 {"toolbar_item_disabled", "Toolbar Item Disabled Text"}, 131 {"toolbar_item_disabled", "Toolbar Item Disabled Text"},
123 {"toolbar_item_selected", "Toolbar Item Selected Text"}, 132 {"toolbar_item_selected", "Toolbar Item Selected Text"},