summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bin/elementary/test_gfx_filters.c4
-rw-r--r--src/lib/edje/edje_legacy.c4
-rw-r--r--src/lib/edje/edje_object.eo2
-rw-r--r--src/lib/edje/edje_text.c14
-rw-r--r--src/lib/edje/edje_textblock.c10
-rw-r--r--src/lib/edje/edje_util.c4
-rw-r--r--src/lib/efl/interfaces/efl_gfx.eo25
-rw-r--r--src/lib/efl/interfaces/efl_ui_base.eo25
-rw-r--r--src/lib/elementary/efl_ui_image.c2
-rw-r--r--src/lib/elementary/efl_ui_layout.c2
-rw-r--r--src/lib/elementary/efl_ui_multibuttonentry.c4
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c8
-rw-r--r--src/lib/elementary/efl_ui_slider.c14
-rw-r--r--src/lib/elementary/efl_ui_text.c2
-rw-r--r--src/lib/elementary/efl_ui_win.c2
-rw-r--r--src/lib/elementary/elm_clock.c6
-rw-r--r--src/lib/elementary/elm_colorselector.c4
-rw-r--r--src/lib/elementary/elm_entry.c2
-rw-r--r--src/lib/elementary/elm_gengrid.c6
-rw-r--r--src/lib/elementary/elm_genlist.c8
-rw-r--r--src/lib/elementary/elm_image_legacy.h4
-rw-r--r--src/lib/elementary/elm_list.c2
-rw-r--r--src/lib/elementary/elm_main.c4
-rw-r--r--src/lib/elementary/elm_menu.c2
-rw-r--r--src/lib/elementary/elm_notify.c2
-rw-r--r--src/lib/elementary/elm_photo.c8
-rw-r--r--src/lib/elementary/elm_segment_control.c4
-rw-r--r--src/lib/elementary/elm_toolbar.c18
-rw-r--r--src/lib/elementary/elm_widget.c10
-rw-r--r--src/lib/elementary/elm_widget.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_object.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_text.eo2
-rw-r--r--src/lib/evas/canvas/evas_object_main.c10
-rw-r--r--src/lib/evas/canvas/evas_object_text.c6
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c6
-rw-r--r--src/lib/evas/canvas/evas_object_textgrid.c6
-rw-r--r--src/lib/evas/canvas/evas_text.eo2
-rw-r--r--src/lib/evas/canvas/evas_textgrid.eo2
38 files changed, 120 insertions, 120 deletions
diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c
index f87e38e..c827b80 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_ui_scale_set(text, elm_config_scale_get()); 456 efl_gfx_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_ui_scale_set(o, elm_config_scale_get()); 495 efl_gfx_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 }
diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c
index a4520ba..4bf32aa 100644
--- a/src/lib/edje/edje_legacy.c
+++ b/src/lib/edje/edje_legacy.c
@@ -195,13 +195,13 @@ EAPI const char *edje_object_language_get(const Edje_Object *obj)
195 195
196EAPI Eina_Bool edje_object_scale_set(Edje_Object *obj, double scale) 196EAPI Eina_Bool edje_object_scale_set(Edje_Object *obj, double scale)
197{ 197{
198 efl_ui_scale_set(obj, scale); 198 efl_gfx_scale_set(obj, scale);
199 return EINA_TRUE; 199 return EINA_TRUE;
200} 200}
201 201
202EAPI double edje_object_scale_get(const Edje_Object *obj) 202EAPI double edje_object_scale_get(const Edje_Object *obj)
203{ 203{
204 return efl_ui_scale_get(obj); 204 return efl_gfx_scale_get(obj);
205} 205}
206 206
207/* Legacy part drag APIs */ 207/* Legacy part drag APIs */
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index 2be3869..66d584b 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -125,7 +125,7 @@ class Edje.Object (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
125 Efl.Canvas.Layout_Signal.signal_process; 125 Efl.Canvas.Layout_Signal.signal_process;
126 Efl.Ui.Base.mirrored { set; get; } 126 Efl.Ui.Base.mirrored { set; get; }
127 Efl.Ui.Base.language { set; get; } 127 Efl.Ui.Base.language { set; get; }
128 Efl.Ui.Base.scale { set; get; } 128 Efl.Gfx.scale { set; get; }
129 Efl.File.load_error { get; } 129 Efl.File.load_error { get; }
130 Efl.File.mmap { get; set; } 130 Efl.File.mmap { get; set; }
131 Efl.Container.content_remove; 131 Efl.Container.content_remove;
diff --git a/src/lib/edje/edje_text.c b/src/lib/edje/edje_text.c
index 4cf2d83..8f88f49 100644
--- a/src/lib/edje/edje_text.c
+++ b/src/lib/edje/edje_text.c
@@ -336,7 +336,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
336 if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path); 336 if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
337 else efl_text_properties_font_source_set(ep->object, NULL); 337 else efl_text_properties_font_source_set(ep->object, NULL);
338 338
339 if (ep->part->scale) efl_ui_scale_set(ep->object, TO_DOUBLE(sc)); 339 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc));
340 340
341 efl_text_set(ep->object, text); 341 efl_text_set(ep->object, text);
342 /* the fit shoult not depend on font size, because it give the differet 342 /* the fit shoult not depend on font size, because it give the differet
@@ -366,7 +366,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
366 if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path); 366 if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
367 else efl_text_properties_font_source_set(ep->object, NULL); 367 else efl_text_properties_font_source_set(ep->object, NULL);
368 368
369 if (ep->part->scale) efl_ui_scale_set(ep->object, TO_DOUBLE(sc)); 369 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc));
370 370
371 efl_text_properties_font_set(ep->object, font, size); 371 efl_text_properties_font_set(ep->object, font, size);
372 efl_text_set(ep->object, text); 372 efl_text_set(ep->object, text);
@@ -389,7 +389,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
389 if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path); 389 if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
390 else efl_text_properties_font_source_set(ep->object, NULL); 390 else efl_text_properties_font_source_set(ep->object, NULL);
391 391
392 if (ep->part->scale) efl_ui_scale_set(ep->object, TO_DOUBLE(sc)); 392 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc));
393 efl_text_properties_font_set(ep->object, font, size); 393 efl_text_properties_font_set(ep->object, font, size);
394 394
395 part_get_geometry(ep, &tw, &th); 395 part_get_geometry(ep, &tw, &th);
@@ -401,7 +401,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
401 { 401 {
402 int current; 402 int current;
403 403
404 if (ep->part->scale) efl_ui_scale_set(ep->object, TO_DOUBLE(sc)); 404 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc));
405 efl_text_properties_font_set(ep->object, font, 10); 405 efl_text_properties_font_set(ep->object, font, 10);
406 406
407 part_get_geometry(ep, &tw, &th); 407 part_get_geometry(ep, &tw, &th);
@@ -423,7 +423,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
423 { 423 {
424 current = (top + bottom) / 2; 424 current = (top + bottom) / 2;
425 425
426 if (ep->part->scale) efl_ui_scale_set(ep->object, TO_DOUBLE(sc)); 426 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc));
427 efl_text_properties_font_set(ep->object, font, current); 427 efl_text_properties_font_set(ep->object, font, current);
428 428
429 part_get_geometry(ep, &tw, &th); 429 part_get_geometry(ep, &tw, &th);
@@ -439,7 +439,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
439 { 439 {
440 current++; 440 current++;
441 441
442 if (ep->part->scale) efl_ui_scale_set(ep->object, TO_DOUBLE(sc)); 442 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc));
443 efl_text_properties_font_set(ep->object, font, current); 443 efl_text_properties_font_set(ep->object, font, current);
444 444
445 part_get_geometry(ep, &tw, &th); 445 part_get_geometry(ep, &tw, &th);
@@ -488,7 +488,7 @@ arrange_text:
488 if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path); 488 if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
489 else efl_text_properties_font_source_set(ep->object, NULL); 489 else efl_text_properties_font_source_set(ep->object, NULL);
490 490
491 if (ep->part->scale) efl_ui_scale_set(ep->object, TO_DOUBLE(sc)); 491 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc));
492 492
493 efl_text_properties_font_set(ep->object, font, size); 493 efl_text_properties_font_set(ep->object, font, size);
494 efl_text_set(ep->object, text); 494 efl_text_set(ep->object, text);
diff --git a/src/lib/edje/edje_textblock.c b/src/lib/edje/edje_textblock.c
index 08d9092..d331d69 100644
--- a/src/lib/edje/edje_textblock.c
+++ b/src/lib/edje/edje_textblock.c
@@ -458,7 +458,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
458 double s = base_s; 458 double s = base_s;
459 459
460 if (ep->part->scale) base_s = TO_DOUBLE(sc); 460 if (ep->part->scale) base_s = TO_DOUBLE(sc);
461 efl_ui_scale_set(ep->object, base_s); 461 efl_gfx_scale_set(ep->object, base_s);
462 efl_canvas_text_size_native_get(ep->object, &tw, &th); 462 efl_canvas_text_size_native_get(ep->object, &tw, &th);
463 463
464 orig_s = base_s; 464 orig_s = base_s;
@@ -467,7 +467,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
467 { 467 {
468 orig_s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s, 468 orig_s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s,
469 orig_s * TO_INT(params->eval.w) / tw); 469 orig_s * TO_INT(params->eval.w) / tw);
470 efl_ui_scale_set(ep->object, orig_s); 470 efl_gfx_scale_set(ep->object, orig_s);
471 efl_canvas_text_size_native_get(ep->object, &tw, &th); 471 efl_canvas_text_size_native_get(ep->object, &tw, &th);
472 } 472 }
473 if (chosen_desc->text.fit_x) 473 if (chosen_desc->text.fit_x)
@@ -476,7 +476,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
476 { 476 {
477 s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s, 477 s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s,
478 orig_s * TO_INT(params->eval.w) / tw); 478 orig_s * TO_INT(params->eval.w) / tw);
479 efl_ui_scale_set(ep->object, s); 479 efl_gfx_scale_set(ep->object, s);
480 efl_canvas_text_size_native_get(ep->object, NULL, NULL); 480 efl_canvas_text_size_native_get(ep->object, NULL, NULL);
481 } 481 }
482 } 482 }
@@ -493,7 +493,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
493 s = tmp_s; 493 s = tmp_s;
494 } 494 }
495 495
496 efl_ui_scale_set(ep->object, s); 496 efl_gfx_scale_set(ep->object, s);
497 efl_canvas_text_size_native_get(ep->object, NULL, NULL); 497 efl_canvas_text_size_native_get(ep->object, NULL, NULL);
498 } 498 }
499 } 499 }
@@ -518,7 +518,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
518 break; 518 break;
519 s = tmp_s; 519 s = tmp_s;
520 520
521 efl_ui_scale_set(ep->object, s); 521 efl_gfx_scale_set(ep->object, s);
522 efl_canvas_text_size_native_get(ep->object, &fw, &fh); 522 efl_canvas_text_size_native_get(ep->object, &fw, &fh);
523 i--; 523 i--;
524 } 524 }
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index a82620f..47ee13d 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -364,7 +364,7 @@ edje_password_show_last_timeout_set(double password_show_last_timeout)
364} 364}
365 365
366EOLIAN void 366EOLIAN void
367_edje_object_efl_ui_base_scale_set(Eo *obj EINA_UNUSED, Edje *ed, double scale) 367_edje_object_efl_gfx_scale_set(Eo *obj EINA_UNUSED, Edje *ed, double scale)
368{ 368{
369 Edje *ged; 369 Edje *ged;
370 Evas_Object *o; 370 Evas_Object *o;
@@ -390,7 +390,7 @@ _edje_object_efl_ui_base_scale_set(Eo *obj EINA_UNUSED, Edje *ed, double scale)
390} 390}
391 391
392EOLIAN double 392EOLIAN double
393_edje_object_efl_ui_base_scale_get(Eo *obj EINA_UNUSED, Edje *ed) 393_edje_object_efl_gfx_scale_get(Eo *obj EINA_UNUSED, Edje *ed)
394{ 394{
395 return TO_DOUBLE(ed->scale); 395 return TO_DOUBLE(ed->scale);
396} 396}
diff --git a/src/lib/efl/interfaces/efl_gfx.eo b/src/lib/efl/interfaces/efl_gfx.eo
index 6daca53..0c300da 100644
--- a/src/lib/efl/interfaces/efl_gfx.eo
+++ b/src/lib/efl/interfaces/efl_gfx.eo
@@ -115,6 +115,31 @@ interface Efl.Gfx {
115 v: bool; [[$true if to make the object visible, $false otherwise]] 115 v: bool; [[$true if to make the object visible, $false otherwise]]
116 } 116 }
117 } 117 }
118 @property scale {
119 [[The scaling factor of an object.
120
121 This property is an individual scaling factor on the object (Edje
122 or UI widget). This property (or Edje's global scaling factor, when
123 applicable), will affect this object's part sizes. If scale is
124 not zero, than the individual scaling will override any global
125 scaling set, for the object obj's parts. Set it back to zero to
126 get the effects of the global scaling again.
127
128 Warning: In Edje, only parts which, at EDC level, had the "scale"
129 property set to 1, will be affected by this function. Check the
130 complete "syntax reference" for EDC files.
131 ]]
132 set {
133 [[Sets the scaling factor of an object.]]
134 }
135 get {
136 [[Gets an object's scaling factor.]]
137 }
138 values {
139 scale: double(0.0); [[The scaling factor (the default value is 0.0,
140 meaning individual scaling is not set)]]
141 }
142 }
118 } 143 }
119 events { 144 events {
120 show; [[Object just became visible.]] 145 show; [[Object just became visible.]]
diff --git a/src/lib/efl/interfaces/efl_ui_base.eo b/src/lib/efl/interfaces/efl_ui_base.eo
index eb00535..bfd133a 100644
--- a/src/lib/efl/interfaces/efl_ui_base.eo
+++ b/src/lib/efl/interfaces/efl_ui_base.eo
@@ -40,30 +40,5 @@ interface Efl.Ui.Base
40 language: string; [[The current language.]] 40 language: string; [[The current language.]]
41 } 41 }
42 } 42 }
43 @property scale {
44 [[The scaling factor of an object.
45
46 This property is an individual scaling factor on the object (Edje
47 or UI widget). This property (or Edje's global scaling factor, when
48 applicable), will affect this object's part sizes. If scale is
49 not zero, than the individual scaling will override any global
50 scaling set, for the object obj's parts. Set it back to zero to
51 get the effects of the global scaling again.
52
53 Warning: In Edje, only parts which, at EDC level, had the "scale"
54 property set to 1, will be affected by this function. Check the
55 complete "syntax reference" for EDC files.
56 ]]
57 set {
58 [[Sets the scaling factor of an object.]]
59 }
60 get {
61 [[Gets an object's scaling factor.]]
62 }
63 values {
64 scale: double(0.0); [[The scaling factor (the default value is 0.0,
65 meaning individual scaling is not set)]]
66 }
67 }
68 } 43 }
69} 44}
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 81b5dc5..8038e84 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -767,7 +767,7 @@ _efl_ui_image_sizing_eval(Evas_Object *obj)
767 if (sd->no_scale) 767 if (sd->no_scale)
768 _efl_ui_image_internal_scale_set(obj, sd, 1.0); 768 _efl_ui_image_internal_scale_set(obj, sd, 1.0);
769 else 769 else
770 _efl_ui_image_internal_scale_set(obj, sd, efl_ui_scale_get(obj) * elm_config_scale_get()); 770 _efl_ui_image_internal_scale_set(obj, sd, efl_gfx_scale_get(obj) * elm_config_scale_get());
771 771
772 ts = sd->scale; 772 ts = sd->scale;
773 sd->scale = 1.0; 773 sd->scale = 1.0;
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index 65343c1..0e42559 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -323,7 +323,7 @@ _visuals_refresh(Evas_Object *obj,
323 323
324 edje_object_scale_set 324 edje_object_scale_set
325 (wd->resize_obj, 325 (wd->resize_obj,
326 efl_ui_scale_get(obj) * elm_config_scale_get()); 326 efl_gfx_scale_get(obj) * elm_config_scale_get());
327 327
328 _efl_ui_layout_highlight_in_theme(obj); 328 _efl_ui_layout_highlight_in_theme(obj);
329 329
diff --git a/src/lib/elementary/efl_ui_multibuttonentry.c b/src/lib/elementary/efl_ui_multibuttonentry.c
index d39d68c..b884547 100644
--- a/src/lib/elementary/efl_ui_multibuttonentry.c
+++ b/src/lib/elementary/efl_ui_multibuttonentry.c
@@ -109,7 +109,7 @@ _efl_ui_multibuttonentry_elm_widget_theme_apply(Eo *obj, Efl_Ui_Multibuttonentry
109 if (str) hpad = atoi(str); 109 if (str) hpad = atoi(str);
110 str = elm_layout_data_get(obj, "vertical_pad"); 110 str = elm_layout_data_get(obj, "vertical_pad");
111 if (str) vpad = atoi(str); 111 if (str) vpad = atoi(str);
112 pad_scale = efl_ui_scale_get(obj) * elm_config_scale_get() 112 pad_scale = efl_gfx_scale_get(obj) * elm_config_scale_get()
113 / edje_object_base_scale_get(elm_layout_edje_get(obj)); 113 / edje_object_base_scale_get(elm_layout_edje_get(obj));
114 elm_box_padding_set(sd->box, (hpad * pad_scale), (vpad * pad_scale)); 114 elm_box_padding_set(sd->box, (hpad * pad_scale), (vpad * pad_scale));
115 115
@@ -1437,7 +1437,7 @@ _view_init(Evas_Object *obj, Efl_Ui_Multibuttonentry_Data *sd)
1437 if (str) hpad = atoi(str); 1437 if (str) hpad = atoi(str);
1438 str = elm_layout_data_get(obj, "vertical_pad"); 1438 str = elm_layout_data_get(obj, "vertical_pad");
1439 if (str) vpad = atoi(str); 1439 if (str) vpad = atoi(str);
1440 pad_scale = efl_ui_scale_get(obj) * elm_config_scale_get() 1440 pad_scale = efl_gfx_scale_get(obj) * elm_config_scale_get()
1441 / edje_object_base_scale_get(elm_layout_edje_get(obj)); 1441 / edje_object_base_scale_get(elm_layout_edje_get(obj));
1442 elm_box_padding_set(sd->box, (hpad * pad_scale), (vpad * pad_scale)); 1442 elm_box_padding_set(sd->box, (hpad * pad_scale), (vpad * pad_scale));
1443 1443
diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c
index 10d67b4..b103c44 100644
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -225,11 +225,11 @@ _efl_ui_progressbar_elm_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *sd)
225 225
226 if (_is_horizontal(sd->dir)) 226 if (_is_horizontal(sd->dir))
227 evas_object_size_hint_min_set 227 evas_object_size_hint_min_set
228 (sd->spacer, (double)sd->size * efl_ui_scale_get(obj) * 228 (sd->spacer, (double)sd->size * efl_gfx_scale_get(obj) *
229 elm_config_scale_get(), 1); 229 elm_config_scale_get(), 1);
230 else 230 else
231 evas_object_size_hint_min_set 231 evas_object_size_hint_min_set
232 (sd->spacer, 1, (double)sd->size * efl_ui_scale_get(obj) * 232 (sd->spacer, 1, (double)sd->size * efl_gfx_scale_get(obj) *
233 elm_config_scale_get()); 233 elm_config_scale_get());
234 234
235 if (_is_inverted(sd->dir)) 235 if (_is_inverted(sd->dir))
@@ -397,11 +397,11 @@ _progressbar_span_size_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, Evas_Coord size
397 397
398 if (_is_horizontal(sd->dir)) 398 if (_is_horizontal(sd->dir))
399 evas_object_size_hint_min_set 399 evas_object_size_hint_min_set
400 (sd->spacer, (double)sd->size * efl_ui_scale_get(obj) * 400 (sd->spacer, (double)sd->size * efl_gfx_scale_get(obj) *
401 elm_config_scale_get(), 1); 401 elm_config_scale_get(), 1);
402 else 402 else
403 evas_object_size_hint_min_set 403 evas_object_size_hint_min_set
404 (sd->spacer, 1, (double)sd->size * efl_ui_scale_get(obj) * 404 (sd->spacer, 1, (double)sd->size * efl_gfx_scale_get(obj) *
405 elm_config_scale_get()); 405 elm_config_scale_get());
406 406
407 elm_layout_sizing_eval(obj); 407 elm_layout_sizing_eval(obj);
diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index 1474664..59a86c1 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -666,7 +666,7 @@ _popup_add(Efl_Ui_Slider_Data *sd, Eo *obj, Evas_Object **popup,
666 _elm_theme_set(elm_widget_theme_get(obj), *popup, "slider", "horizontal/popup", elm_widget_style_get(obj)); 666 _elm_theme_set(elm_widget_theme_get(obj), *popup, "slider", "horizontal/popup", elm_widget_style_get(obj));
667 else 667 else
668 _elm_theme_set(elm_widget_theme_get(obj), *popup, "slider", "vertical/popup", elm_widget_style_get(obj)); 668 _elm_theme_set(elm_widget_theme_get(obj), *popup, "slider", "vertical/popup", elm_widget_style_get(obj));
669 edje_object_scale_set(*popup, efl_ui_scale_get(obj) * 669 edje_object_scale_set(*popup, efl_gfx_scale_get(obj) *
670 elm_config_scale_get()); 670 elm_config_scale_get());
671 edje_object_signal_callback_add(*popup, "popup,hide,done", "elm", // XXX: for compat 671 edje_object_signal_callback_add(*popup, "popup,hide,done", "elm", // XXX: for compat
672 _popup_hide_done, obj); 672 _popup_hide_done, obj);
@@ -739,10 +739,10 @@ _efl_ui_slider_elm_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd)
739 739
740 if (sd->popup) 740 if (sd->popup)
741 { 741 {
742 edje_object_scale_set(sd->popup, efl_ui_scale_get(obj) * 742 edje_object_scale_set(sd->popup, efl_gfx_scale_get(obj) *
743 elm_config_scale_get()); 743 elm_config_scale_get());
744 if (sd->intvl_enable && sd->popup2) 744 if (sd->intvl_enable && sd->popup2)
745 edje_object_scale_set(sd->popup2, efl_ui_scale_get(obj) * 745 edje_object_scale_set(sd->popup2, efl_gfx_scale_get(obj) *
746 elm_config_scale_get()); 746 elm_config_scale_get());
747 else if (sd->intvl_enable && !sd->popup2) 747 else if (sd->intvl_enable && !sd->popup2)
748 _popup_add(sd, obj, &sd->popup2, &sd->track2, EINA_TRUE); 748 _popup_add(sd, obj, &sd->popup2, &sd->track2, EINA_TRUE);
@@ -756,11 +756,11 @@ _efl_ui_slider_elm_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd)
756 756
757 if (_is_horizontal(sd->dir)) 757 if (_is_horizontal(sd->dir))
758 evas_object_size_hint_min_set 758 evas_object_size_hint_min_set
759 (sd->spacer, (double)sd->size * efl_ui_scale_get(obj) * 759 (sd->spacer, (double)sd->size * efl_gfx_scale_get(obj) *
760 elm_config_scale_get(), 1); 760 elm_config_scale_get(), 1);
761 else 761 else
762 evas_object_size_hint_min_set 762 evas_object_size_hint_min_set
763 (sd->spacer, 1, (double)sd->size * efl_ui_scale_get(obj) * 763 (sd->spacer, 1, (double)sd->size * efl_gfx_scale_get(obj) *
764 elm_config_scale_get()); 764 elm_config_scale_get());
765 765
766 if (sd->intvl_enable) 766 if (sd->intvl_enable)
@@ -1026,11 +1026,11 @@ _efl_ui_slider_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Slider_Data *sd)
1026 1026
1027 if (_is_horizontal(sd->dir)) 1027 if (_is_horizontal(sd->dir))
1028 evas_object_size_hint_min_set 1028 evas_object_size_hint_min_set
1029 (sd->spacer, (double)sd->size * efl_ui_scale_get(obj) * 1029 (sd->spacer, (double)sd->size * efl_gfx_scale_get(obj) *
1030 elm_config_scale_get(), 1); 1030 elm_config_scale_get(), 1);
1031 else 1031 else
1032 evas_object_size_hint_min_set 1032 evas_object_size_hint_min_set
1033 (sd->spacer, 1, (double)sd->size * efl_ui_scale_get(obj) * 1033 (sd->spacer, 1, (double)sd->size * efl_gfx_scale_get(obj) *
1034 elm_config_scale_get()); 1034 elm_config_scale_get());
1035 1035
1036 _val_fetch(obj, EINA_FALSE); 1036 _val_fetch(obj, EINA_FALSE);
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index c44ccb3..b568e22 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -926,7 +926,7 @@ _efl_ui_text_elm_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
926 926
927 edje_object_scale_set 927 edje_object_scale_set
928 (wd->resize_obj, 928 (wd->resize_obj,
929 efl_ui_scale_get(obj) * elm_config_scale_get()); 929 efl_gfx_scale_get(obj) * elm_config_scale_get());
930 930
931 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 931 _mirrored_set(obj, efl_ui_mirrored_get(obj));
932 932
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 2c89a4e..3a3d823 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -6519,7 +6519,7 @@ _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd)
6519 6519
6520 edje_object_mirrored_set(sd->legacy.edje, efl_ui_mirrored_get(obj)); 6520 edje_object_mirrored_set(sd->legacy.edje, efl_ui_mirrored_get(obj));
6521 edje_object_scale_set(sd->legacy.edje, 6521 edje_object_scale_set(sd->legacy.edje,
6522 efl_ui_scale_get(obj) * elm_config_scale_get()); 6522 efl_gfx_scale_get(obj) * elm_config_scale_get());
6523 6523
6524 efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_THEME_CHANGED, NULL); 6524 efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_THEME_CHANGED, NULL);
6525 ret = efl_ui_widget_on_disabled_update(obj, elm_widget_disabled_get(obj)); 6525 ret = efl_ui_widget_on_disabled_update(obj, elm_widget_disabled_get(obj));
diff --git a/src/lib/elementary/elm_clock.c b/src/lib/elementary/elm_clock.c
index 757363d..95a03df 100644
--- a/src/lib/elementary/elm_clock.c
+++ b/src/lib/elementary/elm_clock.c
@@ -422,7 +422,7 @@ _time_update(Evas_Object *obj, Eina_Bool theme_update)
422 } 422 }
423 423
424 edje_object_scale_set 424 edje_object_scale_set
425 (wd->resize_obj, efl_ui_scale_get(obj) * 425 (wd->resize_obj, efl_gfx_scale_get(obj) *
426 elm_config_scale_get()); 426 elm_config_scale_get());
427 427
428 for (i = 0; i < 6; i++) 428 for (i = 0; i < 6; i++)
@@ -435,7 +435,7 @@ _time_update(Evas_Object *obj, Eina_Bool theme_update)
435 elm_widget_theme_object_set 435 elm_widget_theme_object_set
436 (obj, sd->digit[i], "clock", "flipdigit", style); 436 (obj, sd->digit[i], "clock", "flipdigit", style);
437 edje_object_scale_set 437 edje_object_scale_set
438 (sd->digit[i], efl_ui_scale_get(obj) * 438 (sd->digit[i], efl_gfx_scale_get(obj) *
439 elm_config_scale_get()); 439 elm_config_scale_get());
440 440
441 if ((sd->edit) && (sd->digedit & (1 << i))) 441 if ((sd->edit) && (sd->digedit & (1 << i)))
@@ -469,7 +469,7 @@ _time_update(Evas_Object *obj, Eina_Bool theme_update)
469 edje_object_add(evas_object_evas_get(wd->resize_obj)); 469 edje_object_add(evas_object_evas_get(wd->resize_obj));
470 elm_widget_theme_object_set 470 elm_widget_theme_object_set
471 (obj, sd->am_pm_obj, "clock", "flipampm", style); 471 (obj, sd->am_pm_obj, "clock", "flipampm", style);
472 edje_object_scale_set(sd->am_pm_obj, efl_ui_scale_get(obj) * 472 edje_object_scale_set(sd->am_pm_obj, efl_gfx_scale_get(obj) *
473 _elm_config->scale); 473 _elm_config->scale);
474 if (sd->edit) 474 if (sd->edit)
475 edje_object_signal_emit 475 edje_object_signal_emit
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index c51641e..625e636 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -1347,7 +1347,7 @@ _elm_colorselector_elm_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd)
1347 (wd->resize_obj, "vertical_pad"); 1347 (wd->resize_obj, "vertical_pad");
1348 if (vpadstr) v_pad = atoi(vpadstr); 1348 if (vpadstr) v_pad = atoi(vpadstr);
1349 1349
1350 scale = efl_ui_scale_get(obj) * elm_config_scale_get() / edje_object_base_scale_get(wd->resize_obj); 1350 scale = efl_gfx_scale_get(obj) * elm_config_scale_get() / edje_object_base_scale_get(wd->resize_obj);
1351 efl_pack_padding_set(sd->palette_box, h_pad * scale, v_pad * scale, 0); 1351 efl_pack_padding_set(sd->palette_box, h_pad * scale, v_pad * scale, 0);
1352 1352
1353 EINA_LIST_FOREACH(sd->items, elist, eo_item) 1353 EINA_LIST_FOREACH(sd->items, elist, eo_item)
@@ -1919,7 +1919,7 @@ _create_colorpalette(Evas_Object *obj)
1919 vpadstr = edje_object_data_get(wd->resize_obj, "vertical_pad"); 1919 vpadstr = edje_object_data_get(wd->resize_obj, "vertical_pad");
1920 if (vpadstr) v_pad = atoi(vpadstr); 1920 if (vpadstr) v_pad = atoi(vpadstr);
1921 1921
1922 scale = efl_ui_scale_get(obj) * elm_config_scale_get() / edje_object_base_scale_get(wd->resize_obj); 1922 scale = efl_gfx_scale_get(obj) * elm_config_scale_get() / edje_object_base_scale_get(wd->resize_obj);
1923 efl_pack_padding_set(sd->palette_box, h_pad * scale, v_pad * scale, 0); 1923 efl_pack_padding_set(sd->palette_box, h_pad * scale, v_pad * scale, 0);
1924 efl_pack_align_set(sd->palette_box, 0.0, 0.0); 1924 efl_pack_align_set(sd->palette_box, 0.0, 0.0);
1925 if (!elm_layout_content_set(obj, "elm.palette", sd->palette_box)) 1925 if (!elm_layout_content_set(obj, "elm.palette", sd->palette_box))
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index ad70e9b..be39d2d 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -877,7 +877,7 @@ _elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
877 877
878 edje_object_scale_set 878 edje_object_scale_set
879 (wd->resize_obj, 879 (wd->resize_obj,
880 efl_ui_scale_get(obj) * elm_config_scale_get()); 880 efl_gfx_scale_get(obj) * elm_config_scale_get());
881 881
882 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 882 _mirrored_set(obj, efl_ui_mirrored_get(obj));
883 883
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index 8f5615f..a8939b5 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -225,7 +225,7 @@ _item_cache_add(Elm_Gen_Item *it, Eina_List *contents)
225 edje_object_mirrored_set(VIEW(it), 225 edje_object_mirrored_set(VIEW(it),
226 efl_ui_mirrored_get(WIDGET(it))); 226 efl_ui_mirrored_get(WIDGET(it)));
227 edje_object_scale_set(VIEW(it), 227 edje_object_scale_set(VIEW(it),
228 efl_ui_scale_get(WIDGET(it)) 228 efl_gfx_scale_get(WIDGET(it))
229 * elm_config_scale_get()); 229 * elm_config_scale_get());
230 230
231 evas_object_hide(itc->base_view); 231 evas_object_hide(itc->base_view);
@@ -1142,7 +1142,7 @@ _view_style_update(Elm_Gen_Item *it, Evas_Object *view, const char *style)
1142 } 1142 }
1143 1143
1144 edje_object_mirrored_set(view, efl_ui_mirrored_get(WIDGET(it))); 1144 edje_object_mirrored_set(view, efl_ui_mirrored_get(WIDGET(it)));
1145 edje_object_scale_set(view, efl_ui_scale_get(WIDGET(it)) * 1145 edje_object_scale_set(view, efl_gfx_scale_get(WIDGET(it)) *
1146 elm_config_scale_get()); 1146 elm_config_scale_get());
1147 evas_object_stack_below(view, sd->stack); 1147 evas_object_stack_below(view, sd->stack);
1148} 1148}
@@ -1156,7 +1156,7 @@ _view_create(Elm_Gen_Item *it, const char *style)
1156 Evas_Object *view = edje_object_add(evas_object_evas_get(WIDGET(it))); 1156 Evas_Object *view = edje_object_add(evas_object_evas_get(WIDGET(it)));
1157 evas_object_smart_member_add(view, GG_IT(it)->wsd->pan_obj); 1157 evas_object_smart_member_add(view, GG_IT(it)->wsd->pan_obj);
1158 elm_widget_sub_object_add(WIDGET(it), view); 1158 elm_widget_sub_object_add(WIDGET(it), view);
1159 edje_object_scale_set(view, efl_ui_scale_get(WIDGET(it)) * 1159 edje_object_scale_set(view, efl_gfx_scale_get(WIDGET(it)) *
1160 elm_config_scale_get()); 1160 elm_config_scale_get());
1161 1161
1162 _view_style_update(it, view, style); 1162 _view_style_update(it, view, style);
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 8a59d2f..3d219e5 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -568,7 +568,7 @@ _view_style_update(Elm_Gen_Item *it, Evas_Object *view, const char *style)
568 } 568 }
569 569
570 edje_object_mirrored_set(view, efl_ui_mirrored_get(WIDGET(it))); 570 edje_object_mirrored_set(view, efl_ui_mirrored_get(WIDGET(it)));
571 edje_object_scale_set(view, efl_ui_scale_get(WIDGET(it)) 571 edje_object_scale_set(view, efl_gfx_scale_get(WIDGET(it))
572 * elm_config_scale_get()); 572 * elm_config_scale_get());
573 573
574 stacking_even = edje_object_data_get(view, "stacking_even"); 574 stacking_even = edje_object_data_get(view, "stacking_even");
@@ -589,7 +589,7 @@ _view_create(Elm_Gen_Item *it, const char *style)
589 Evas_Object *view = edje_object_add(evas_object_evas_get(WIDGET(it))); 589 Evas_Object *view = edje_object_add(evas_object_evas_get(WIDGET(it)));
590 evas_object_smart_member_add(view, it->item->wsd->pan_obj); 590 evas_object_smart_member_add(view, it->item->wsd->pan_obj);
591 elm_widget_sub_object_add(WIDGET(it), view); 591 elm_widget_sub_object_add(WIDGET(it), view);
592 edje_object_scale_set(view, efl_ui_scale_get(WIDGET(it)) * 592 edje_object_scale_set(view, efl_gfx_scale_get(WIDGET(it)) *
593 elm_config_scale_get()); 593 elm_config_scale_get());
594 594
595 _view_style_update(it, view, style); 595 _view_style_update(it, view, style);
@@ -1400,7 +1400,7 @@ _decorate_all_item_realize(Elm_Gen_Item *it,
1400 if (it->item->decorate_all_item_realized) return; 1400 if (it->item->decorate_all_item_realized) return;
1401 1401
1402 it->deco_all_view = edje_object_add(evas_object_evas_get(WIDGET(it))); 1402 it->deco_all_view = edje_object_add(evas_object_evas_get(WIDGET(it)));
1403 edje_object_scale_set(it->deco_all_view, efl_ui_scale_get(WIDGET(it)) * 1403 edje_object_scale_set(it->deco_all_view, efl_gfx_scale_get(WIDGET(it)) *
1404 elm_config_scale_get()); 1404 elm_config_scale_get());
1405 evas_object_smart_member_add(it->deco_all_view, sd->pan_obj); 1405 evas_object_smart_member_add(it->deco_all_view, sd->pan_obj);
1406 elm_widget_sub_object_add(WIDGET(it), it->deco_all_view); 1406 elm_widget_sub_object_add(WIDGET(it), it->deco_all_view);
@@ -1637,7 +1637,7 @@ _item_cache_add(Elm_Gen_Item *it, Eina_List *contents)
1637 edje_object_mirrored_set(itc->base_view, 1637 edje_object_mirrored_set(itc->base_view,
1638 efl_ui_mirrored_get(WIDGET(it))); 1638 efl_ui_mirrored_get(WIDGET(it)));
1639 edje_object_scale_set(itc->base_view, 1639 edje_object_scale_set(itc->base_view,
1640 efl_ui_scale_get(WIDGET(it)) 1640 efl_gfx_scale_get(WIDGET(it))
1641 * elm_config_scale_get()); 1641 * elm_config_scale_get());
1642 1642
1643 it->spacer = NULL; 1643 it->spacer = NULL;
diff --git a/src/lib/elementary/elm_image_legacy.h b/src/lib/elementary/elm_image_legacy.h
index 205b356..577adfd 100644
--- a/src/lib/elementary/elm_image_legacy.h
+++ b/src/lib/elementary/elm_image_legacy.h
@@ -490,7 +490,7 @@ EAPI void elm_image_resizable_get(const Evas_Object *obj, Eina_Bool *up, Eina_Bo
490 * This function disables scaling of the elm_image widget through the function 490 * This function disables scaling of the elm_image widget through the function
491 * elm_object_scale_set(). However, this does not affect the widget size/resize 491 * elm_object_scale_set(). However, this does not affect the widget size/resize
492 * in any way. For that effect, take a look at @ref elm_image_resizable_get and 492 * in any way. For that effect, take a look at @ref elm_image_resizable_get and
493 * @ref efl_ui_scale_get 493 * @ref efl_gfx_scale_get
494 * 494 *
495 * @param[in] no_scale @c true if the object is not scalable, @c false 495 * @param[in] no_scale @c true if the object is not scalable, @c false
496 * otherwise. Default is @c false. 496 * otherwise. Default is @c false.
@@ -505,7 +505,7 @@ EAPI void elm_image_no_scale_set(Evas_Object *obj, Eina_Bool no_scale);
505 * This function disables scaling of the elm_image widget through the function 505 * This function disables scaling of the elm_image widget through the function
506 * elm_object_scale_set(). However, this does not affect the widget size/resize 506 * elm_object_scale_set(). However, this does not affect the widget size/resize
507 * in any way. For that effect, take a look at @ref elm_image_resizable_get and 507 * in any way. For that effect, take a look at @ref elm_image_resizable_get and
508 * @ref efl_ui_scale_get 508 * @ref efl_gfx_scale_get
509 * 509 *
510 * @return @c true if the object is not scalable, @c false otherwise. Default 510 * @return @c true if the object is not scalable, @c false otherwise. Default
511 * is @c false. 511 * is @c false.
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index 1b7f239..27a4253 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -1089,7 +1089,7 @@ _elm_list_elm_widget_theme_apply(Eo *obj, Elm_List_Data *sd)
1089 { 1089 {
1090 ELM_LIST_ITEM_DATA_GET(eo_it, it); 1090 ELM_LIST_ITEM_DATA_GET(eo_it, it);
1091 edje_object_scale_set 1091 edje_object_scale_set
1092 (VIEW(it), efl_ui_scale_get(obj) * elm_config_scale_get()); 1092 (VIEW(it), efl_gfx_scale_get(obj) * elm_config_scale_get());
1093 it->fixed = EINA_FALSE; 1093 it->fixed = EINA_FALSE;
1094 } 1094 }
1095 1095
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index 7789b8b..b16e18e 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -1429,14 +1429,14 @@ elm_object_scale_set(Evas_Object *obj,
1429 double scale) 1429 double scale)
1430{ 1430{
1431 EINA_SAFETY_ON_NULL_RETURN(obj); 1431 EINA_SAFETY_ON_NULL_RETURN(obj);
1432 efl_ui_scale_set(obj, scale); 1432 efl_gfx_scale_set(obj, scale);
1433} 1433}
1434 1434
1435EAPI double 1435EAPI double
1436elm_object_scale_get(const Evas_Object *obj) 1436elm_object_scale_get(const Evas_Object *obj)
1437{ 1437{
1438 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, 0.0); 1438 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, 0.0);
1439 return efl_ui_scale_get(obj); 1439 return efl_gfx_scale_get(obj);
1440} 1440}
1441 1441
1442EAPI void 1442EAPI void
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index cb34abb..446f58e 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -295,7 +295,7 @@ _elm_menu_elm_widget_theme_apply(Eo *obj, Elm_Menu_Data *sd)
295 elm_wdg_item_disable(eo_item); 295 elm_wdg_item_disable(eo_item);
296 /* SEOZ 296 /* SEOZ
297 edje_object_scale_set 297 edje_object_scale_set
298 (VIEW(item), efl_ui_scale_get(obj) * 298 (VIEW(item), efl_gfx_scale_get(obj) *
299 elm_config_scale_get()); 299 elm_config_scale_get());
300 */ 300 */
301 } 301 }
diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c
index 6a0b72c..9e6572a 100644
--- a/src/lib/elementary/elm_notify.c
+++ b/src/lib/elementary/elm_notify.c
@@ -153,7 +153,7 @@ _elm_notify_elm_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd)
153 if (sd->block_events) _block_events_theme_apply(obj); 153 if (sd->block_events) _block_events_theme_apply(obj);
154 154
155 edje_object_scale_set 155 edje_object_scale_set
156 (sd->notify, efl_ui_scale_get(obj) * elm_config_scale_get()); 156 (sd->notify, efl_gfx_scale_get(obj) * elm_config_scale_get());
157 157
158 _sizing_eval(obj); 158 _sizing_eval(obj);
159 159
diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c
index 151dc26..531cc0c 100644
--- a/src/lib/elementary/elm_photo.c
+++ b/src/lib/elementary/elm_photo.c
@@ -37,7 +37,7 @@ _sizing_eval(Evas_Object *obj)
37 37
38 if (sd->size <= 0) return; 38 if (sd->size <= 0) return;
39 39
40 scale = (sd->size * efl_ui_scale_get(obj) * elm_config_scale_get()); 40 scale = (sd->size * efl_gfx_scale_get(obj) * elm_config_scale_get());
41 41
42 evas_object_size_hint_min_set(sd->icon, scale, scale); 42 evas_object_size_hint_min_set(sd->icon, scale, scale);
43 elm_coords_finger_size_adjust(1, &minw, 1, &minh); 43 elm_coords_finger_size_adjust(1, &minw, 1, &minh);
@@ -65,10 +65,10 @@ _elm_photo_elm_widget_theme_apply(Eo *obj, Elm_Photo_Data *sd)
65 (obj, wd->resize_obj, "photo", "base", 65 (obj, wd->resize_obj, "photo", "base",
66 elm_widget_style_get(obj)); 66 elm_widget_style_get(obj));
67 67
68 elm_object_scale_set(sd->icon, efl_ui_scale_get(obj)); 68 elm_object_scale_set(sd->icon, efl_gfx_scale_get(obj));
69 69
70 edje_object_scale_set(wd->resize_obj, 70 edje_object_scale_set(wd->resize_obj,
71 efl_ui_scale_get(obj) * elm_config_scale_get()); 71 efl_gfx_scale_get(obj) * elm_config_scale_get());
72 _sizing_eval(obj); 72 _sizing_eval(obj);
73 73
74 return int_ret; 74 return int_ret;
@@ -260,7 +260,7 @@ _elm_photo_efl_canvas_group_group_add(Eo *obj, Elm_Photo_Data *priv)
260 elm_image_fill_outside_set(priv->icon, !priv->fill_inside); 260 elm_image_fill_outside_set(priv->icon, !priv->fill_inside);
261 elm_image_prescale_set(priv->icon, 0); 261 elm_image_prescale_set(priv->icon, 0);
262 262
263 elm_object_scale_set(priv->icon, efl_ui_scale_get(obj)); 263 elm_object_scale_set(priv->icon, efl_gfx_scale_get(obj));
264 264
265 evas_object_event_callback_add 265 evas_object_event_callback_add
266 (priv->icon, EVAS_CALLBACK_MOUSE_UP, _mouse_up, obj); 266 (priv->icon, EVAS_CALLBACK_MOUSE_UP, _mouse_up, obj);
diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c
index 600219f..2c10998 100644
--- a/src/lib/elementary/elm_segment_control.c
+++ b/src/lib/elementary/elm_segment_control.c
@@ -235,7 +235,7 @@ _elm_segment_control_elm_widget_theme_apply(Eo *obj, Elm_Segment_Control_Data *s
235 elm_widget_theme_object_set 235 elm_widget_theme_object_set
236 (obj, VIEW(it), "segment_control", "item", 236 (obj, VIEW(it), "segment_control", "item",
237 elm_widget_style_get(obj)); 237 elm_widget_style_get(obj));
238 edje_object_scale_set(VIEW(it), efl_ui_scale_get(WIDGET(it)) * 238 edje_object_scale_set(VIEW(it), efl_gfx_scale_get(WIDGET(it)) *
239 elm_config_scale_get()); 239 elm_config_scale_get());
240 edje_object_mirrored_set(VIEW(it), rtl); 240 edje_object_mirrored_set(VIEW(it), rtl);
241 } 241 }
@@ -597,7 +597,7 @@ _elm_segment_control_item_efl_object_constructor(Eo *obj, Elm_Segment_Control_It
597 parent = efl_parent_get(obj); 597 parent = efl_parent_get(obj);
598 598
599 VIEW(it) = edje_object_add(evas_object_evas_get(parent)); 599 VIEW(it) = edje_object_add(evas_object_evas_get(parent));
600 edje_object_scale_set(VIEW(it),efl_ui_scale_get(WIDGET(it)) * 600 edje_object_scale_set(VIEW(it),efl_gfx_scale_get(WIDGET(it)) *
601 elm_config_scale_get()); 601 elm_config_scale_get());
602 evas_object_smart_member_add(VIEW(it), parent); 602 evas_object_smart_member_add(VIEW(it), parent);
603 603
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index e7df14a..21def5d 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -952,7 +952,7 @@ _internal_elm_toolbar_icon_size_get(Evas_Object *obj)
952 (wd->resize_obj, "icon_size"); 952 (wd->resize_obj, "icon_size");
953 953
954 if (icon_size) 954 if (icon_size)
955 return (int)(atoi(icon_size) * efl_ui_scale_get(obj) * elm_config_scale_get() 955 return (int)(atoi(icon_size) * efl_gfx_scale_get(obj) * elm_config_scale_get()
956 / edje_object_base_scale_get(wd->resize_obj)); 956 / edje_object_base_scale_get(wd->resize_obj));
957 957
958 return _elm_config->icon_size; 958 return _elm_config->icon_size;
@@ -1496,7 +1496,7 @@ _elm_toolbar_elm_widget_theme_apply(Eo *obj, Elm_Toolbar_Data *sd)
1496 if (sd->priv_icon_size) sd->icon_size = sd->priv_icon_size; 1496 if (sd->priv_icon_size) sd->icon_size = sd->priv_icon_size;
1497 else sd->icon_size = sd->theme_icon_size; 1497 else sd->icon_size = sd->theme_icon_size;
1498 1498
1499 scale = (efl_ui_scale_get(obj) * elm_config_scale_get()); 1499 scale = (efl_gfx_scale_get(obj) * elm_config_scale_get());
1500 EINA_INLIST_FOREACH(sd->items, it) 1500 EINA_INLIST_FOREACH(sd->items, it)
1501 _item_theme_hook(obj, it, scale, sd->icon_size); 1501 _item_theme_hook(obj, it, scale, sd->icon_size);
1502 1502
@@ -1624,7 +1624,7 @@ _elm_toolbar_item_elm_widget_item_part_content_set(Eo *eo_item EINA_UNUSED, Elm_
1624 if (item->object) 1624 if (item->object)
1625 elm_widget_sub_object_add(obj, item->object); 1625 elm_widget_sub_object_add(obj, item->object);
1626 1626
1627 scale = (efl_ui_scale_get(obj) * elm_config_scale_get()); 1627 scale = (efl_gfx_scale_get(obj) * elm_config_scale_get());
1628 _item_theme_hook(obj, item, scale, sd->icon_size); 1628 _item_theme_hook(obj, item, scale, sd->icon_size);
1629} 1629}
1630 1630
@@ -1658,7 +1658,7 @@ _elm_toolbar_item_elm_widget_item_part_content_unset(Eo *eo_item EINA_UNUSED, El
1658 _elm_widget_sub_object_redirect_to_top(obj, item->object); 1658 _elm_widget_sub_object_redirect_to_top(obj, item->object);
1659 o = item->object; 1659 o = item->object;
1660 item->object = NULL; 1660 item->object = NULL;
1661 scale = (efl_ui_scale_get(obj) * elm_config_scale_get()); 1661 scale = (efl_gfx_scale_get(obj) * elm_config_scale_get());
1662 _item_theme_hook(obj, item, scale, sd->icon_size); 1662 _item_theme_hook(obj, item, scale, sd->icon_size);
1663 1663
1664 return o; 1664 return o;
@@ -2999,7 +2999,7 @@ _elm_toolbar_item_append(Eo *obj, Elm_Toolbar_Data *sd, const char *icon, const
2999 2999
3000 it = _item_new(obj, icon, label, func, data); 3000 it = _item_new(obj, icon, label, func, data);
3001 if (!it) return NULL; 3001 if (!it) return NULL;
3002 scale = (efl_ui_scale_get(obj) * elm_config_scale_get()); 3002 scale = (efl_gfx_scale_get(obj) * elm_config_scale_get());
3003 3003
3004 prev_list = evas_object_box_children_get(sd->bx); 3004 prev_list = evas_object_box_children_get(sd->bx);
3005 3005
@@ -3025,7 +3025,7 @@ _elm_toolbar_item_prepend(Eo *obj, Elm_Toolbar_Data *sd, const char *icon, const
3025 3025
3026 it = _item_new(obj, icon, label, func, data); 3026 it = _item_new(obj, icon, label, func, data);
3027 if (!it) return NULL; 3027 if (!it) return NULL;
3028 scale = (efl_ui_scale_get(obj) * elm_config_scale_get()); 3028 scale = (efl_gfx_scale_get(obj) * elm_config_scale_get());
3029 3029
3030 prev_list = evas_object_box_children_get(sd->bx); 3030 prev_list = evas_object_box_children_get(sd->bx);
3031 3031
@@ -3054,7 +3054,7 @@ _elm_toolbar_item_insert_before(Eo *obj, Elm_Toolbar_Data *sd, Elm_Object_Item *
3054 3054
3055 it = _item_new(obj, icon, label, func, data); 3055 it = _item_new(obj, icon, label, func, data);
3056 if (!it) return NULL; 3056 if (!it) return NULL;
3057 scale = (efl_ui_scale_get(obj) * elm_config_scale_get()); 3057 scale = (efl_gfx_scale_get(obj) * elm_config_scale_get());
3058 3058
3059 prev_list = evas_object_box_children_get(sd->bx); 3059 prev_list = evas_object_box_children_get(sd->bx);
3060 3060
@@ -3083,7 +3083,7 @@ _elm_toolbar_item_insert_after(Eo *obj, Elm_Toolbar_Data *sd, Elm_Object_Item *e
3083 3083
3084 it = _item_new(obj, icon, label, func, data); 3084 it = _item_new(obj, icon, label, func, data);
3085 if (!it) return NULL; 3085 if (!it) return NULL;
3086 scale = (efl_ui_scale_get(obj) * elm_config_scale_get()); 3086 scale = (efl_gfx_scale_get(obj) * elm_config_scale_get());
3087 3087
3088 prev_list = evas_object_box_children_get(sd->bx); 3088 prev_list = evas_object_box_children_get(sd->bx);
3089 3089
@@ -3329,7 +3329,7 @@ _elm_toolbar_item_separator_set(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *
3329 3329
3330 if (item->separator == separator) return; 3330 if (item->separator == separator) return;
3331 item->separator = separator; 3331 item->separator = separator;
3332 scale = (efl_ui_scale_get(obj) * elm_config_scale_get()); 3332 scale = (efl_gfx_scale_get(obj) * elm_config_scale_get());
3333 _item_theme_hook(obj, item, scale, sd->icon_size); 3333 _item_theme_hook(obj, item, scale, sd->icon_size);
3334 evas_object_size_hint_min_set(VIEW(item), -1, -1); 3334 evas_object_size_hint_min_set(VIEW(item), -1, -1);
3335 if (separator) sd->separator_count++; 3335 if (separator) sd->separator_count++;
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index d174bf7..7c0289e 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -1498,10 +1498,10 @@ _elm_widget_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Objec
1498 * need to reset sobj's scale to 5. 1498 * need to reset sobj's scale to 5.
1499 * Note that each widget's scale is 0 by default. 1499 * Note that each widget's scale is 0 by default.
1500 */ 1500 */
1501 double scale, pscale = efl_ui_scale_get(sobj); 1501 double scale, pscale = efl_gfx_scale_get(sobj);
1502 Elm_Theme *th, *pth = elm_widget_theme_get(sobj); 1502 Elm_Theme *th, *pth = elm_widget_theme_get(sobj);
1503 1503
1504 scale = efl_ui_scale_get(sobj); 1504 scale = efl_gfx_scale_get(sobj);
1505 th = elm_widget_theme_get(sobj); 1505 th = elm_widget_theme_get(sobj);
1506 mirrored = efl_ui_mirrored_get(sobj); 1506 mirrored = efl_ui_mirrored_get(sobj);
1507 1507
@@ -2658,7 +2658,7 @@ elm_widget_scroll_freeze_get(const Eo *obj)
2658} 2658}
2659 2659
2660EOLIAN static void 2660EOLIAN static void
2661_elm_widget_efl_ui_base_scale_set(Eo *obj, Elm_Widget_Smart_Data *sd, double scale) 2661_elm_widget_efl_gfx_scale_set(Eo *obj, Elm_Widget_Smart_Data *sd, double scale)
2662{ 2662{
2663 if (scale < 0.0) scale = 0.0; 2663 if (scale < 0.0) scale = 0.0;
2664 if (sd->scale != scale) 2664 if (sd->scale != scale)
@@ -2669,14 +2669,14 @@ _elm_widget_efl_ui_base_scale_set(Eo *obj, Elm_Widget_Smart_Data *sd, double sca
2669} 2669}
2670 2670
2671EOLIAN static double 2671EOLIAN static double
2672_elm_widget_efl_ui_base_scale_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) 2672_elm_widget_efl_gfx_scale_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
2673{ 2673{
2674 // FIXME: save walking up the tree by storing/caching parent scale 2674 // FIXME: save walking up the tree by storing/caching parent scale
2675 if (sd->scale == 0.0) 2675 if (sd->scale == 0.0)
2676 { 2676 {
2677 if (sd->parent_obj && elm_widget_is(sd->parent_obj)) 2677 if (sd->parent_obj && elm_widget_is(sd->parent_obj))
2678 { 2678 {
2679 return efl_ui_scale_get(sd->parent_obj); 2679 return efl_gfx_scale_get(sd->parent_obj);
2680 } 2680 }
2681 else 2681 else
2682 { 2682 {
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index 6752380..1747b4c 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -605,6 +605,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access,
605 Efl.Gfx.visible { set; } 605 Efl.Gfx.visible { set; }
606 Efl.Gfx.position { set; } 606 Efl.Gfx.position { set; }
607 Efl.Gfx.size { set; } 607 Efl.Gfx.size { set; }
608 Efl.Gfx.scale { set; get; }
608 Efl.Canvas.Object.clip { set; } 609 Efl.Canvas.Object.clip { set; }
609 Efl.Canvas.Object.no_render { set; } 610 Efl.Canvas.Object.no_render { set; }
610 Efl.Canvas.Object.is_frame_object { set; } 611 Efl.Canvas.Object.is_frame_object { set; }
@@ -621,7 +622,6 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access,
621 Efl.Ui.Focus.User.parent { get; } 622 Efl.Ui.Focus.User.parent { get; }
622 Efl.Ui.Focus.Object.focus_geometry { get; } 623 Efl.Ui.Focus.Object.focus_geometry { get; }
623 Efl.Ui.Focus.Object.focus { set; } 624 Efl.Ui.Focus.Object.focus { set; }
624 Efl.Ui.Base.scale { get; set; }
625 Efl.Ui.Base.mirrored { get; set; } 625 Efl.Ui.Base.mirrored { get; set; }
626 Efl.Ui.Base.mirrored_automatic { get; set; } 626 Efl.Ui.Base.mirrored_automatic { get; set; }
627 Efl.Ui.Cursor.cursor { get; set; } 627 Efl.Ui.Cursor.cursor { get; set; }
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index 5b46c4f..0ceb456 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -678,7 +678,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
678 Efl.Gfx.Size.Hint.hint_max { get; set; } 678 Efl.Gfx.Size.Hint.hint_max { get; set; }
679 Efl.Gfx.Size.Hint.hint_margin { get; set; } 679 Efl.Gfx.Size.Hint.hint_margin { get; set; }
680 Efl.Gfx.Size.Hint.hint_weight { get; set; } 680 Efl.Gfx.Size.Hint.hint_weight { get; set; }
681 Efl.Ui.Base.scale { get; set; } 681 Efl.Gfx.scale { set; get; }
682 Efl.Input.Interface.seat_event_filter { get; set; } 682 Efl.Input.Interface.seat_event_filter { get; set; }
683 Efl.Loop_User.loop { get; } 683 Efl.Loop_User.loop { get; }
684 } 684 }
diff --git a/src/lib/evas/canvas/efl_canvas_text.eo b/src/lib/evas/canvas/efl_canvas_text.eo
index 7d04742..02cad37 100644
--- a/src/lib/evas/canvas/efl_canvas_text.eo
+++ b/src/lib/evas/canvas/efl_canvas_text.eo
@@ -351,7 +351,7 @@ class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text, Efl.Text.Properties,
351 Efl.Text.Annotate.cursor_object_item_insert; 351 Efl.Text.Annotate.cursor_object_item_insert;
352 Efl.Text.Markup.markup { set; get; } 352 Efl.Text.Markup.markup { set; get; }
353 Efl.Text.Markup.cursor_markup_insert; 353 Efl.Text.Markup.cursor_markup_insert;
354 Efl.Ui.Base.scale { set; } 354 Efl.Gfx.scale { set; }
355 } 355 }
356 events { 356 events {
357 cursor,changed; [[Called when cursor changed]] 357 cursor,changed; [[Called when cursor changed]]
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 01fb1e4..7ffd1d7 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -2218,7 +2218,7 @@ _efl_canvas_object_anti_alias_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_
2218} 2218}
2219 2219
2220EOLIAN static void 2220EOLIAN static void
2221_efl_canvas_object_efl_ui_base_scale_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double scale) 2221_efl_canvas_object_efl_gfx_scale_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double scale)
2222{ 2222{
2223 if (obj->delete_me) return; 2223 if (obj->delete_me) return;
2224 if (EINA_DBL_EQ(obj->cur->scale, scale)) return; 2224 if (EINA_DBL_EQ(obj->cur->scale, scale)) return;
@@ -2233,7 +2233,7 @@ _efl_canvas_object_efl_ui_base_scale_set(Eo *eo_obj, Evas_Object_Protected_Data
2233} 2233}
2234 2234
2235EOLIAN static double 2235EOLIAN static double
2236_efl_canvas_object_efl_ui_base_scale_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) 2236_efl_canvas_object_efl_gfx_scale_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
2237{ 2237{
2238 if (obj->delete_me) return 1.0; 2238 if (obj->delete_me) return 1.0;
2239 return obj->cur->scale; 2239 return obj->cur->scale;
@@ -2307,7 +2307,7 @@ _efl_canvas_object_efl_object_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Dat
2307 layer = efl_gfx_stack_layer_get(eo_obj); 2307 layer = efl_gfx_stack_layer_get(eo_obj);
2308 name = efl_name_get(eo_obj); // evas_object_name_get(eo_obj); 2308 name = efl_name_get(eo_obj); // evas_object_name_get(eo_obj);
2309 geom = efl_gfx_geometry_get(eo_obj); 2309 geom = efl_gfx_geometry_get(eo_obj);
2310 scale = efl_ui_scale_get(eo_obj); 2310 scale = efl_gfx_scale_get(eo_obj);
2311 min = efl_gfx_size_hint_restricted_min_get(eo_obj); 2311 min = efl_gfx_size_hint_restricted_min_get(eo_obj);
2312 max = efl_gfx_size_hint_max_get(eo_obj); 2312 max = efl_gfx_size_hint_max_get(eo_obj);
2313 //efl_gfx_size_hint_request_get(eo_obj, &requestw, &requesth); 2313 //efl_gfx_size_hint_request_get(eo_obj, &requestw, &requesth);
@@ -2971,13 +2971,13 @@ evas_object_evas_get(const Eo *eo_obj)
2971EAPI void 2971EAPI void
2972evas_object_scale_set(Evas_Object *obj, double scale) 2972evas_object_scale_set(Evas_Object *obj, double scale)
2973{ 2973{
2974 efl_ui_scale_set(obj, scale); 2974 efl_gfx_scale_set(obj, scale);
2975} 2975}
2976 2976
2977EAPI double 2977EAPI double
2978evas_object_scale_get(const Evas_Object *obj) 2978evas_object_scale_get(const Evas_Object *obj)
2979{ 2979{
2980 return efl_ui_scale_get(obj); 2980 return efl_gfx_scale_get(obj);
2981} 2981}
2982 2982
2983/* Internal EO APIs and hidden overrides */ 2983/* Internal EO APIs and hidden overrides */
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index f0bf953..5145be6 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -2214,14 +2214,14 @@ evas_object_text_was_opaque(Evas_Object *eo_obj EINA_UNUSED,
2214} 2214}
2215 2215
2216EOLIAN static void 2216EOLIAN static void
2217_evas_text_efl_ui_base_scale_set(Evas_Object *eo_obj, Evas_Text_Data *o, 2217_evas_text_efl_gfx_scale_set(Evas_Object *eo_obj, Evas_Text_Data *o,
2218 double scale) 2218 double scale)
2219{ 2219{
2220 int size; 2220 int size;
2221 const char *font; 2221 const char *font;
2222 2222
2223 if (EINA_DBL_EQ(efl_ui_scale_get(eo_obj), scale)) return; 2223 if (EINA_DBL_EQ(efl_gfx_scale_get(eo_obj), scale)) return;
2224 efl_ui_scale_set(efl_super(eo_obj, MY_CLASS), scale); 2224 efl_gfx_scale_set(efl_super(eo_obj, MY_CLASS), scale);
2225 2225
2226 font = eina_stringshare_add(o->cur.font); 2226 font = eina_stringshare_add(o->cur.font);
2227 size = o->cur.size; 2227 size = o->cur.size;
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 37cbd34..3ba8c53 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -14600,12 +14600,12 @@ evas_object_textblock_was_opaque(Evas_Object *eo_obj EINA_UNUSED,
14600} 14600}
14601 14601
14602EOLIAN static void 14602EOLIAN static void
14603_efl_canvas_text_efl_ui_base_scale_set(Evas_Object *eo_obj, 14603_efl_canvas_text_efl_gfx_scale_set(Evas_Object *eo_obj,
14604 Efl_Canvas_Text_Data *o, 14604 Efl_Canvas_Text_Data *o,
14605 double scale) 14605 double scale)
14606{ 14606{
14607 if (EINA_DBL_EQ(efl_ui_scale_get(eo_obj), scale)) return; 14607 if (EINA_DBL_EQ(efl_gfx_scale_get(eo_obj), scale)) return;
14608 efl_ui_scale_set(efl_super(eo_obj, MY_CLASS), scale); 14608 efl_gfx_scale_set(efl_super(eo_obj, MY_CLASS), scale);
14609 14609
14610 _evas_textblock_invalidate_all(o); 14610 _evas_textblock_invalidate_all(o);
14611 _evas_textblock_changed(o, eo_obj); 14611 _evas_textblock_changed(o, eo_obj);
diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c
index df880c3..2402170 100644
--- a/src/lib/evas/canvas/evas_object_textgrid.c
+++ b/src/lib/evas/canvas/evas_object_textgrid.c
@@ -872,14 +872,14 @@ evas_object_textgrid_was_opaque(Evas_Object *eo_obj EINA_UNUSED,
872} 872}
873 873
874EOLIAN static void 874EOLIAN static void
875_evas_textgrid_efl_ui_base_scale_set(Evas_Object *eo_obj, Evas_Textgrid_Data *o, 875_evas_textgrid_efl_gfx_scale_set(Evas_Object *eo_obj, Evas_Textgrid_Data *o,
876 double scale) 876 double scale)
877{ 877{
878 int font_size; 878 int font_size;
879 const char *font_name; 879 const char *font_name;
880 880
881 if (EINA_DBL_EQ(efl_ui_scale_get(eo_obj), scale)) return; 881 if (EINA_DBL_EQ(efl_gfx_scale_get(eo_obj), scale)) return;
882 efl_ui_scale_set(efl_super(eo_obj, MY_CLASS), scale); 882 efl_gfx_scale_set(efl_super(eo_obj, MY_CLASS), scale);
883 883
884 font_name = eina_stringshare_add(o->cur.font_name); 884 font_name = eina_stringshare_add(o->cur.font_name);
885 font_size = o->cur.font_size; 885 font_size = o->cur.font_size;
diff --git a/src/lib/evas/canvas/evas_text.eo b/src/lib/evas/canvas/evas_text.eo
index b36218d..7a8049e 100644
--- a/src/lib/evas/canvas/evas_text.eo
+++ b/src/lib/evas/canvas/evas_text.eo
@@ -272,6 +272,7 @@ class Evas.Text (Efl.Canvas.Object, Efl.Text, Efl.Text.Properties,
272 Efl.Object.constructor; 272 Efl.Object.constructor;
273 Efl.Object.destructor; 273 Efl.Object.destructor;
274 Efl.Gfx.size { set; } 274 Efl.Gfx.size { set; }
275 Efl.Gfx.scale { set; }
275 Efl.Text.text { get; set; } 276 Efl.Text.text { get; set; }
276 Efl.Text.Properties.font { get; set; } 277 Efl.Text.Properties.font { get; set; }
277 Efl.Text.Properties.font_source { get; set; } 278 Efl.Text.Properties.font_source { get; set; }
@@ -282,6 +283,5 @@ class Evas.Text (Efl.Canvas.Object, Efl.Text, Efl.Text.Properties,
282 Efl.Canvas.Filter.Internal.filter_input_render; 283 Efl.Canvas.Filter.Internal.filter_input_render;
283 Efl.Canvas.Filter.Internal.filter_state_prepare; 284 Efl.Canvas.Filter.Internal.filter_state_prepare;
284 Efl.Canvas.Object.paragraph_direction { set; get; } 285 Efl.Canvas.Object.paragraph_direction { set; get; }
285 Efl.Ui.Base.scale { set; }
286 } 286 }
287} 287}
diff --git a/src/lib/evas/canvas/evas_textgrid.eo b/src/lib/evas/canvas/evas_textgrid.eo
index dcc2a82..51b4583 100644
--- a/src/lib/evas/canvas/evas_textgrid.eo
+++ b/src/lib/evas/canvas/evas_textgrid.eo
@@ -202,6 +202,6 @@ class Evas.Textgrid (Efl.Canvas.Object, Efl.Text.Properties, Efl.Text.Font,
202 Efl.Text.Properties.font { get; set; } 202 Efl.Text.Properties.font { get; set; }
203 Efl.Text.Properties.font_source { get; set; } 203 Efl.Text.Properties.font_source { get; set; }
204 Efl.Text.Font.font_bitmap_scalable { get; set; } 204 Efl.Text.Font.font_bitmap_scalable { get; set; }
205 Efl.Ui.Base.scale { set; } 205 Efl.Gfx.scale { set; }
206 } 206 }
207} 207}