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
This commit is contained in:
Bryce Harrington 2017-05-23 16:45:06 -04:00 committed by Mike Blumenkrantz
parent 32cc23aea3
commit 4f5ea8f3b7
1 changed files with 1 additions and 2 deletions

View File

@ -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;