diff options
| author | Bryce Harrington <bryce@osg.samsung.com> | 2017-05-23 16:45:06 -0400 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2017-05-23 16:46:00 -0400 |
| commit | 4f5ea8f3b75e2d81d7ad743c527bb905458ae8ad (patch) | |
| tree | d17a8450d7dfc8faf8112400695df883bc1407f2 | |
| parent | 32cc23aea35db818c2c2c32e292938b9af4de9ad (diff) | |
| download | efl-4f5ea8f3b75e2d81d7ad743c527bb905458ae8ad.tar.gz | |
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
| -rw-r--r-- | src/lib/elementary/efl_ui_win.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 0d73c15647..37f55f3f58 100644 --- 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; |