summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2014-02-07 13:18:38 +0000
committerTom Hacohen <tom@stosb.com>2014-02-07 13:18:38 +0000
commit13664f3af1d12a516bb64cd5f4ad583547fe198d (patch)
treefd868f5d3a37d3070dc5eb05d55cf37ab9953bfa /src
parent354691e03e7810d64ec447a4ebdab1c1c602ef1b (diff)
Evas textblock: Fixed test shadow warnings.
Diffstat (limited to 'src')
-rw-r--r--src/tests/evas/evas_test_textblock.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/tests/evas/evas_test_textblock.c b/src/tests/evas/evas_test_textblock.c
index ac8e5cf0b4..0af25cb174 100644
--- a/src/tests/evas/evas_test_textblock.c
+++ b/src/tests/evas/evas_test_textblock.c
@@ -2599,33 +2599,33 @@ START_TEST(evas_textblock_style)
2599 2599
2600 /* Multi-line padding */ 2600 /* Multi-line padding */
2601 { 2601 {
2602 Evas_Coord x[5] = {0}, y[5] = {0}, w[5] = {0}, h[5] = {0}; 2602 Evas_Coord x[5] = {0}, y[5] = {0}, w2[5] = {0}, h2[5] = {0};
2603 2603
2604 // w, h should not change between test 1 and 2 2604 // w2, h2 should not change between test 1 and 2
2605 // insets and x, y should increase by 2 2605 // insets and x, y should increase by 2
2606 // line 1 in test 2 should have same geometry as in test 1 (despite style) 2606 // line 1 in test 2 should have same geometry as in test 1 (despite style)
2607 2607
2608 evas_object_textblock_text_markup_set(tb, "Test<br/>Test"); 2608 evas_object_textblock_text_markup_set(tb, "Test<br/>Test");
2609 evas_object_textblock_line_number_geometry_get(tb, 0, &x[0], &y[0], &w[0], &h[0]); 2609 evas_object_textblock_line_number_geometry_get(tb, 0, &x[0], &y[0], &w2[0], &h2[0]);
2610 evas_object_textblock_line_number_geometry_get(tb, 1, &x[1], &y[1], &w[1], &h[1]); 2610 evas_object_textblock_line_number_geometry_get(tb, 1, &x[1], &y[1], &w2[1], &h2[1]);
2611 2611
2612 // check line 1 geometry relatively to line 0 2612 // check line 1 geometry relatively to line 0
2613 fail_if((x[0] != x[1]) || ((y[0] + h[0]) != y[1]) || (w[0] != w[1]) || (h[0] != h[1])); 2613 fail_if((x[0] != x[1]) || ((y[0] + h2[0]) != y[1]) || (w2[0] != w2[1]) || (h2[0] != h2[1]));
2614 2614
2615 evas_object_textblock_text_markup_set(tb, "Test<br/><style=glow>Test</><br/>Test"); 2615 evas_object_textblock_text_markup_set(tb, "Test<br/><style=glow>Test</><br/>Test");
2616 evas_object_textblock_style_insets_get(tb, &l, &r, &t, &b); 2616 evas_object_textblock_style_insets_get(tb, &l, &r, &t, &b);
2617 evas_object_textblock_line_number_geometry_get(tb, 0, &x[2], &y[2], &w[2], &h[2]); 2617 evas_object_textblock_line_number_geometry_get(tb, 0, &x[2], &y[2], &w2[2], &h2[2]);
2618 evas_object_textblock_line_number_geometry_get(tb, 1, &x[3], &y[3], &w[3], &h[3]); 2618 evas_object_textblock_line_number_geometry_get(tb, 1, &x[3], &y[3], &w2[3], &h2[3]);
2619 evas_object_textblock_line_number_geometry_get(tb, 2, &x[4], &y[4], &w[4], &h[4]); 2619 evas_object_textblock_line_number_geometry_get(tb, 2, &x[4], &y[4], &w2[4], &h2[4]);
2620 2620
2621 // check line 1 geometry relatively to line 0 2621 // check line 1 geometry relatively to line 0
2622 fail_if((x[2] != x[3]) || ((y[2] + h[2]) != y[3]) || (w[2] != w[3]) || (h[2] != h[3])); 2622 fail_if((x[2] != x[3]) || ((y[2] + h2[2]) != y[3]) || (w2[2] != w2[3]) || (h2[2] != h2[3]));
2623 2623
2624 // check padding is correct 2624 // check padding is correct
2625 fail_if((x[2] != (x[0] + l)) || (y[2] != (y[0] + t))); 2625 fail_if((x[2] != (x[0] + l)) || (y[2] != (y[0] + t)));
2626 2626
2627 // line 2 should not suffer from padding in line 1, as it is globally applied 2627 // line 2 should not suffer from padding in line 1, as it is globally applied
2628 fail_if((x[4] != x[2]) || ((y[2] + h[2] + h[3]) != y[4])); 2628 fail_if((x[4] != x[2]) || ((y[2] + h2[2] + h2[3]) != y[4]));
2629 } 2629 }
2630 2630
2631 /* No font */ 2631 /* No font */