summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2018-01-17 14:12:34 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2018-01-17 14:18:25 +0900
commit7cef580f11d47b90dc0af0a790935e85bbb89f20 (patch)
treeb0ddc6d700c77667ff75d2a9aeb788195d2e8075
parent421217b15019966a093ed49a34837f9535e00827 (diff)
win: Fix standard window bg with custom themes
Ref T6579 See also D5740
-rw-r--r--src/lib/elementary/efl_ui_win.c13
1 files changed, 12 insertions, 1 deletions
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)
7156 } 7156 }
7157 else 7157 else
7158 { 7158 {
7159 Eo *bg;
7160
7159 /* Legacy theme compatibility */ 7161 /* Legacy theme compatibility */
7160 DBG("Detected legacy theme used for elm_bg. Swallowing object."); 7162 DBG("Detected legacy theme used for elm_bg. Swallowing object.");
7161 sd->csd.need_bg_solid = EINA_FALSE; 7163 sd->csd.need_bg_solid = EINA_FALSE;
7162 _elm_win_bg_set(sd, efl_add(EFL_UI_BG_WIDGET_CLASS, obj)); 7164 if (sd->legacy.ctor)
7165 bg = elm_bg_add(obj);
7166 else
7167 {
7168 // Note: This code path is probably not necessary (custom legacy
7169 // theme but efl_add'ed window -- all efl_add'ed widgets would
7170 // use default theme)
7171 bg = efl_add(EFL_UI_BG_WIDGET_CLASS, obj);
7172 }
7173 _elm_win_bg_set(sd, bg);
7163 } 7174 }
7164 7175
7165 _elm_win_frame_style_update(sd, 0, 1); 7176 _elm_win_frame_style_update(sd, 0, 1);