summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-08-14 19:26:14 +0200
committerDaniel Kolesa <d.kolesa@samsung.com>2019-08-14 19:26:14 +0200
commitd99186c039f6f27157b1595d0b7d62438c84de34 (patch)
treee75807e05e2126adad7a38a689eddfbd0ea58e8c
parent07e810c5cc9ca622eb8f0dfc43c47846e7f09e42 (diff)
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
-rw-r--r--src/lib/elementary/efl_ui_win.c42
-rw-r--r--src/lib/elementary/efl_ui_win.eo4
2 files changed, 45 insertions, 1 deletions
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
2694 evas_smart_objects_calculate(sd->evas); 2694 evas_smart_objects_calculate(sd->evas);
2695} 2695}
2696 2696
2697EOLIAN static Eina_Bool
2698_efl_ui_win_efl_canvas_scene_group_objects_calculating_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
2699{
2700 return efl_canvas_scene_group_objects_calculating_get(sd->evas);
2701}
2702
2697EOLIAN static Eina_Iterator * 2703EOLIAN static Eina_Iterator *
2698_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) 2704_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)
2699{ 2705{
@@ -5976,6 +5982,33 @@ _efl_ui_win_efl_text_text_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
5976 return sd->title; 5982 return sd->title;
5977} 5983}
5978 5984
5985EOLIAN void
5986_efl_ui_win_efl_ui_i18n_language_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char *locale)
5987{
5988 if (sd->frame_obj)
5989 efl_ui_language_set(sd->frame_obj, locale);
5990}
5991
5992EOLIAN const char *
5993_efl_ui_win_efl_ui_i18n_language_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
5994{
5995 return sd->frame_obj ? efl_ui_language_get(sd->frame_obj) : NULL;
5996}
5997
5998EOLIAN static void
5999_efl_ui_win_efl_ui_l10n_l10n_text_set(Eo *obj, Efl_Ui_Win_Data *sd, const char *label, const char *domain)
6000{
6001 if (sd->frame_obj)
6002 efl_ui_l10n_text_set(efl_part(obj, "efl.text.title"), label, domain);
6003}
6004
6005EOLIAN static const char *
6006_efl_ui_win_efl_ui_l10n_l10n_text_get(const Eo *obj, Efl_Ui_Win_Data *sd, const char **domain)
6007{
6008 return sd->frame_obj ?
6009 efl_ui_l10n_text_get(efl_part(obj, "efl.text.title"), domain) : NULL;
6010}
6011
5979EOLIAN static void 6012EOLIAN static void
5980_efl_ui_win_win_type_set(Eo *obj, Efl_Ui_Win_Data *sd, Efl_Ui_Win_Type type) 6013_efl_ui_win_win_type_set(Eo *obj, Efl_Ui_Win_Data *sd, Efl_Ui_Win_Type type)
5981{ 6014{
@@ -6966,10 +6999,17 @@ _efl_ui_win_efl_screen_screen_rotation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win
6966{ 6999{
6967 //TODO: query to wm about device's rotation 7000 //TODO: query to wm about device's rotation
6968 (void)sd; 7001 (void)sd;
6969 7002 WRN("Not yet implemented");
6970 return 0; 7003 return 0;
6971} 7004}
6972 7005
7006EOLIAN static float
7007_efl_ui_win_efl_screen_screen_scale_factor_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd EINA_UNUSED)
7008{
7009 WRN("Not yet implemented");
7010 return 1.0;
7011}
7012
6973EOLIAN static void 7013EOLIAN static void
6974_efl_ui_win_prop_focus_skip_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool skip) 7014_efl_ui_win_prop_focus_skip_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool skip)
6975{ 7015{
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
848 Efl.Screen.screen_dpi { get; } 848 Efl.Screen.screen_dpi { get; }
849 Efl.Screen.screen_rotation { get; } 849 Efl.Screen.screen_rotation { get; }
850 Efl.Screen.screen_size_in_pixels { get; } 850 Efl.Screen.screen_size_in_pixels { get; }
851 Efl.Screen.screen_scale_factor { get; }
851 Efl.Gfx.Hint.hint_aspect { set; } 852 Efl.Gfx.Hint.hint_aspect { set; }
852 Efl.Gfx.Hint.hint_weight { set; } 853 Efl.Gfx.Hint.hint_weight { set; }
853 Efl.Gfx.Hint.hint_size_max { set; } 854 Efl.Gfx.Hint.hint_size_max { set; }
854 Efl.Text.text { get; set; } 855 Efl.Text.text { get; set; }
856 Efl.Ui.L10n.l10n_text { get; set; }
857 Efl.Ui.I18n.language { get; set; }
855 Efl.Canvas.Scene.seat_default { get; } 858 Efl.Canvas.Scene.seat_default { get; }
856 Efl.Canvas.Scene.pointer_position { get; } 859 Efl.Canvas.Scene.pointer_position { get; }
857 Efl.Canvas.Pointer.pointer_inside { get; } 860 Efl.Canvas.Pointer.pointer_inside { get; }
858 Efl.Canvas.Scene.image_max_size { get; } 861 Efl.Canvas.Scene.image_max_size { get; }
859 Efl.Canvas.Scene.group_objects_calculate; 862 Efl.Canvas.Scene.group_objects_calculate;
863 Efl.Canvas.Scene.group_objects_calculating { get; }
860 Efl.Canvas.Scene.objects_at_xy_get; 864 Efl.Canvas.Scene.objects_at_xy_get;
861 Efl.Canvas.Scene.object_top_at_xy_get; 865 Efl.Canvas.Scene.object_top_at_xy_get;
862 Efl.Canvas.Scene.objects_in_rectangle_get; 866 Efl.Canvas.Scene.objects_in_rectangle_get;