summaryrefslogtreecommitdiff
path: root/unsorted/evas/evas-vg-simple.c
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-03-11 12:24:08 +0000
committerTom Hacohen <tom@stosb.com>2016-03-11 12:29:03 +0000
commitfdb1a24ea0bcbd946de713f7afb4a407c93266c7 (patch)
tree2cd502f301269731cd59c74f3676ec9e4c77cc89 /unsorted/evas/evas-vg-simple.c
parentd83c540ada93e8e5826b79e2295a68262274431b (diff)
Revert "Automatic migration to the new eo_add syntax."
This reverts commit 4f949a2757b6332306264d7f126b15ba7bfd37d4.
Diffstat (limited to 'unsorted/evas/evas-vg-simple.c')
-rw-r--r--unsorted/evas/evas-vg-simple.c34
1 files changed, 12 insertions, 22 deletions
diff --git a/unsorted/evas/evas-vg-simple.c b/unsorted/evas/evas-vg-simple.c
index 9d22907..2c0c702 100644
--- a/unsorted/evas/evas-vg-simple.c
+++ b/unsorted/evas/evas-vg-simple.c
@@ -449,19 +449,15 @@ vector_set(int x, int y, int w, int h)
449 root = evas_object_vg_root_node_get(d.vg); 449 root = evas_object_vg_root_node_get(d.vg);
450 //evas_vg_node_transformation_set(root, &matrix); 450 //evas_vg_node_transformation_set(root, &matrix);
451 451
452 Efl_VG *bg = NULL; 452 Efl_VG *bg = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "bg"));
453 eo_add(&bg, EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(bg, "bg"));
454 _rect_add(bg, 0, 0 , vg_w, vg_h); 453 _rect_add(bg, 0, 0 , vg_w, vg_h);
455 evas_vg_node_origin_set(bg, 0,0); 454 evas_vg_node_origin_set(bg, 0,0);
456 evas_vg_shape_stroke_width_set(bg, 1.0); 455 evas_vg_shape_stroke_width_set(bg, 1.0);
457 evas_vg_node_color_set(bg, 80, 80, 80, 80); 456 evas_vg_node_color_set(bg, 80, 80, 80, 80);
458 457
459 Efl_VG *shape = NULL; 458 Efl_VG *shape = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "shape"));
460 eo_add(&shape, EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(shape, "shape")); 459 Efl_VG *rgradient = eo_add(EFL_VG_GRADIENT_RADIAL_CLASS, NULL, efl_vg_name_set(eoid, "rgradient"));
461 Efl_VG *rgradient = NULL; 460 Efl_VG *lgradient = eo_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL, efl_vg_name_set(eoid, "lgradient"));
462 eo_add(&rgradient, EFL_VG_GRADIENT_RADIAL_CLASS, NULL, efl_vg_name_set(rgradient, "rgradient"));
463 Efl_VG *lgradient = NULL;
464 eo_add(&lgradient, EFL_VG_GRADIENT_LINEAR_CLASS, NULL, efl_vg_name_set(lgradient, "lgradient"));
465 461
466 _arcto(shape, 0, 0, 100, 100, 25, 330); 462 _arcto(shape, 0, 0, 100, 100, 25, 330);
467 463
@@ -502,8 +498,7 @@ vector_set(int x, int y, int w, int h)
502 evas_vg_node_color_set(shape, 0, 0, 255, 255); 498 evas_vg_node_color_set(shape, 0, 0, 255, 255);
503 evas_vg_shape_stroke_color_set(shape, 0, 0, 255, 128); 499 evas_vg_shape_stroke_color_set(shape, 0, 0, 255, 128);
504 500
505 Efl_VG *rect = NULL; 501 Efl_VG *rect = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "rect"));
506 eo_add(&rect, EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(rect, "rect"));
507 _rect_add(rect, 0, 0, 100, 100); 502 _rect_add(rect, 0, 0, 100, 100);
508 evas_vg_node_origin_set(rect, 100, 100); 503 evas_vg_node_origin_set(rect, 100, 100);
509 evas_vg_shape_fill_set(rect, lgradient); 504 evas_vg_shape_fill_set(rect, lgradient);
@@ -511,8 +506,7 @@ vector_set(int x, int y, int w, int h)
511 evas_vg_shape_stroke_join_set(rect, EFL_GFX_JOIN_ROUND); 506 evas_vg_shape_stroke_join_set(rect, EFL_GFX_JOIN_ROUND);
512 evas_vg_shape_stroke_color_set(rect, 255, 255, 255, 255); 507 evas_vg_shape_stroke_color_set(rect, 255, 255, 255, 255);
513 508
514 Efl_VG *rect1 = NULL; 509 Efl_VG *rect1 = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "rect1"));
515 eo_add(&rect1, EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(rect1, "rect1"));
516 _rect_add(rect1, 0, 0, 70, 70); 510 _rect_add(rect1, 0, 0, 70, 70);
517 evas_vg_node_origin_set(rect1, 50, 70); 511 evas_vg_node_origin_set(rect1, 50, 70);
518 evas_vg_shape_stroke_scale_set(rect1, 2); 512 evas_vg_shape_stroke_scale_set(rect1, 2);
@@ -520,8 +514,7 @@ vector_set(int x, int y, int w, int h)
520 evas_vg_shape_stroke_join_set(rect1, EFL_GFX_JOIN_ROUND); 514 evas_vg_shape_stroke_join_set(rect1, EFL_GFX_JOIN_ROUND);
521 evas_vg_shape_stroke_color_set(rect1, 0, 100, 80, 100); 515 evas_vg_shape_stroke_color_set(rect1, 0, 100, 80, 100);
522 516
523 Efl_VG *circle = NULL; 517 Efl_VG *circle = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "circle"));
524 eo_add(&circle, EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(circle, "circle"));
525 _arcto(circle, 0, 0, 250, 100, 30, 300); 518 _arcto(circle, 0, 0, 250, 100, 30, 300);
526 evas_vg_shape_fill_set(circle, lgradient); 519 evas_vg_shape_fill_set(circle, lgradient);
527 //evas_vg_node_transformation_set(&matrix), 520 //evas_vg_node_transformation_set(&matrix),
@@ -529,30 +522,27 @@ vector_set(int x, int y, int w, int h)
529 evas_vg_node_color_set(circle, 50, 0, 0, 50); 522 evas_vg_node_color_set(circle, 50, 0, 0, 50);
530 523
531 // Foreground 524 // Foreground
532 Efl_VG *fg = NULL; 525 Efl_VG *fg = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "fg"));
533 eo_add(&fg, EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(fg, "fg"));
534 _rect_add(fg, 0, 0, vg_w, vg_h); 526 _rect_add(fg, 0, 0, vg_w, vg_h);
535 evas_vg_node_origin_set(fg, 0, 0); 527 evas_vg_node_origin_set(fg, 0, 0);
536 evas_vg_shape_stroke_width_set(fg, 5.0); 528 evas_vg_shape_stroke_width_set(fg, 5.0);
537 evas_vg_shape_stroke_join_set(fg, EFL_GFX_JOIN_ROUND); 529 evas_vg_shape_stroke_join_set(fg, EFL_GFX_JOIN_ROUND);
538 evas_vg_shape_stroke_color_set(fg, 70, 70, 0, 70); 530 evas_vg_shape_stroke_color_set(fg, 70, 70, 0, 70);
539 531
540 Efl_VG *tst = NULL; 532 Efl_VG *tst = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "tst"));
541 eo_add(&tst, EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(tst, "tst"));
542 evas_vg_shape_shape_append_rect(tst, 50, 25, 200, 200, 3, 5); 533 evas_vg_shape_shape_append_rect(tst, 50, 25, 200, 200, 3, 5);
543 evas_vg_node_color_set(tst, 0, 0, 200, 200); 534 evas_vg_node_color_set(tst, 0, 0, 200, 200);
544 evas_vg_shape_stroke_width_set(tst, 2); 535 evas_vg_shape_stroke_width_set(tst, 2);
545 evas_vg_shape_stroke_color_set(tst, 255, 0, 0, 255); 536 evas_vg_shape_stroke_color_set(tst, 255, 0, 0, 255);
546 537
547 Efl_VG *vc = NULL; 538 Efl_VG *vc = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "vc"));
548 eo_add(&vc, EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(vc, "vc"));
549 evas_vg_shape_shape_append_circle(vc, 100, 100, 23); 539 evas_vg_shape_shape_append_circle(vc, 100, 100, 23);
550 evas_vg_node_color_set(vc, 0, 200, 0, 255); 540 evas_vg_node_color_set(vc, 0, 200, 0, 255);
551 evas_vg_shape_stroke_width_set(vc, 4); 541 evas_vg_shape_stroke_width_set(vc, 4);
552 evas_vg_shape_stroke_color_set(vc, 255, 0, 0, 255); 542 evas_vg_shape_stroke_color_set(vc, 255, 0, 0, 255);
553 543
554 eo_add(&beginning, EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(beginning, root)); 544 beginning = eo_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(eoid, root));
555 eo_add(&end, EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(end, root)); 545 end = eo_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(eoid, root));
556 546
557 circle = efl_vg_container_child_get(end, "circle"); 547 circle = efl_vg_container_child_get(end, "circle");
558 efl_vg_transformation_set(circle, &matrix); 548 efl_vg_transformation_set(circle, &matrix);