jaehyun pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a2c8330d8f27f9e3b7736782ae1ea4c39904f55f
commit a2c8330d8f27f9e3b7736782ae1ea4c39904f55f
Author: Jaehyun Cho <jae_hyun....@samsung.com>
Date: Fri Nov 9 13:59:05 2018 +0900
efl_ui_win: Fix to check efl_ui_bg_widget theme version for non-legacy win
Check efl_ui_bg_widget theme version instead of elm_bg for non-legacy
win if win must swallow bg manually or not.
---
src/lib/elementary/efl_ui_win.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 20a70cd00a..529b41405e 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -7361,7 +7361,15 @@ _elm_win_bg_must_swallow(Efl_Ui_Win_Data *sd)
sd->legacy.bg_must_swallow = 1;
sd->legacy.bg_must_swallow_init = 1;
- bg = elm_bg_add(sd->obj);
+ if (sd->legacy.ctor)
+ bg = elm_bg_add(sd->obj);
+ else
+ {
+ // Note: This code path is probably not necessary (custom legacy
+ // theme but efl_add'ed window -- all efl_add'ed widgets would
+ // use default theme)
+ bg = efl_add(EFL_UI_BG_WIDGET_CLASS, sd->obj);
+ }
wd = efl_data_scope_get(bg, EFL_UI_WIDGET_CLASS);
if (wd)
{
--
