summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2015-03-07 13:38:57 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2015-03-07 13:44:52 -0500
commit1cf630f2bdedfd6b50c88ee1024b9bb03c0d1c39 (patch)
tree4fd0cbfd167c7142d2d65b4ea5d49a713d4b8674 /src/bin
parent54fa8c7e423022fb461ff7e2a49855b77176e1ed (diff)
edje color classes can now have text descriptions
@feature
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/edje/edje_cc_handlers.c26
1 files changed, 25 insertions, 1 deletions
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 6d96fd27fe..303bd4523f 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -205,6 +205,7 @@ static void st_color_class_name(void);
205static void st_color_class_color(void); 205static void st_color_class_color(void);
206static void st_color_class_color2(void); 206static void st_color_class_color2(void);
207static void st_color_class_color3(void); 207static void st_color_class_color3(void);
208static void st_color_class_desc(void);
208 209
209static void ob_collections(void); 210static void ob_collections(void);
210static void st_collections_base_scale(void); 211static void st_collections_base_scale(void);
@@ -498,7 +499,8 @@ static void st_collections_group_nobroadcast(void);
498 {PREFIX"color_classes.color_class.name", st_color_class_name}, /* dup */ \ 499 {PREFIX"color_classes.color_class.name", st_color_class_name}, /* dup */ \
499 {PREFIX"color_classes.color_class.color", st_color_class_color}, /* dup */ \ 500 {PREFIX"color_classes.color_class.color", st_color_class_color}, /* dup */ \
500 {PREFIX"color_classes.color_class.color2", st_color_class_color2}, /* dup */ \ 501 {PREFIX"color_classes.color_class.color2", st_color_class_color2}, /* dup */ \
501 {PREFIX"color_classes.color_class.color3", st_color_class_color3}, /* dup */ 502 {PREFIX"color_classes.color_class.color3", st_color_class_color3}, /* dup */ \
503 {PREFIX"color_classes.color_class.description", st_color_class_desc}, /* dup */
502 504
503#define PROGRAM_SEQUENCE(PREFIX, NAME, FN) \ 505#define PROGRAM_SEQUENCE(PREFIX, NAME, FN) \
504 {PREFIX".program."NAME, FN}, /* dup */ \ 506 {PREFIX".program."NAME, FN}, /* dup */ \
@@ -2460,6 +2462,28 @@ st_color_class_color3(void)
2460 cc->a3 = parse_int_range(3, 0, 255); 2462 cc->a3 = parse_int_range(3, 0, 255);
2461} 2463}
2462 2464
2465/**
2466 @page edcref
2467 @property
2468 description
2469 @parameters
2470 [color class description]
2471 @effect
2472 Provides a descriptive name for the effect of the color class
2473 @since 1.14
2474 @endproperty
2475*/
2476static void
2477st_color_class_desc(void)
2478{
2479 Edje_Color_Class *cc;
2480
2481 check_arg_count(1);
2482
2483 cc = eina_list_data_get(eina_list_last(edje_file->color_classes));
2484 cc->desc = parse_str(0);
2485}
2486
2463/** @edcsubsection{toplevel_styles, 2487/** @edcsubsection{toplevel_styles,
2464 * Styles} */ 2488 * Styles} */
2465 2489