efl.gfx: move scale{} from efl.ui.base to efl.gfx

This commit is contained in:
Amitesh Singh 2017-12-01 11:51:56 +09:00
parent 769aeb5fcc
commit 7144f278f5
38 changed files with 120 additions and 120 deletions

View File

@ -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)); o = text = evas_object_text_add(evas_object_evas_get(win));
efl_event_callback_add(o, EFL_GFX_EVENT_RESIZE, _text_resize, NULL); 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_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_text_set(o, "EFL");
efl_gfx_visible_set(o, 1); efl_gfx_visible_set(o, 1);
efl_pack(box2, o); 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); 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_style_set(o, st);
evas_object_textblock_text_markup_set(o, tbtxt); 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); efl_pack(box2, o);
evas_object_resize(o, 1, 1); evas_object_resize(o, 1, 1);
} }

View File

@ -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) 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; return EINA_TRUE;
} }
EAPI double edje_object_scale_get(const Edje_Object *obj) 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 */ /* Legacy part drag APIs */

View File

@ -125,7 +125,7 @@ class Edje.Object (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
Efl.Canvas.Layout_Signal.signal_process; Efl.Canvas.Layout_Signal.signal_process;
Efl.Ui.Base.mirrored { set; get; } Efl.Ui.Base.mirrored { set; get; }
Efl.Ui.Base.language { 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.load_error { get; }
Efl.File.mmap { get; set; } Efl.File.mmap { get; set; }
Efl.Container.content_remove; Efl.Container.content_remove;

View File

@ -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); if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
else efl_text_properties_font_source_set(ep->object, NULL); 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); efl_text_set(ep->object, text);
/* the fit shoult not depend on font size, because it give the differet /* 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); if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
else efl_text_properties_font_source_set(ep->object, NULL); 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_properties_font_set(ep->object, font, size);
efl_text_set(ep->object, text); 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); if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
else efl_text_properties_font_source_set(ep->object, NULL); 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_properties_font_set(ep->object, font, size);
part_get_geometry(ep, &tw, &th); part_get_geometry(ep, &tw, &th);
@ -401,7 +401,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
{ {
int current; 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); efl_text_properties_font_set(ep->object, font, 10);
part_get_geometry(ep, &tw, &th); part_get_geometry(ep, &tw, &th);
@ -423,7 +423,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
{ {
current = (top + bottom) / 2; 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); efl_text_properties_font_set(ep->object, font, current);
part_get_geometry(ep, &tw, &th); part_get_geometry(ep, &tw, &th);
@ -439,7 +439,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
{ {
current++; 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); efl_text_properties_font_set(ep->object, font, current);
part_get_geometry(ep, &tw, &th); 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); if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
else efl_text_properties_font_source_set(ep->object, NULL); 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_properties_font_set(ep->object, font, size);
efl_text_set(ep->object, text); efl_text_set(ep->object, text);

View File

@ -458,7 +458,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
double s = base_s; double s = base_s;
if (ep->part->scale) base_s = TO_DOUBLE(sc); 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); efl_canvas_text_size_native_get(ep->object, &tw, &th);
orig_s = base_s; 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 = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s,
orig_s * TO_INT(params->eval.w) / tw); 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); efl_canvas_text_size_native_get(ep->object, &tw, &th);
} }
if (chosen_desc->text.fit_x) 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, s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s,
orig_s * TO_INT(params->eval.w) / tw); 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); 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; 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); efl_canvas_text_size_native_get(ep->object, NULL, NULL);
} }
} }
@ -518,7 +518,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
break; break;
s = tmp_s; 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); efl_canvas_text_size_native_get(ep->object, &fw, &fh);
i--; i--;
} }

View File

@ -364,7 +364,7 @@ edje_password_show_last_timeout_set(double password_show_last_timeout)
} }
EOLIAN void 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; Edje *ged;
Evas_Object *o; Evas_Object *o;
@ -390,7 +390,7 @@ _edje_object_efl_ui_base_scale_set(Eo *obj EINA_UNUSED, Edje *ed, double scale)
} }
EOLIAN double 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); return TO_DOUBLE(ed->scale);
} }

View File

@ -115,6 +115,31 @@ interface Efl.Gfx {
v: bool; [[$true if to make the object visible, $false otherwise]] 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 { events {
show; [[Object just became visible.]] show; [[Object just became visible.]]

View File

@ -40,30 +40,5 @@ interface Efl.Ui.Base
language: string; [[The current language.]] 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)]]
}
}
} }
} }

View File

@ -767,7 +767,7 @@ _efl_ui_image_sizing_eval(Evas_Object *obj)
if (sd->no_scale) if (sd->no_scale)
_efl_ui_image_internal_scale_set(obj, sd, 1.0); _efl_ui_image_internal_scale_set(obj, sd, 1.0);
else 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; ts = sd->scale;
sd->scale = 1.0; sd->scale = 1.0;

View File

@ -323,7 +323,7 @@ _visuals_refresh(Evas_Object *obj,
edje_object_scale_set edje_object_scale_set
(wd->resize_obj, (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); _efl_ui_layout_highlight_in_theme(obj);

View File

@ -109,7 +109,7 @@ _efl_ui_multibuttonentry_elm_widget_theme_apply(Eo *obj, Efl_Ui_Multibuttonentry
if (str) hpad = atoi(str); if (str) hpad = atoi(str);
str = elm_layout_data_get(obj, "vertical_pad"); str = elm_layout_data_get(obj, "vertical_pad");
if (str) vpad = atoi(str); 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)); / edje_object_base_scale_get(elm_layout_edje_get(obj));
elm_box_padding_set(sd->box, (hpad * pad_scale), (vpad * pad_scale)); 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); if (str) hpad = atoi(str);
str = elm_layout_data_get(obj, "vertical_pad"); str = elm_layout_data_get(obj, "vertical_pad");
if (str) vpad = atoi(str); 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)); / edje_object_base_scale_get(elm_layout_edje_get(obj));
elm_box_padding_set(sd->box, (hpad * pad_scale), (vpad * pad_scale)); elm_box_padding_set(sd->box, (hpad * pad_scale), (vpad * pad_scale));

View File

@ -225,11 +225,11 @@ _efl_ui_progressbar_elm_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *sd)
if (_is_horizontal(sd->dir)) if (_is_horizontal(sd->dir))
evas_object_size_hint_min_set 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); elm_config_scale_get(), 1);
else else
evas_object_size_hint_min_set 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_config_scale_get());
if (_is_inverted(sd->dir)) 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)) if (_is_horizontal(sd->dir))
evas_object_size_hint_min_set 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); elm_config_scale_get(), 1);
else else
evas_object_size_hint_min_set 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_config_scale_get());
elm_layout_sizing_eval(obj); elm_layout_sizing_eval(obj);

View File

@ -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)); _elm_theme_set(elm_widget_theme_get(obj), *popup, "slider", "horizontal/popup", elm_widget_style_get(obj));
else else
_elm_theme_set(elm_widget_theme_get(obj), *popup, "slider", "vertical/popup", elm_widget_style_get(obj)); _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()); elm_config_scale_get());
edje_object_signal_callback_add(*popup, "popup,hide,done", "elm", // XXX: for compat edje_object_signal_callback_add(*popup, "popup,hide,done", "elm", // XXX: for compat
_popup_hide_done, obj); _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) 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()); elm_config_scale_get());
if (sd->intvl_enable && sd->popup2) 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()); elm_config_scale_get());
else if (sd->intvl_enable && !sd->popup2) else if (sd->intvl_enable && !sd->popup2)
_popup_add(sd, obj, &sd->popup2, &sd->track2, EINA_TRUE); _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)) if (_is_horizontal(sd->dir))
evas_object_size_hint_min_set 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); elm_config_scale_get(), 1);
else else
evas_object_size_hint_min_set 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_config_scale_get());
if (sd->intvl_enable) 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)) if (_is_horizontal(sd->dir))
evas_object_size_hint_min_set 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); elm_config_scale_get(), 1);
else else
evas_object_size_hint_min_set 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_config_scale_get());
_val_fetch(obj, EINA_FALSE); _val_fetch(obj, EINA_FALSE);

View File

@ -926,7 +926,7 @@ _efl_ui_text_elm_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
edje_object_scale_set edje_object_scale_set
(wd->resize_obj, (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)); _mirrored_set(obj, efl_ui_mirrored_get(obj));

View File

@ -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_mirrored_set(sd->legacy.edje, efl_ui_mirrored_get(obj));
edje_object_scale_set(sd->legacy.edje, 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); 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)); ret = efl_ui_widget_on_disabled_update(obj, elm_widget_disabled_get(obj));

View File

@ -422,7 +422,7 @@ _time_update(Evas_Object *obj, Eina_Bool theme_update)
} }
edje_object_scale_set edje_object_scale_set
(wd->resize_obj, efl_ui_scale_get(obj) * (wd->resize_obj, efl_gfx_scale_get(obj) *
elm_config_scale_get()); elm_config_scale_get());
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
@ -435,7 +435,7 @@ _time_update(Evas_Object *obj, Eina_Bool theme_update)
elm_widget_theme_object_set elm_widget_theme_object_set
(obj, sd->digit[i], "clock", "flipdigit", style); (obj, sd->digit[i], "clock", "flipdigit", style);
edje_object_scale_set edje_object_scale_set
(sd->digit[i], efl_ui_scale_get(obj) * (sd->digit[i], efl_gfx_scale_get(obj) *
elm_config_scale_get()); elm_config_scale_get());
if ((sd->edit) && (sd->digedit & (1 << i))) 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)); edje_object_add(evas_object_evas_get(wd->resize_obj));
elm_widget_theme_object_set elm_widget_theme_object_set
(obj, sd->am_pm_obj, "clock", "flipampm", style); (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); _elm_config->scale);
if (sd->edit) if (sd->edit)
edje_object_signal_emit edje_object_signal_emit

View File

@ -1347,7 +1347,7 @@ _elm_colorselector_elm_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd)
(wd->resize_obj, "vertical_pad"); (wd->resize_obj, "vertical_pad");
if (vpadstr) v_pad = atoi(vpadstr); 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_padding_set(sd->palette_box, h_pad * scale, v_pad * scale, 0);
EINA_LIST_FOREACH(sd->items, elist, eo_item) 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"); vpadstr = edje_object_data_get(wd->resize_obj, "vertical_pad");
if (vpadstr) v_pad = atoi(vpadstr); 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_padding_set(sd->palette_box, h_pad * scale, v_pad * scale, 0);
efl_pack_align_set(sd->palette_box, 0.0, 0.0); efl_pack_align_set(sd->palette_box, 0.0, 0.0);
if (!elm_layout_content_set(obj, "elm.palette", sd->palette_box)) if (!elm_layout_content_set(obj, "elm.palette", sd->palette_box))

View File

@ -877,7 +877,7 @@ _elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
edje_object_scale_set edje_object_scale_set
(wd->resize_obj, (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)); _mirrored_set(obj, efl_ui_mirrored_get(obj));

View File

@ -225,7 +225,7 @@ _item_cache_add(Elm_Gen_Item *it, Eina_List *contents)
edje_object_mirrored_set(VIEW(it), edje_object_mirrored_set(VIEW(it),
efl_ui_mirrored_get(WIDGET(it))); efl_ui_mirrored_get(WIDGET(it)));
edje_object_scale_set(VIEW(it), edje_object_scale_set(VIEW(it),
efl_ui_scale_get(WIDGET(it)) efl_gfx_scale_get(WIDGET(it))
* elm_config_scale_get()); * elm_config_scale_get());
evas_object_hide(itc->base_view); 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_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()); elm_config_scale_get());
evas_object_stack_below(view, sd->stack); 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 *view = edje_object_add(evas_object_evas_get(WIDGET(it)));
evas_object_smart_member_add(view, GG_IT(it)->wsd->pan_obj); evas_object_smart_member_add(view, GG_IT(it)->wsd->pan_obj);
elm_widget_sub_object_add(WIDGET(it), view); 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()); elm_config_scale_get());
_view_style_update(it, view, style); _view_style_update(it, view, style);

View File

@ -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_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()); * elm_config_scale_get());
stacking_even = edje_object_data_get(view, "stacking_even"); 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 *view = edje_object_add(evas_object_evas_get(WIDGET(it)));
evas_object_smart_member_add(view, it->item->wsd->pan_obj); evas_object_smart_member_add(view, it->item->wsd->pan_obj);
elm_widget_sub_object_add(WIDGET(it), view); 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()); elm_config_scale_get());
_view_style_update(it, view, style); _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; if (it->item->decorate_all_item_realized) return;
it->deco_all_view = edje_object_add(evas_object_evas_get(WIDGET(it))); 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()); elm_config_scale_get());
evas_object_smart_member_add(it->deco_all_view, sd->pan_obj); evas_object_smart_member_add(it->deco_all_view, sd->pan_obj);
elm_widget_sub_object_add(WIDGET(it), it->deco_all_view); 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, edje_object_mirrored_set(itc->base_view,
efl_ui_mirrored_get(WIDGET(it))); efl_ui_mirrored_get(WIDGET(it)));
edje_object_scale_set(itc->base_view, edje_object_scale_set(itc->base_view,
efl_ui_scale_get(WIDGET(it)) efl_gfx_scale_get(WIDGET(it))
* elm_config_scale_get()); * elm_config_scale_get());
it->spacer = NULL; it->spacer = NULL;

View File

@ -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 * 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 * 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 * 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 * @param[in] no_scale @c true if the object is not scalable, @c false
* otherwise. Default is @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 * 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 * 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 * 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 * @return @c true if the object is not scalable, @c false otherwise. Default
* is @c false. * is @c false.

View File

@ -1089,7 +1089,7 @@ _elm_list_elm_widget_theme_apply(Eo *obj, Elm_List_Data *sd)
{ {
ELM_LIST_ITEM_DATA_GET(eo_it, it); ELM_LIST_ITEM_DATA_GET(eo_it, it);
edje_object_scale_set 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; it->fixed = EINA_FALSE;
} }

View File

@ -1429,14 +1429,14 @@ elm_object_scale_set(Evas_Object *obj,
double scale) double scale)
{ {
EINA_SAFETY_ON_NULL_RETURN(obj); EINA_SAFETY_ON_NULL_RETURN(obj);
efl_ui_scale_set(obj, scale); efl_gfx_scale_set(obj, scale);
} }
EAPI double EAPI double
elm_object_scale_get(const Evas_Object *obj) elm_object_scale_get(const Evas_Object *obj)
{ {
EINA_SAFETY_ON_NULL_RETURN_VAL(obj, 0.0); EINA_SAFETY_ON_NULL_RETURN_VAL(obj, 0.0);
return efl_ui_scale_get(obj); return efl_gfx_scale_get(obj);
} }
EAPI void EAPI void

View File

@ -295,7 +295,7 @@ _elm_menu_elm_widget_theme_apply(Eo *obj, Elm_Menu_Data *sd)
elm_wdg_item_disable(eo_item); elm_wdg_item_disable(eo_item);
/* SEOZ /* SEOZ
edje_object_scale_set edje_object_scale_set
(VIEW(item), efl_ui_scale_get(obj) * (VIEW(item), efl_gfx_scale_get(obj) *
elm_config_scale_get()); elm_config_scale_get());
*/ */
} }

View File

@ -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); if (sd->block_events) _block_events_theme_apply(obj);
edje_object_scale_set 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); _sizing_eval(obj);

View File

@ -37,7 +37,7 @@ _sizing_eval(Evas_Object *obj)
if (sd->size <= 0) return; 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); evas_object_size_hint_min_set(sd->icon, scale, scale);
elm_coords_finger_size_adjust(1, &minw, 1, &minh); 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", (obj, wd->resize_obj, "photo", "base",
elm_widget_style_get(obj)); 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, 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); _sizing_eval(obj);
return int_ret; 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_fill_outside_set(priv->icon, !priv->fill_inside);
elm_image_prescale_set(priv->icon, 0); 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 evas_object_event_callback_add
(priv->icon, EVAS_CALLBACK_MOUSE_UP, _mouse_up, obj); (priv->icon, EVAS_CALLBACK_MOUSE_UP, _mouse_up, obj);

View File

@ -235,7 +235,7 @@ _elm_segment_control_elm_widget_theme_apply(Eo *obj, Elm_Segment_Control_Data *s
elm_widget_theme_object_set elm_widget_theme_object_set
(obj, VIEW(it), "segment_control", "item", (obj, VIEW(it), "segment_control", "item",
elm_widget_style_get(obj)); 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()); elm_config_scale_get());
edje_object_mirrored_set(VIEW(it), rtl); 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); parent = efl_parent_get(obj);
VIEW(it) = edje_object_add(evas_object_evas_get(parent)); 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()); elm_config_scale_get());
evas_object_smart_member_add(VIEW(it), parent); evas_object_smart_member_add(VIEW(it), parent);

View File

@ -952,7 +952,7 @@ _internal_elm_toolbar_icon_size_get(Evas_Object *obj)
(wd->resize_obj, "icon_size"); (wd->resize_obj, "icon_size");
if (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)); / edje_object_base_scale_get(wd->resize_obj));
return _elm_config->icon_size; 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; if (sd->priv_icon_size) sd->icon_size = sd->priv_icon_size;
else sd->icon_size = sd->theme_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) EINA_INLIST_FOREACH(sd->items, it)
_item_theme_hook(obj, it, scale, sd->icon_size); _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) if (item->object)
elm_widget_sub_object_add(obj, 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); _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); _elm_widget_sub_object_redirect_to_top(obj, item->object);
o = item->object; o = item->object;
item->object = NULL; 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); _item_theme_hook(obj, item, scale, sd->icon_size);
return o; 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); it = _item_new(obj, icon, label, func, data);
if (!it) return NULL; 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); 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); it = _item_new(obj, icon, label, func, data);
if (!it) return NULL; 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); 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); it = _item_new(obj, icon, label, func, data);
if (!it) return NULL; 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); 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); it = _item_new(obj, icon, label, func, data);
if (!it) return NULL; 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); 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; if (item->separator == separator) return;
item->separator = separator; 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); _item_theme_hook(obj, item, scale, sd->icon_size);
evas_object_size_hint_min_set(VIEW(item), -1, -1); evas_object_size_hint_min_set(VIEW(item), -1, -1);
if (separator) sd->separator_count++; if (separator) sd->separator_count++;

View File

@ -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. * need to reset sobj's scale to 5.
* Note that each widget's scale is 0 by default. * 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); 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); th = elm_widget_theme_get(sobj);
mirrored = efl_ui_mirrored_get(sobj); mirrored = efl_ui_mirrored_get(sobj);
@ -2658,7 +2658,7 @@ elm_widget_scroll_freeze_get(const Eo *obj)
} }
EOLIAN static void 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 (scale < 0.0) scale = 0.0;
if (sd->scale != scale) 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 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 // FIXME: save walking up the tree by storing/caching parent scale
if (sd->scale == 0.0) if (sd->scale == 0.0)
{ {
if (sd->parent_obj && elm_widget_is(sd->parent_obj)) 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 else
{ {

View File

@ -605,6 +605,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access,
Efl.Gfx.visible { set; } Efl.Gfx.visible { set; }
Efl.Gfx.position { set; } Efl.Gfx.position { set; }
Efl.Gfx.size { set; } Efl.Gfx.size { set; }
Efl.Gfx.scale { set; get; }
Efl.Canvas.Object.clip { set; } Efl.Canvas.Object.clip { set; }
Efl.Canvas.Object.no_render { set; } Efl.Canvas.Object.no_render { set; }
Efl.Canvas.Object.is_frame_object { 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.User.parent { get; }
Efl.Ui.Focus.Object.focus_geometry { get; } Efl.Ui.Focus.Object.focus_geometry { get; }
Efl.Ui.Focus.Object.focus { set; } Efl.Ui.Focus.Object.focus { set; }
Efl.Ui.Base.scale { get; set; }
Efl.Ui.Base.mirrored { get; set; } Efl.Ui.Base.mirrored { get; set; }
Efl.Ui.Base.mirrored_automatic { get; set; } Efl.Ui.Base.mirrored_automatic { get; set; }
Efl.Ui.Cursor.cursor { get; set; } Efl.Ui.Cursor.cursor { get; set; }

View File

@ -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_max { get; set; }
Efl.Gfx.Size.Hint.hint_margin { get; set; } Efl.Gfx.Size.Hint.hint_margin { get; set; }
Efl.Gfx.Size.Hint.hint_weight { 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.Input.Interface.seat_event_filter { get; set; }
Efl.Loop_User.loop { get; } Efl.Loop_User.loop { get; }
} }

View File

@ -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.Annotate.cursor_object_item_insert;
Efl.Text.Markup.markup { set; get; } Efl.Text.Markup.markup { set; get; }
Efl.Text.Markup.cursor_markup_insert; Efl.Text.Markup.cursor_markup_insert;
Efl.Ui.Base.scale { set; } Efl.Gfx.scale { set; }
} }
events { events {
cursor,changed; [[Called when cursor changed]] cursor,changed; [[Called when cursor changed]]

View File

@ -2218,7 +2218,7 @@ _efl_canvas_object_anti_alias_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_
} }
EOLIAN static void 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 (obj->delete_me) return;
if (EINA_DBL_EQ(obj->cur->scale, scale)) 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 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; if (obj->delete_me) return 1.0;
return obj->cur->scale; 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); layer = efl_gfx_stack_layer_get(eo_obj);
name = efl_name_get(eo_obj); // evas_object_name_get(eo_obj); name = efl_name_get(eo_obj); // evas_object_name_get(eo_obj);
geom = efl_gfx_geometry_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); min = efl_gfx_size_hint_restricted_min_get(eo_obj);
max = efl_gfx_size_hint_max_get(eo_obj); max = efl_gfx_size_hint_max_get(eo_obj);
//efl_gfx_size_hint_request_get(eo_obj, &requestw, &requesth); //efl_gfx_size_hint_request_get(eo_obj, &requestw, &requesth);
@ -2971,13 +2971,13 @@ evas_object_evas_get(const Eo *eo_obj)
EAPI void EAPI void
evas_object_scale_set(Evas_Object *obj, double scale) evas_object_scale_set(Evas_Object *obj, double scale)
{ {
efl_ui_scale_set(obj, scale); efl_gfx_scale_set(obj, scale);
} }
EAPI double EAPI double
evas_object_scale_get(const Evas_Object *obj) 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 */ /* Internal EO APIs and hidden overrides */

View File

@ -2214,14 +2214,14 @@ evas_object_text_was_opaque(Evas_Object *eo_obj EINA_UNUSED,
} }
EOLIAN static void 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) double scale)
{ {
int size; int size;
const char *font; const char *font;
if (EINA_DBL_EQ(efl_ui_scale_get(eo_obj), scale)) return; if (EINA_DBL_EQ(efl_gfx_scale_get(eo_obj), scale)) return;
efl_ui_scale_set(efl_super(eo_obj, MY_CLASS), scale); efl_gfx_scale_set(efl_super(eo_obj, MY_CLASS), scale);
font = eina_stringshare_add(o->cur.font); font = eina_stringshare_add(o->cur.font);
size = o->cur.size; size = o->cur.size;

View File

@ -14600,12 +14600,12 @@ evas_object_textblock_was_opaque(Evas_Object *eo_obj EINA_UNUSED,
} }
EOLIAN static void 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, Efl_Canvas_Text_Data *o,
double scale) double scale)
{ {
if (EINA_DBL_EQ(efl_ui_scale_get(eo_obj), scale)) return; if (EINA_DBL_EQ(efl_gfx_scale_get(eo_obj), scale)) return;
efl_ui_scale_set(efl_super(eo_obj, MY_CLASS), scale); efl_gfx_scale_set(efl_super(eo_obj, MY_CLASS), scale);
_evas_textblock_invalidate_all(o); _evas_textblock_invalidate_all(o);
_evas_textblock_changed(o, eo_obj); _evas_textblock_changed(o, eo_obj);

View File

@ -872,14 +872,14 @@ evas_object_textgrid_was_opaque(Evas_Object *eo_obj EINA_UNUSED,
} }
EOLIAN static void 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) double scale)
{ {
int font_size; int font_size;
const char *font_name; const char *font_name;
if (EINA_DBL_EQ(efl_ui_scale_get(eo_obj), scale)) return; if (EINA_DBL_EQ(efl_gfx_scale_get(eo_obj), scale)) return;
efl_ui_scale_set(efl_super(eo_obj, MY_CLASS), scale); efl_gfx_scale_set(efl_super(eo_obj, MY_CLASS), scale);
font_name = eina_stringshare_add(o->cur.font_name); font_name = eina_stringshare_add(o->cur.font_name);
font_size = o->cur.font_size; font_size = o->cur.font_size;

View File

@ -272,6 +272,7 @@ class Evas.Text (Efl.Canvas.Object, Efl.Text, Efl.Text.Properties,
Efl.Object.constructor; Efl.Object.constructor;
Efl.Object.destructor; Efl.Object.destructor;
Efl.Gfx.size { set; } Efl.Gfx.size { set; }
Efl.Gfx.scale { set; }
Efl.Text.text { get; set; } Efl.Text.text { get; set; }
Efl.Text.Properties.font { get; set; } Efl.Text.Properties.font { get; set; }
Efl.Text.Properties.font_source { 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_input_render;
Efl.Canvas.Filter.Internal.filter_state_prepare; Efl.Canvas.Filter.Internal.filter_state_prepare;
Efl.Canvas.Object.paragraph_direction { set; get; } Efl.Canvas.Object.paragraph_direction { set; get; }
Efl.Ui.Base.scale { set; }
} }
} }

View File

@ -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 { get; set; }
Efl.Text.Properties.font_source { get; set; } Efl.Text.Properties.font_source { get; set; }
Efl.Text.Font.font_bitmap_scalable { get; set; } Efl.Text.Font.font_bitmap_scalable { get; set; }
Efl.Ui.Base.scale { set; } Efl.Gfx.scale { set; }
} }
} }