diff options
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 f87e38ed7f..c827b80b2d 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 o = text = evas_object_text_add(evas_object_evas_get(win)); efl_event_callback_add(o, EFL_GFX_EVENT_RESIZE, _text_resize, NULL); efl_text_properties_font_set(o, "Sans:style=Bold", default_font_size); - efl_ui_scale_set(text, elm_config_scale_get()); + efl_gfx_scale_set(text, elm_config_scale_get()); efl_text_set(o, "EFL"); efl_gfx_visible_set(o, 1); efl_pack(box2, o); @@ -492,7 +492,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve efl_gfx_filter_data_set(o, prg_data[k].name, prg_data[k].value, prg_data[k].exec); evas_object_textblock_style_set(o, st); evas_object_textblock_text_markup_set(o, tbtxt); - efl_ui_scale_set(o, elm_config_scale_get()); + efl_gfx_scale_set(o, elm_config_scale_get()); efl_pack(box2, o); evas_object_resize(o, 1, 1); } diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c index a4520ba0b5..4bf32aa0f6 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) EAPI Eina_Bool edje_object_scale_set(Edje_Object *obj, double scale) { - efl_ui_scale_set(obj, scale); + efl_gfx_scale_set(obj, scale); return EINA_TRUE; } EAPI double edje_object_scale_get(const Edje_Object *obj) { - return efl_ui_scale_get(obj); + return efl_gfx_scale_get(obj); } /* Legacy part drag APIs */ diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo index 2be3869e9a..66d584bb4a 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, Efl.Canvas.Layout_Signal.signal_process; Efl.Ui.Base.mirrored { set; get; } Efl.Ui.Base.language { set; get; } - Efl.Ui.Base.scale { set; get; } + Efl.Gfx.scale { set; get; } Efl.File.load_error { get; } Efl.File.mmap { get; set; } Efl.Container.content_remove; diff --git a/src/lib/edje/edje_text.c b/src/lib/edje/edje_text.c index 4cf2d83933..8f88f490e0 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, if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path); else efl_text_properties_font_source_set(ep->object, NULL); - if (ep->part->scale) efl_ui_scale_set(ep->object, TO_DOUBLE(sc)); + if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); efl_text_set(ep->object, text); /* 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, if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path); else efl_text_properties_font_source_set(ep->object, NULL); - if (ep->part->scale) efl_ui_scale_set(ep->object, TO_DOUBLE(sc)); + if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); efl_text_properties_font_set(ep->object, font, size); efl_text_set(ep->object, text); @@ -389,7 +389,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep, if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path); else efl_text_properties_font_source_set(ep->object, NULL); - if (ep->part->scale) efl_ui_scale_set(ep->object, TO_DOUBLE(sc)); + if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); efl_text_properties_font_set(ep->object, font, size); part_get_geometry(ep, &tw, &th); @@ -401,7 +401,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep, { int current; - if (ep->part->scale) efl_ui_scale_set(ep->object, TO_DOUBLE(sc)); + if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); efl_text_properties_font_set(ep->object, font, 10); part_get_geometry(ep, &tw, &th); @@ -423,7 +423,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep, { current = (top + bottom) / 2; - if (ep->part->scale) efl_ui_scale_set(ep->object, TO_DOUBLE(sc)); + if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); efl_text_properties_font_set(ep->object, font, current); part_get_geometry(ep, &tw, &th); @@ -439,7 +439,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep, { current++; - if (ep->part->scale) efl_ui_scale_set(ep->object, TO_DOUBLE(sc)); + if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); efl_text_properties_font_set(ep->object, font, current); part_get_geometry(ep, &tw, &th); @@ -488,7 +488,7 @@ arrange_text: if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path); else efl_text_properties_font_source_set(ep->object, NULL); - if (ep->part->scale) efl_ui_scale_set(ep->object, TO_DOUBLE(sc)); + if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); efl_text_properties_font_set(ep->object, font, size); efl_text_set(ep->object, text); diff --git a/src/lib/edje/edje_textblock.c b/src/lib/edje/edje_textblock.c index 08d9092e5f..d331d69b1c 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, double s = base_s; if (ep->part->scale) base_s = TO_DOUBLE(sc); - efl_ui_scale_set(ep->object, base_s); + efl_gfx_scale_set(ep->object, base_s); efl_canvas_text_size_native_get(ep->object, &tw, &th); orig_s = base_s; @@ -467,7 +467,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, { orig_s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s, orig_s * TO_INT(params->eval.w) / tw); - efl_ui_scale_set(ep->object, orig_s); + efl_gfx_scale_set(ep->object, orig_s); efl_canvas_text_size_native_get(ep->object, &tw, &th); } if (chosen_desc->text.fit_x) @@ -476,7 +476,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, { s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s, orig_s * TO_INT(params->eval.w) / tw); - efl_ui_scale_set(ep->object, s); + efl_gfx_scale_set(ep->object, s); efl_canvas_text_size_native_get(ep->object, NULL, NULL); } } @@ -493,7 +493,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, s = tmp_s; } - efl_ui_scale_set(ep->object, s); + efl_gfx_scale_set(ep->object, s); efl_canvas_text_size_native_get(ep->object, NULL, NULL); } } @@ -518,7 +518,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, break; s = tmp_s; - efl_ui_scale_set(ep->object, s); + efl_gfx_scale_set(ep->object, s); efl_canvas_text_size_native_get(ep->object, &fw, &fh); i--; } diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c index a82620f5d4..47ee13d205 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) } EOLIAN void -_edje_object_efl_ui_base_scale_set(Eo *obj EINA_UNUSED, Edje *ed, double scale) +_edje_object_efl_gfx_scale_set(Eo *obj EINA_UNUSED, Edje *ed, double scale) { Edje *ged; Evas_Object *o; @@ -390,7 +390,7 @@ _edje_object_efl_ui_base_scale_set(Eo *obj EINA_UNUSED, Edje *ed, double scale) } EOLIAN double -_edje_object_efl_ui_base_scale_get(Eo *obj EINA_UNUSED, Edje *ed) +_edje_object_efl_gfx_scale_get(Eo *obj EINA_UNUSED, Edje *ed) { return TO_DOUBLE(ed->scale); } diff --git a/src/lib/efl/interfaces/efl_gfx.eo b/src/lib/efl/interfaces/efl_gfx.eo index 6daca53eff..0c300da8bc 100644 --- a/src/lib/efl/interfaces/efl_gfx.eo +++ b/src/lib/efl/interfaces/efl_gfx.eo @@ -115,6 +115,31 @@ interface Efl.Gfx { v: bool; [[$true if to make the object visible, $false otherwise]] } } + @property scale { + [[The scaling factor of an object. + + This property is an individual scaling factor on the object (Edje + or UI widget). This property (or Edje's global scaling factor, when + applicable), will affect this object's part sizes. If scale is + not zero, than the individual scaling will override any global + scaling set, for the object obj's parts. Set it back to zero to + get the effects of the global scaling again. + + Warning: In Edje, only parts which, at EDC level, had the "scale" + property set to 1, will be affected by this function. Check the + complete "syntax reference" for EDC files. + ]] + set { + [[Sets the scaling factor of an object.]] + } + get { + [[Gets an object's scaling factor.]] + } + values { + scale: double(0.0); [[The scaling factor (the default value is 0.0, + meaning individual scaling is not set)]] + } + } } events { 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 eb00535a2d..bfd133a42f 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 language: string; [[The current language.]] } } - @property scale { - [[The scaling factor of an object. - - This property is an individual scaling factor on the object (Edje - or UI widget). This property (or Edje's global scaling factor, when - applicable), will affect this object's part sizes. If scale is - not zero, than the individual scaling will override any global - scaling set, for the object obj's parts. Set it back to zero to - get the effects of the global scaling again. - - Warning: In Edje, only parts which, at EDC level, had the "scale" - property set to 1, will be affected by this function. Check the - complete "syntax reference" for EDC files. - ]] - set { - [[Sets the scaling factor of an object.]] - } - get { - [[Gets an object's scaling factor.]] - } - values { - scale: double(0.0); [[The scaling factor (the default value is 0.0, - meaning individual scaling is not set)]] - } - } } } diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c index 81b5dc59bd..8038e846ca 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) if (sd->no_scale) _efl_ui_image_internal_scale_set(obj, sd, 1.0); else - _efl_ui_image_internal_scale_set(obj, sd, efl_ui_scale_get(obj) * elm_config_scale_get()); + _efl_ui_image_internal_scale_set(obj, sd, efl_gfx_scale_get(obj) * elm_config_scale_get()); ts = sd->scale; sd->scale = 1.0; diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c index 65343c1194..0e42559af9 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, edje_object_scale_set (wd->resize_obj, - efl_ui_scale_get(obj) * elm_config_scale_get()); + efl_gfx_scale_get(obj) * elm_config_scale_get()); _efl_ui_layout_highlight_in_theme(obj); diff --git a/src/lib/elementary/efl_ui_multibuttonentry.c b/src/lib/elementary/efl_ui_multibuttonentry.c index d39d68c470..b884547ab4 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 if (str) hpad = atoi(str); str = elm_layout_data_get(obj, "vertical_pad"); if (str) vpad = atoi(str); - pad_scale = efl_ui_scale_get(obj) * elm_config_scale_get() + pad_scale = efl_gfx_scale_get(obj) * elm_config_scale_get() / edje_object_base_scale_get(elm_layout_edje_get(obj)); elm_box_padding_set(sd->box, (hpad * pad_scale), (vpad * pad_scale)); @@ -1437,7 +1437,7 @@ _view_init(Evas_Object *obj, Efl_Ui_Multibuttonentry_Data *sd) if (str) hpad = atoi(str); str = elm_layout_data_get(obj, "vertical_pad"); if (str) vpad = atoi(str); - pad_scale = efl_ui_scale_get(obj) * elm_config_scale_get() + pad_scale = efl_gfx_scale_get(obj) * elm_config_scale_get() / edje_object_base_scale_get(elm_layout_edje_get(obj)); elm_box_padding_set(sd->box, (hpad * pad_scale), (vpad * pad_scale)); diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c index 10d67b4289..b103c44829 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) if (_is_horizontal(sd->dir)) evas_object_size_hint_min_set - (sd->spacer, (double)sd->size * efl_ui_scale_get(obj) * + (sd->spacer, (double)sd->size * efl_gfx_scale_get(obj) * elm_config_scale_get(), 1); else evas_object_size_hint_min_set - (sd->spacer, 1, (double)sd->size * efl_ui_scale_get(obj) * + (sd->spacer, 1, (double)sd->size * efl_gfx_scale_get(obj) * elm_config_scale_get()); if (_is_inverted(sd->dir)) @@ -397,11 +397,11 @@ _progressbar_span_size_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, Evas_Coord size if (_is_horizontal(sd->dir)) evas_object_size_hint_min_set - (sd->spacer, (double)sd->size * efl_ui_scale_get(obj) * + (sd->spacer, (double)sd->size * efl_gfx_scale_get(obj) * elm_config_scale_get(), 1); else evas_object_size_hint_min_set - (sd->spacer, 1, (double)sd->size * efl_ui_scale_get(obj) * + (sd->spacer, 1, (double)sd->size * efl_gfx_scale_get(obj) * elm_config_scale_get()); elm_layout_sizing_eval(obj); diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c index 1474664df7..59a86c149b 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, _elm_theme_set(elm_widget_theme_get(obj), *popup, "slider", "horizontal/popup", elm_widget_style_get(obj)); else _elm_theme_set(elm_widget_theme_get(obj), *popup, "slider", "vertical/popup", elm_widget_style_get(obj)); - edje_object_scale_set(*popup, efl_ui_scale_get(obj) * + edje_object_scale_set(*popup, efl_gfx_scale_get(obj) * elm_config_scale_get()); edje_object_signal_callback_add(*popup, "popup,hide,done", "elm", // XXX: for compat _popup_hide_done, obj); @@ -739,10 +739,10 @@ _efl_ui_slider_elm_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd) if (sd->popup) { - edje_object_scale_set(sd->popup, efl_ui_scale_get(obj) * + edje_object_scale_set(sd->popup, efl_gfx_scale_get(obj) * elm_config_scale_get()); if (sd->intvl_enable && sd->popup2) - edje_object_scale_set(sd->popup2, efl_ui_scale_get(obj) * + edje_object_scale_set(sd->popup2, efl_gfx_scale_get(obj) * elm_config_scale_get()); else if (sd->intvl_enable && !sd->popup2) _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) if (_is_horizontal(sd->dir)) evas_object_size_hint_min_set - (sd->spacer, (double)sd->size * efl_ui_scale_get(obj) * + (sd->spacer, (double)sd->size * efl_gfx_scale_get(obj) * elm_config_scale_get(), 1); else evas_object_size_hint_min_set - (sd->spacer, 1, (double)sd->size * efl_ui_scale_get(obj) * + (sd->spacer, 1, (double)sd->size * efl_gfx_scale_get(obj) * elm_config_scale_get()); if (sd->intvl_enable) @@ -1026,11 +1026,11 @@ _efl_ui_slider_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Slider_Data *sd) if (_is_horizontal(sd->dir)) evas_object_size_hint_min_set - (sd->spacer, (double)sd->size * efl_ui_scale_get(obj) * + (sd->spacer, (double)sd->size * efl_gfx_scale_get(obj) * elm_config_scale_get(), 1); else evas_object_size_hint_min_set - (sd->spacer, 1, (double)sd->size * efl_ui_scale_get(obj) * + (sd->spacer, 1, (double)sd->size * efl_gfx_scale_get(obj) * elm_config_scale_get()); _val_fetch(obj, EINA_FALSE); diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index c44ccb391f..b568e221b8 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) edje_object_scale_set (wd->resize_obj, - efl_ui_scale_get(obj) * elm_config_scale_get()); + efl_gfx_scale_get(obj) * elm_config_scale_get()); _mirrored_set(obj, efl_ui_mirrored_get(obj)); diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 2c89a4e77a..3a3d8230d5 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) edje_object_mirrored_set(sd->legacy.edje, efl_ui_mirrored_get(obj)); edje_object_scale_set(sd->legacy.edje, - efl_ui_scale_get(obj) * elm_config_scale_get()); + efl_gfx_scale_get(obj) * elm_config_scale_get()); efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_THEME_CHANGED, NULL); 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 757363d5fa..95a03df743 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) } edje_object_scale_set - (wd->resize_obj, efl_ui_scale_get(obj) * + (wd->resize_obj, efl_gfx_scale_get(obj) * elm_config_scale_get()); for (i = 0; i < 6; i++) @@ -435,7 +435,7 @@ _time_update(Evas_Object *obj, Eina_Bool theme_update) elm_widget_theme_object_set (obj, sd->digit[i], "clock", "flipdigit", style); edje_object_scale_set - (sd->digit[i], efl_ui_scale_get(obj) * + (sd->digit[i], efl_gfx_scale_get(obj) * elm_config_scale_get()); if ((sd->edit) && (sd->digedit & (1 << i))) @@ -469,7 +469,7 @@ _time_update(Evas_Object *obj, Eina_Bool theme_update) edje_object_add(evas_object_evas_get(wd->resize_obj)); elm_widget_theme_object_set (obj, sd->am_pm_obj, "clock", "flipampm", style); - edje_object_scale_set(sd->am_pm_obj, efl_ui_scale_get(obj) * + edje_object_scale_set(sd->am_pm_obj, efl_gfx_scale_get(obj) * _elm_config->scale); if (sd->edit) edje_object_signal_emit diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index c51641e416..625e63665c 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) (wd->resize_obj, "vertical_pad"); if (vpadstr) v_pad = atoi(vpadstr); - scale = efl_ui_scale_get(obj) * elm_config_scale_get() / edje_object_base_scale_get(wd->resize_obj); + scale = efl_gfx_scale_get(obj) * elm_config_scale_get() / edje_object_base_scale_get(wd->resize_obj); efl_pack_padding_set(sd->palette_box, h_pad * scale, v_pad * scale, 0); EINA_LIST_FOREACH(sd->items, elist, eo_item) @@ -1919,7 +1919,7 @@ _create_colorpalette(Evas_Object *obj) vpadstr = edje_object_data_get(wd->resize_obj, "vertical_pad"); if (vpadstr) v_pad = atoi(vpadstr); - scale = efl_ui_scale_get(obj) * elm_config_scale_get() / edje_object_base_scale_get(wd->resize_obj); + scale = efl_gfx_scale_get(obj) * elm_config_scale_get() / edje_object_base_scale_get(wd->resize_obj); efl_pack_padding_set(sd->palette_box, h_pad * scale, v_pad * scale, 0); efl_pack_align_set(sd->palette_box, 0.0, 0.0); 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 ad70e9b039..be39d2dc2b 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) edje_object_scale_set (wd->resize_obj, - efl_ui_scale_get(obj) * elm_config_scale_get()); + efl_gfx_scale_get(obj) * elm_config_scale_get()); _mirrored_set(obj, efl_ui_mirrored_get(obj)); diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index 8f5615fbd7..a8939b58f4 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) edje_object_mirrored_set(VIEW(it), efl_ui_mirrored_get(WIDGET(it))); edje_object_scale_set(VIEW(it), - efl_ui_scale_get(WIDGET(it)) + efl_gfx_scale_get(WIDGET(it)) * elm_config_scale_get()); evas_object_hide(itc->base_view); @@ -1142,7 +1142,7 @@ _view_style_update(Elm_Gen_Item *it, Evas_Object *view, const char *style) } edje_object_mirrored_set(view, efl_ui_mirrored_get(WIDGET(it))); - edje_object_scale_set(view, efl_ui_scale_get(WIDGET(it)) * + edje_object_scale_set(view, efl_gfx_scale_get(WIDGET(it)) * elm_config_scale_get()); evas_object_stack_below(view, sd->stack); } @@ -1156,7 +1156,7 @@ _view_create(Elm_Gen_Item *it, const char *style) Evas_Object *view = edje_object_add(evas_object_evas_get(WIDGET(it))); evas_object_smart_member_add(view, GG_IT(it)->wsd->pan_obj); elm_widget_sub_object_add(WIDGET(it), view); - edje_object_scale_set(view, efl_ui_scale_get(WIDGET(it)) * + edje_object_scale_set(view, efl_gfx_scale_get(WIDGET(it)) * elm_config_scale_get()); _view_style_update(it, view, style); diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index 8a59d2fa54..3d219e5359 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) } edje_object_mirrored_set(view, efl_ui_mirrored_get(WIDGET(it))); - edje_object_scale_set(view, efl_ui_scale_get(WIDGET(it)) + edje_object_scale_set(view, efl_gfx_scale_get(WIDGET(it)) * elm_config_scale_get()); stacking_even = edje_object_data_get(view, "stacking_even"); @@ -589,7 +589,7 @@ _view_create(Elm_Gen_Item *it, const char *style) Evas_Object *view = edje_object_add(evas_object_evas_get(WIDGET(it))); evas_object_smart_member_add(view, it->item->wsd->pan_obj); elm_widget_sub_object_add(WIDGET(it), view); - edje_object_scale_set(view, efl_ui_scale_get(WIDGET(it)) * + edje_object_scale_set(view, efl_gfx_scale_get(WIDGET(it)) * elm_config_scale_get()); _view_style_update(it, view, style); @@ -1400,7 +1400,7 @@ _decorate_all_item_realize(Elm_Gen_Item *it, if (it->item->decorate_all_item_realized) return; it->deco_all_view = edje_object_add(evas_object_evas_get(WIDGET(it))); - edje_object_scale_set(it->deco_all_view, efl_ui_scale_get(WIDGET(it)) * + edje_object_scale_set(it->deco_all_view, efl_gfx_scale_get(WIDGET(it)) * elm_config_scale_get()); evas_object_smart_member_add(it->deco_all_view, sd->pan_obj); 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) edje_object_mirrored_set(itc->base_view, efl_ui_mirrored_get(WIDGET(it))); edje_object_scale_set(itc->base_view, - efl_ui_scale_get(WIDGET(it)) + efl_gfx_scale_get(WIDGET(it)) * elm_config_scale_get()); it->spacer = NULL; diff --git a/src/lib/elementary/elm_image_legacy.h b/src/lib/elementary/elm_image_legacy.h index 205b35688f..577adfd6e9 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 * This function disables scaling of the elm_image widget through the function * elm_object_scale_set(). However, this does not affect the widget size/resize * in any way. For that effect, take a look at @ref elm_image_resizable_get and - * @ref efl_ui_scale_get + * @ref efl_gfx_scale_get * * @param[in] no_scale @c true if the object is not scalable, @c false * otherwise. Default is @c false. @@ -505,7 +505,7 @@ EAPI void elm_image_no_scale_set(Evas_Object *obj, Eina_Bool no_scale); * This function disables scaling of the elm_image widget through the function * elm_object_scale_set(). However, this does not affect the widget size/resize * in any way. For that effect, take a look at @ref elm_image_resizable_get and - * @ref efl_ui_scale_get + * @ref efl_gfx_scale_get * * @return @c true if the object is not scalable, @c false otherwise. Default * is @c false. diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c index 1b7f239abf..27a4253038 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) { ELM_LIST_ITEM_DATA_GET(eo_it, it); edje_object_scale_set - (VIEW(it), efl_ui_scale_get(obj) * elm_config_scale_get()); + (VIEW(it), efl_gfx_scale_get(obj) * elm_config_scale_get()); it->fixed = EINA_FALSE; } diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c index 7789b8b348..b16e18e2bf 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, double scale) { EINA_SAFETY_ON_NULL_RETURN(obj); - efl_ui_scale_set(obj, scale); + efl_gfx_scale_set(obj, scale); } EAPI double elm_object_scale_get(const Evas_Object *obj) { EINA_SAFETY_ON_NULL_RETURN_VAL(obj, 0.0); - return efl_ui_scale_get(obj); + return efl_gfx_scale_get(obj); } EAPI void diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c index cb34abbb65..446f58e362 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) elm_wdg_item_disable(eo_item); /* SEOZ edje_object_scale_set - (VIEW(item), efl_ui_scale_get(obj) * + (VIEW(item), efl_gfx_scale_get(obj) * elm_config_scale_get()); */ } diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c index 6a0b72c9af..9e6572abfd 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) if (sd->block_events) _block_events_theme_apply(obj); edje_object_scale_set - (sd->notify, efl_ui_scale_get(obj) * elm_config_scale_get()); + (sd->notify, efl_gfx_scale_get(obj) * elm_config_scale_get()); _sizing_eval(obj); diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c index 151dc26eca..531cc0c5e7 100644 --- a/src/lib/elementary/elm_photo.c +++ b/src/lib/elementary/elm_photo.c @@ -37,7 +37,7 @@ _sizing_eval(Evas_Object *obj) if (sd->size <= 0) return; - scale = (sd->size * efl_ui_scale_get(obj) * elm_config_scale_get()); + scale = (sd->size * efl_gfx_scale_get(obj) * elm_config_scale_get()); evas_object_size_hint_min_set(sd->icon, scale, scale); 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) (obj, wd->resize_obj, "photo", "base", elm_widget_style_get(obj)); - elm_object_scale_set(sd->icon, efl_ui_scale_get(obj)); + elm_object_scale_set(sd->icon, efl_gfx_scale_get(obj)); edje_object_scale_set(wd->resize_obj, - efl_ui_scale_get(obj) * elm_config_scale_get()); + efl_gfx_scale_get(obj) * elm_config_scale_get()); _sizing_eval(obj); return int_ret; @@ -260,7 +260,7 @@ _elm_photo_efl_canvas_group_group_add(Eo *obj, Elm_Photo_Data *priv) elm_image_fill_outside_set(priv->icon, !priv->fill_inside); elm_image_prescale_set(priv->icon, 0); - elm_object_scale_set(priv->icon, efl_ui_scale_get(obj)); + elm_object_scale_set(priv->icon, efl_gfx_scale_get(obj)); evas_object_event_callback_add (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 600219f74f..2c1099848e 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 elm_widget_theme_object_set (obj, VIEW(it), "segment_control", "item", elm_widget_style_get(obj)); - edje_object_scale_set(VIEW(it), efl_ui_scale_get(WIDGET(it)) * + edje_object_scale_set(VIEW(it), efl_gfx_scale_get(WIDGET(it)) * elm_config_scale_get()); edje_object_mirrored_set(VIEW(it), rtl); } @@ -597,7 +597,7 @@ _elm_segment_control_item_efl_object_constructor(Eo *obj, Elm_Segment_Control_It parent = efl_parent_get(obj); VIEW(it) = edje_object_add(evas_object_evas_get(parent)); - edje_object_scale_set(VIEW(it),efl_ui_scale_get(WIDGET(it)) * + edje_object_scale_set(VIEW(it),efl_gfx_scale_get(WIDGET(it)) * elm_config_scale_get()); evas_object_smart_member_add(VIEW(it), parent); diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index e7df14afad..21def5ddc1 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) (wd->resize_obj, "icon_size"); if (icon_size) - return (int)(atoi(icon_size) * efl_ui_scale_get(obj) * elm_config_scale_get() + return (int)(atoi(icon_size) * efl_gfx_scale_get(obj) * elm_config_scale_get() / edje_object_base_scale_get(wd->resize_obj)); return _elm_config->icon_size; @@ -1496,7 +1496,7 @@ _elm_toolbar_elm_widget_theme_apply(Eo *obj, Elm_Toolbar_Data *sd) if (sd->priv_icon_size) sd->icon_size = sd->priv_icon_size; else sd->icon_size = sd->theme_icon_size; - scale = (efl_ui_scale_get(obj) * elm_config_scale_get()); + scale = (efl_gfx_scale_get(obj) * elm_config_scale_get()); EINA_INLIST_FOREACH(sd->items, it) _item_theme_hook(obj, it, scale, sd->icon_size); @@ -1624,7 +1624,7 @@ _elm_toolbar_item_elm_widget_item_part_content_set(Eo *eo_item EINA_UNUSED, Elm_ if (item->object) elm_widget_sub_object_add(obj, item->object); - scale = (efl_ui_scale_get(obj) * elm_config_scale_get()); + scale = (efl_gfx_scale_get(obj) * elm_config_scale_get()); _item_theme_hook(obj, item, scale, sd->icon_size); } @@ -1658,7 +1658,7 @@ _elm_toolbar_item_elm_widget_item_part_content_unset(Eo *eo_item EINA_UNUSED, El _elm_widget_sub_object_redirect_to_top(obj, item->object); o = item->object; item->object = NULL; - scale = (efl_ui_scale_get(obj) * elm_config_scale_get()); + scale = (efl_gfx_scale_get(obj) * elm_config_scale_get()); _item_theme_hook(obj, item, scale, sd->icon_size); return o; @@ -2999,7 +2999,7 @@ _elm_toolbar_item_append(Eo *obj, Elm_Toolbar_Data *sd, const char *icon, const it = _item_new(obj, icon, label, func, data); if (!it) return NULL; - scale = (efl_ui_scale_get(obj) * elm_config_scale_get()); + scale = (efl_gfx_scale_get(obj) * elm_config_scale_get()); prev_list = evas_object_box_children_get(sd->bx); @@ -3025,7 +3025,7 @@ _elm_toolbar_item_prepend(Eo *obj, Elm_Toolbar_Data *sd, const char *icon, const it = _item_new(obj, icon, label, func, data); if (!it) return NULL; - scale = (efl_ui_scale_get(obj) * elm_config_scale_get()); + scale = (efl_gfx_scale_get(obj) * elm_config_scale_get()); prev_list = evas_object_box_children_get(sd->bx); @@ -3054,7 +3054,7 @@ _elm_toolbar_item_insert_before(Eo *obj, Elm_Toolbar_Data *sd, Elm_Object_Item * it = _item_new(obj, icon, label, func, data); if (!it) return NULL; - scale = (efl_ui_scale_get(obj) * elm_config_scale_get()); + scale = (efl_gfx_scale_get(obj) * elm_config_scale_get()); prev_list = evas_object_box_children_get(sd->bx); @@ -3083,7 +3083,7 @@ _elm_toolbar_item_insert_after(Eo *obj, Elm_Toolbar_Data *sd, Elm_Object_Item *e it = _item_new(obj, icon, label, func, data); if (!it) return NULL; - scale = (efl_ui_scale_get(obj) * elm_config_scale_get()); + scale = (efl_gfx_scale_get(obj) * elm_config_scale_get()); prev_list = evas_object_box_children_get(sd->bx); @@ -3329,7 +3329,7 @@ _elm_toolbar_item_separator_set(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data * if (item->separator == separator) return; item->separator = separator; - scale = (efl_ui_scale_get(obj) * elm_config_scale_get()); + scale = (efl_gfx_scale_get(obj) * elm_config_scale_get()); _item_theme_hook(obj, item, scale, sd->icon_size); evas_object_size_hint_min_set(VIEW(item), -1, -1); if (separator) sd->separator_count++; diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c index d174bf7dca..7c0289ec24 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 * need to reset sobj's scale to 5. * Note that each widget's scale is 0 by default. */ - double scale, pscale = efl_ui_scale_get(sobj); + double scale, pscale = efl_gfx_scale_get(sobj); Elm_Theme *th, *pth = elm_widget_theme_get(sobj); - scale = efl_ui_scale_get(sobj); + scale = efl_gfx_scale_get(sobj); th = elm_widget_theme_get(sobj); mirrored = efl_ui_mirrored_get(sobj); @@ -2658,7 +2658,7 @@ elm_widget_scroll_freeze_get(const Eo *obj) } EOLIAN static void -_elm_widget_efl_ui_base_scale_set(Eo *obj, Elm_Widget_Smart_Data *sd, double scale) +_elm_widget_efl_gfx_scale_set(Eo *obj, Elm_Widget_Smart_Data *sd, double scale) { if (scale < 0.0) scale = 0.0; if (sd->scale != scale) @@ -2669,14 +2669,14 @@ _elm_widget_efl_ui_base_scale_set(Eo *obj, Elm_Widget_Smart_Data *sd, double sca } EOLIAN static double -_elm_widget_efl_ui_base_scale_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) +_elm_widget_efl_gfx_scale_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { // FIXME: save walking up the tree by storing/caching parent scale if (sd->scale == 0.0) { if (sd->parent_obj && elm_widget_is(sd->parent_obj)) { - return efl_ui_scale_get(sd->parent_obj); + return efl_gfx_scale_get(sd->parent_obj); } else { diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo index 6752380ce1..1747b4cc60 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, Efl.Gfx.visible { set; } Efl.Gfx.position { set; } Efl.Gfx.size { set; } + Efl.Gfx.scale { set; get; } Efl.Canvas.Object.clip { set; } Efl.Canvas.Object.no_render { set; } Efl.Canvas.Object.is_frame_object { set; } @@ -621,7 +622,6 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access, Efl.Ui.Focus.User.parent { get; } Efl.Ui.Focus.Object.focus_geometry { get; } Efl.Ui.Focus.Object.focus { set; } - Efl.Ui.Base.scale { get; set; } Efl.Ui.Base.mirrored { get; set; } Efl.Ui.Base.mirrored_automatic { get; set; } 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 5b46c4f148..0ceb456248 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, Efl.Gfx.Size.Hint.hint_max { get; set; } Efl.Gfx.Size.Hint.hint_margin { get; set; } Efl.Gfx.Size.Hint.hint_weight { get; set; } - Efl.Ui.Base.scale { get; set; } + Efl.Gfx.scale { set; get; } Efl.Input.Interface.seat_event_filter { get; set; } Efl.Loop_User.loop { get; } } diff --git a/src/lib/evas/canvas/efl_canvas_text.eo b/src/lib/evas/canvas/efl_canvas_text.eo index 7d04742ba2..02cad37d00 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, Efl.Text.Annotate.cursor_object_item_insert; Efl.Text.Markup.markup { set; get; } Efl.Text.Markup.cursor_markup_insert; - Efl.Ui.Base.scale { set; } + Efl.Gfx.scale { set; } } events { 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 01fb1e4c04..7ffd1d7f7e 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_ } EOLIAN static void -_efl_canvas_object_efl_ui_base_scale_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double scale) +_efl_canvas_object_efl_gfx_scale_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double scale) { if (obj->delete_me) return; 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 } EOLIAN static double -_efl_canvas_object_efl_ui_base_scale_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) +_efl_canvas_object_efl_gfx_scale_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { if (obj->delete_me) return 1.0; return obj->cur->scale; @@ -2307,7 +2307,7 @@ _efl_canvas_object_efl_object_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Dat layer = efl_gfx_stack_layer_get(eo_obj); name = efl_name_get(eo_obj); // evas_object_name_get(eo_obj); geom = efl_gfx_geometry_get(eo_obj); - scale = efl_ui_scale_get(eo_obj); + scale = efl_gfx_scale_get(eo_obj); min = efl_gfx_size_hint_restricted_min_get(eo_obj); max = efl_gfx_size_hint_max_get(eo_obj); //efl_gfx_size_hint_request_get(eo_obj, &requestw, &requesth); @@ -2971,13 +2971,13 @@ evas_object_evas_get(const Eo *eo_obj) EAPI void evas_object_scale_set(Evas_Object *obj, double scale) { - efl_ui_scale_set(obj, scale); + efl_gfx_scale_set(obj, scale); } EAPI double evas_object_scale_get(const Evas_Object *obj) { - return efl_ui_scale_get(obj); + return efl_gfx_scale_get(obj); } /* 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 f0bf953e54..5145be615d 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, } EOLIAN static void -_evas_text_efl_ui_base_scale_set(Evas_Object *eo_obj, Evas_Text_Data *o, +_evas_text_efl_gfx_scale_set(Evas_Object *eo_obj, Evas_Text_Data *o, double scale) { int size; const char *font; - if (EINA_DBL_EQ(efl_ui_scale_get(eo_obj), scale)) return; - efl_ui_scale_set(efl_super(eo_obj, MY_CLASS), scale); + if (EINA_DBL_EQ(efl_gfx_scale_get(eo_obj), scale)) return; + efl_gfx_scale_set(efl_super(eo_obj, MY_CLASS), scale); font = eina_stringshare_add(o->cur.font); 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 37cbd34f55..3ba8c5349f 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, } EOLIAN static void -_efl_canvas_text_efl_ui_base_scale_set(Evas_Object *eo_obj, +_efl_canvas_text_efl_gfx_scale_set(Evas_Object *eo_obj, Efl_Canvas_Text_Data *o, double scale) { - if (EINA_DBL_EQ(efl_ui_scale_get(eo_obj), scale)) return; - efl_ui_scale_set(efl_super(eo_obj, MY_CLASS), scale); + if (EINA_DBL_EQ(efl_gfx_scale_get(eo_obj), scale)) return; + efl_gfx_scale_set(efl_super(eo_obj, MY_CLASS), scale); _evas_textblock_invalidate_all(o); _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 df880c3e5f..2402170a6c 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, } EOLIAN static void -_evas_textgrid_efl_ui_base_scale_set(Evas_Object *eo_obj, Evas_Textgrid_Data *o, +_evas_textgrid_efl_gfx_scale_set(Evas_Object *eo_obj, Evas_Textgrid_Data *o, double scale) { int font_size; const char *font_name; - if (EINA_DBL_EQ(efl_ui_scale_get(eo_obj), scale)) return; - efl_ui_scale_set(efl_super(eo_obj, MY_CLASS), scale); + if (EINA_DBL_EQ(efl_gfx_scale_get(eo_obj), scale)) return; + efl_gfx_scale_set(efl_super(eo_obj, MY_CLASS), scale); font_name = eina_stringshare_add(o->cur.font_name); 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 b36218d969..7a8049e200 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, Efl.Object.constructor; Efl.Object.destructor; Efl.Gfx.size { set; } + Efl.Gfx.scale { set; } Efl.Text.text { get; set; } Efl.Text.Properties.font { get; set; } Efl.Text.Properties.font_source { get; set; } @@ -282,6 +283,5 @@ class Evas.Text (Efl.Canvas.Object, Efl.Text, Efl.Text.Properties, Efl.Canvas.Filter.Internal.filter_input_render; Efl.Canvas.Filter.Internal.filter_state_prepare; Efl.Canvas.Object.paragraph_direction { set; get; } - Efl.Ui.Base.scale { set; } } } diff --git a/src/lib/evas/canvas/evas_textgrid.eo b/src/lib/evas/canvas/evas_textgrid.eo index dcc2a8274b..51b4583ea4 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, Efl.Text.Properties.font { get; set; } Efl.Text.Properties.font_source { get; set; } Efl.Text.Font.font_bitmap_scalable { get; set; } - Efl.Ui.Base.scale { set; } + Efl.Gfx.scale { set; } } } |