q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d99186c039f6f27157b1595d0b7d62438c84de34
commit d99186c039f6f27157b1595d0b7d62438c84de34
Author: Mike Blumenkrantz <zm...@samsung.com>
Date: Wed Aug 14 19:26:14 2019 +0200
efl_ui/win: implement unimplemented methods
Summary:
pass through methods from inherited classes to the correct internal
object
Depends on D9562
Reviewers: q66
Reviewed By: q66
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D9572
---
src/lib/elementary/efl_ui_win.c | 42 +++++++++++++++++++++++++++++++++++++++-
src/lib/elementary/efl_ui_win.eo | 4 ++++
2 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 22ed4f1962..32f0ded966 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -2694,6 +2694,12 @@ _efl_ui_win_efl_canvas_scene_group_objects_calculate(Eo
*obj EINA_UNUSED, Efl_Ui
evas_smart_objects_calculate(sd->evas);
}
+EOLIAN static Eina_Bool
+_efl_ui_win_efl_canvas_scene_group_objects_calculating_get(const Eo *obj
EINA_UNUSED, Efl_Ui_Win_Data *sd)
+{
+ return efl_canvas_scene_group_objects_calculating_get(sd->evas);
+}
+
EOLIAN static Eina_Iterator *
_efl_ui_win_efl_canvas_scene_objects_at_xy_get(Eo *obj EINA_UNUSED,
Efl_Ui_Win_Data *sd, Eina_Position2D pos, Eina_Bool
include_pass_events_objects, Eina_Bool include_hidden_objects)
{
@@ -5976,6 +5982,33 @@ _efl_ui_win_efl_text_text_get(const Eo *obj EINA_UNUSED,
Efl_Ui_Win_Data *sd)
return sd->title;
}
+EOLIAN void
+_efl_ui_win_efl_ui_i18n_language_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd,
const char *locale)
+{
+ if (sd->frame_obj)
+ efl_ui_language_set(sd->frame_obj, locale);
+}
+
+EOLIAN const char *
+_efl_ui_win_efl_ui_i18n_language_get(const Eo *obj EINA_UNUSED,
Efl_Ui_Win_Data *sd)
+{
+ return sd->frame_obj ? efl_ui_language_get(sd->frame_obj) : NULL;
+}
+
+EOLIAN static void
+_efl_ui_win_efl_ui_l10n_l10n_text_set(Eo *obj, Efl_Ui_Win_Data *sd, const char
*label, const char *domain)
+{
+ if (sd->frame_obj)
+ efl_ui_l10n_text_set(efl_part(obj, "efl.text.title"), label, domain);
+}
+
+EOLIAN static const char *
+_efl_ui_win_efl_ui_l10n_l10n_text_get(const Eo *obj, Efl_Ui_Win_Data *sd,
const char **domain)
+{
+ return sd->frame_obj ?
+ efl_ui_l10n_text_get(efl_part(obj, "efl.text.title"), domain) : NULL;
+}
+
EOLIAN static void
_efl_ui_win_win_type_set(Eo *obj, Efl_Ui_Win_Data *sd, Efl_Ui_Win_Type type)
{
@@ -6966,10 +6999,17 @@ _efl_ui_win_efl_screen_screen_rotation_get(const Eo
*obj EINA_UNUSED, Efl_Ui_Win
{
//TODO: query to wm about device's rotation
(void)sd;
-
+ WRN("Not yet implemented");
return 0;
}
+EOLIAN static float
+_efl_ui_win_efl_screen_screen_scale_factor_get(const Eo *obj EINA_UNUSED,
Efl_Ui_Win_Data *sd EINA_UNUSED)
+{
+ WRN("Not yet implemented");
+ return 1.0;
+}
+
EOLIAN static void
_efl_ui_win_prop_focus_skip_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd,
Eina_Bool skip)
{
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index f6f499cbce..0148f4e214 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -848,15 +848,19 @@ class Efl.Ui.Win extends Efl.Ui.Widget implements
Efl.Canvas.Scene, Efl.Access.W
Efl.Screen.screen_dpi { get; }
Efl.Screen.screen_rotation { get; }
Efl.Screen.screen_size_in_pixels { get; }
+ Efl.Screen.screen_scale_factor { get; }
Efl.Gfx.Hint.hint_aspect { set; }
Efl.Gfx.Hint.hint_weight { set; }
Efl.Gfx.Hint.hint_size_max { set; }
Efl.Text.text { get; set; }
+ Efl.Ui.L10n.l10n_text { get; set; }
+ Efl.Ui.I18n.language { get; set; }
Efl.Canvas.Scene.seat_default { get; }
Efl.Canvas.Scene.pointer_position { get; }
Efl.Canvas.Pointer.pointer_inside { get; }
Efl.Canvas.Scene.image_max_size { get; }
Efl.Canvas.Scene.group_objects_calculate;
+ Efl.Canvas.Scene.group_objects_calculating { get; }
Efl.Canvas.Scene.objects_at_xy_get;
Efl.Canvas.Scene.object_top_at_xy_get;
Efl.Canvas.Scene.objects_in_rectangle_get;
--
