summaryrefslogtreecommitdiff
path: root/src/bin/elementary/test_gfx_filters.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-11-29 17:59:34 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-11-30 10:48:24 +0900
commit8803040484721c15e5a7f48f4373b38d41d9d42e (patch)
tree3dad6f6b9a0a0a33564231360bcc50e4160e5cef /src/bin/elementary/test_gfx_filters.c
parent73e3a82bc2046f26de3c76e38c525fd1218df088 (diff)
evas: Implement scale API in proper EO fashion
This removes the internal function pointer for scale_update. This makes all relevant classes implement the scale API in EO. This removes the duplicate function in Efl.Canvas.Object and only uses the one from Efl.Ui.Base interface. This *seems* to be working as expected. Fingers crossed! PS: I don't like the name Efl.Ui.Base. It's an interface for a few common API's between Gfx, Canvas and UI levels... Maybe scale simply doesn't belong there.
Diffstat (limited to '')
-rw-r--r--src/bin/elementary/test_gfx_filters.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c
index ae7ee106b0..f87e38ed7f 100644
--- a/src/bin/elementary/test_gfx_filters.c
+++ b/src/bin/elementary/test_gfx_filters.c
@@ -453,7 +453,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
453 o = text = evas_object_text_add(evas_object_evas_get(win)); 453 o = text = evas_object_text_add(evas_object_evas_get(win));
454 efl_event_callback_add(o, EFL_GFX_EVENT_RESIZE, _text_resize, NULL); 454 efl_event_callback_add(o, EFL_GFX_EVENT_RESIZE, _text_resize, NULL);
455 efl_text_properties_font_set(o, "Sans:style=Bold", default_font_size); 455 efl_text_properties_font_set(o, "Sans:style=Bold", default_font_size);
456 efl_canvas_object_scale_set(text, elm_config_scale_get()); 456 efl_ui_scale_set(text, elm_config_scale_get());
457 efl_text_set(o, "EFL"); 457 efl_text_set(o, "EFL");
458 efl_gfx_visible_set(o, 1); 458 efl_gfx_visible_set(o, 1);
459 efl_pack(box2, o); 459 efl_pack(box2, o);
@@ -492,7 +492,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
492 efl_gfx_filter_data_set(o, prg_data[k].name, prg_data[k].value, prg_data[k].exec); 492 efl_gfx_filter_data_set(o, prg_data[k].name, prg_data[k].value, prg_data[k].exec);
493 evas_object_textblock_style_set(o, st); 493 evas_object_textblock_style_set(o, st);
494 evas_object_textblock_text_markup_set(o, tbtxt); 494 evas_object_textblock_text_markup_set(o, tbtxt);
495 efl_canvas_object_scale_set(o, elm_config_scale_get()); 495 efl_ui_scale_set(o, elm_config_scale_get());
496 efl_pack(box2, o); 496 efl_pack(box2, o);
497 evas_object_resize(o, 1, 1); 497 evas_object_resize(o, 1, 1);
498 } 498 }