discomfitor pushed a commit to branch efl-1.19. http://git.enlightenment.org/core/efl.git/commit/?id=11765176eeb4273a905e6b32b5e9d4c05736e45b
commit 11765176eeb4273a905e6b32b5e9d4c05736e45b Author: Mike Blumenkrantz <[email protected]> Date: Fri Jul 28 15:44:43 2017 -0400 elm_win: do not implement aspect_get() this breaks aspect hints. @fix --- src/lib/elementary/efl_ui_win.c | 15 ++------------- src/lib/elementary/efl_ui_win.eo | 2 +- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 4a953632cc..386dafff02 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -182,7 +182,6 @@ struct _Efl_Ui_Win_Data void *trap_data; double aspect; /* defined as w/h or 0 */ - int aspect_w, aspect_h; /* used for the get API */ int size_base_w, size_base_h; int size_step_w, size_step_h; int max_w, max_h; @@ -5703,21 +5702,11 @@ _win_aspect_get(Efl_Ui_Win_Data *sd) EOLIAN static void _efl_ui_win_efl_gfx_size_hint_hint_aspect_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd, - Efl_Gfx_Size_Hint_Aspect mode EINA_UNUSED, int w, int h) + Efl_Gfx_Size_Hint_Aspect mode, int w, int h) { - pd->aspect_w = w; - pd->aspect_h = h; if (h) _win_aspect_set(pd, (double) w / (double) h); else _win_aspect_set(pd, 0.0); -} - -EOLIAN static void -_efl_ui_win_efl_gfx_size_hint_hint_aspect_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd, - Efl_Gfx_Size_Hint_Aspect *mode, int *w, int *h) -{ - if (mode) *mode = EFL_GFX_SIZE_HINT_ASPECT_NONE; - if (w) *w = pd->aspect_w; - if (h) *h = pd->aspect_h; + efl_gfx_size_hint_aspect_set(efl_super(obj, MY_CLASS), mode, w, h); } EOLIAN static void diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo index 90147dc1c9..2929b7ad33 100644 --- a/src/lib/elementary/efl_ui_win.eo +++ b/src/lib/elementary/efl_ui_win.eo @@ -946,7 +946,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window, Efl.Screen.screen_size { get; } Efl.Gfx.Size.Hint.hint_base { get; set; } Efl.Gfx.Size.Hint.hint_step { get; set; } - Efl.Gfx.Size.Hint.hint_aspect { get; set; } + Efl.Gfx.Size.Hint.hint_aspect { set; } Efl.Gfx.Size.Hint.hint_max { set; } Efl.Text.text { get; set; } Efl.Input.Interface.pointer_xy { get; } --
