[EGIT] [core/efl] master 03/03: win: Fix standard window bg with custom themes

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=7cef580f11d47b90dc0af0a790935e85bbb89f20

commit 7cef580f11d47b90dc0af0a790935e85bbb89f20
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Wed Jan 17 14:12:34 2018 +0900

    win: Fix standard window bg with custom themes
    
    Ref T6579
    See also D5740
---
 src/lib/elementary/efl_ui_win.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index c3580bcbb6..5c3696cca6 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -7156,10 +7156,21 @@ _elm_win_standard_init(Eo *obj)
      }
    else
      {
+        Eo *bg;
+
         /* Legacy theme compatibility */
         DBG("Detected legacy theme used for elm_bg. Swallowing object.");
         sd->csd.need_bg_solid = EINA_FALSE;
-        _elm_win_bg_set(sd, efl_add(EFL_UI_BG_WIDGET_CLASS, obj));
+        if (sd->legacy.ctor)
+          bg = elm_bg_add(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, obj);
+          }
+        _elm_win_bg_set(sd, bg);
      }
 
    _elm_win_frame_style_update(sd, 0, 1);

--