elm_win: Fix breakage in frame bg style with Elementary WL2

Summary:
An else statement was added in 5ebdf8f3 with no clause, resulting in the
bg_solid property becoming conditionalized such that it won't be set
correctly when HAVE_ELEMENTARY_WL2 is defined and there is no wayland
window in use.

Further, this also causes focus to be left undefined.  Since there's no
window, presumably it should be turned off in this circumstance.

fix CID1375496, CID1375497

Reviewers: zmike

Subscribers: cedric, jpeg

Differential Revision: https://phab.enlightenment.org/D4899

diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 0d73c15..37f55f3 100644 (file)
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -4382,9 +4382,8 @@ _elm_win_frame_style_update(Efl_Ui_Win_Data *sd, Eina_Bool force_emit, Eina_Bool
    if (sd->wl.win)
      focus = ecore_wl2_window_activated_get(sd->wl.win);
    else
-#else
-   focus = ecore_evas_focus_get(sd->ee);
 #endif
+   focus = ecore_evas_focus_get(sd->ee);
    bg_solid = sd->csd.need_bg_solid;
    bg_standard = sd->csd.need_bg_standard;
    unresizable = sd->csd.need_unresizable;