diff options
author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2017-10-19 13:26:51 -0400 |
---|---|---|
committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2017-10-25 10:44:16 -0400 |
commit | ed30f41de82515d130f0d861e922f9e3f45a7aaf (patch) | |
tree | caee7f914d44a8f00f2bed6ea9f9c5433bcbb02a /src/lib/elementary | |
parent | e9572a653742f0e613905e47767ae116297928d3 (diff) |
wayland: add support for efl weight hint propagation from elm_win to efl_wl
@feature
Diffstat (limited to 'src/lib/elementary')
-rw-r--r-- | src/lib/elementary/efl_ui_win.c | 11 | ||||
-rw-r--r-- | src/lib/elementary/efl_ui_win.eo | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 77205592c1..09615f78f8 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c | |||
@@ -5977,6 +5977,17 @@ _efl_ui_win_efl_gfx_size_hint_hint_aspect_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Da | |||
5977 | } | 5977 | } |
5978 | 5978 | ||
5979 | EOLIAN static void | 5979 | EOLIAN static void |
5980 | _efl_ui_win_efl_gfx_size_hint_hint_weight_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd, | ||
5981 | double w, double h) | ||
5982 | { | ||
5983 | efl_gfx_size_hint_weight_set(efl_super(obj, MY_CLASS), w, h); | ||
5984 | #ifdef HAVE_ELEMENTARY_WL2 | ||
5985 | if (pd->wl.win) | ||
5986 | ecore_wl2_window_weight_set(pd->wl.win, w, h); | ||
5987 | #endif | ||
5988 | } | ||
5989 | |||
5990 | EOLIAN static void | ||
5980 | _efl_ui_win_efl_gfx_size_hint_hint_base_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Size2D sz) | 5991 | _efl_ui_win_efl_gfx_size_hint_hint_base_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Size2D sz) |
5981 | { | 5992 | { |
5982 | sd->size_base_w = sz.w; | 5993 | sd->size_base_w = sz.w; |
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo index d194dd294d..b7b7213e26 100644 --- a/src/lib/elementary/efl_ui_win.eo +++ b/src/lib/elementary/efl_ui_win.eo | |||
@@ -843,6 +843,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Access.Window, | |||
843 | Efl.Gfx.Size.Hint.hint_base { get; set; } | 843 | Efl.Gfx.Size.Hint.hint_base { get; set; } |
844 | Efl.Gfx.Size.Hint.hint_step { get; set; } | 844 | Efl.Gfx.Size.Hint.hint_step { get; set; } |
845 | Efl.Gfx.Size.Hint.hint_aspect { set; } | 845 | Efl.Gfx.Size.Hint.hint_aspect { set; } |
846 | Efl.Gfx.Size.Hint.hint_weight { set; } | ||
846 | Efl.Gfx.Size.Hint.hint_max { set; } | 847 | Efl.Gfx.Size.Hint.hint_max { set; } |
847 | Efl.Text.text { get; set; } | 848 | Efl.Text.text { get; set; } |
848 | Efl.Canvas.pointer_position { get; } | 849 | Efl.Canvas.pointer_position { get; } |