diff options
| author | Jean-Philippe Andre <jp.andre@samsung.com> | 2016-11-24 17:45:14 +0900 |
|---|---|---|
| committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2016-11-24 17:49:17 +0900 |
| commit | 61c8d7f46edf4cd0a519114cab1726977815c7a7 (patch) | |
| tree | 6f7c7a2e7953b497758a40ae52f3c4f7194a8d26 | |
| parent | 9fa608d6312d0119a3d7e054315da60b1b31b2b3 (diff) | |
| download | efl-61c8d7f46edf4cd0a519114cab1726977815c7a7.tar.gz | |
win: Disable CSD shadow if alpha and borderless
If the content has alpha, we can't ensure that the square shadow
will look good. So, hide it.
| -rw-r--r-- | src/lib/elementary/efl_ui_win.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 9c52d23a06..7b30f06f48 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -4135,14 +4135,15 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *style) static void _elm_win_frame_style_update(Efl_Ui_Win_Data *sd, Eina_Bool force_emit, Eina_Bool calc) { - Eina_Bool borderless, maximized, shadow, focus, bg_solid, menu, unresizable; + Eina_Bool borderless, maximized, shadow, focus, bg_solid, menu, unresizable, + alpha; Eina_Bool changed = EINA_FALSE; if (!sd->frame_obj) { - if (sd->type == ELM_WIN_FAKE) return; - CRI("no frame object!"); - abort(); // FIXME remove this + if (EINA_LIKELY(sd->type == ELM_WIN_FAKE)) return; + CRI("Window has no frame object!"); + return; } _elm_win_need_frame_adjust(sd, ecore_evas_engine_name_get(sd->ee)); @@ -4155,9 +4156,11 @@ _elm_win_frame_style_update(Efl_Ui_Win_Data *sd, Eina_Bool force_emit, Eina_Bool sd->csd.need_menu = EINA_FALSE; } + alpha = sd->application_alpha || sd->theme_alpha; borderless = sd->csd.need_borderless || (!sd->csd.need) || sd->fullscreen; maximized = sd->maximized; shadow = sd->csd.need_shadow && (!sd->fullscreen) && (!sd->maximized); + if (alpha && borderless) shadow = 0; focus = ecore_evas_focus_get(sd->ee); bg_solid = sd->csd.need_bg_solid; unresizable = sd->csd.need_unresizable; @@ -5268,6 +5271,7 @@ _efl_ui_win_alpha_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Bool enabled) { sd->application_alpha = enabled; _elm_win_apply_alpha(obj, sd); + _elm_win_frame_style_update(sd, 0, 1); } EOLIAN static Eina_Bool |