summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Zaoui <daniel.zaoui@samsung.com>2016-03-03 10:25:22 +0200
committerDaniel Zaoui <daniel.zaoui@samsung.com>2016-03-03 10:54:16 +0200
commit36669f1eccc3b6c320fb4c4ecc0e029b95834f57 (patch)
tree7c939c66a71c4a1613026006aeef17f8c76347b7
parentb9c912f7213dc4026e41d3f99e2f4a5fc78269db (diff)
Scaling test: reorder instructions to set the correct scale
If the scale is set on an object before contents are set, it will not pass to them. Because of this, in the test, scale of the first label remains 1.0, i.e the window scale, instead of 0.5. The patch modifies the order of the instructions by setting the scale after setting the label as content of the frame.
-rw-r--r--src/bin/test_scaling.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bin/test_scaling.c b/src/bin/test_scaling.c
index d0d0f3c0f..84b20c613 100644
--- a/src/bin/test_scaling.c
+++ b/src/bin/test_scaling.c
@@ -76,7 +76,6 @@ test_scaling2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
76 evas_object_show(bx); 76 evas_object_show(bx);
77 77
78 fr = elm_frame_add(win); 78 fr = elm_frame_add(win);
79 elm_object_scale_set(fr, 0.5);
80 elm_object_text_set(fr, "Scale: 0.5"); 79 elm_object_text_set(fr, "Scale: 0.5");
81 lb = elm_label_add(win); 80 lb = elm_label_add(win);
82 elm_object_text_set(lb, 81 elm_object_text_set(lb,
@@ -84,6 +83,7 @@ test_scaling2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
84 "is 0.5. Child should<br/>" 83 "is 0.5. Child should<br/>"
85 "inherit it."); 84 "inherit it.");
86 elm_object_content_set(fr, lb); 85 elm_object_content_set(fr, lb);
86 elm_object_scale_set(fr, 0.5);
87 evas_object_show(lb); 87 evas_object_show(lb);
88 elm_box_pack_end(bx, fr); 88 elm_box_pack_end(bx, fr);
89 evas_object_show(fr); 89 evas_object_show(fr);