[EGIT] [core/efl] master 19/27: win: Add frame to inline and socket windows

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=fc4c07e735efdfaaba07127a9fa3bee51b4ac15b

commit fc4c07e735efdfaaba07127a9fa3bee51b4ac15b
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Tue Nov 22 14:23:46 2016 +0900

    win: Add frame to inline and socket windows
    
    This simplifies the cases by adding a border edje on all
    windows except fake (damn fake windows). Shadows and borders
    are always disabled on such windows (but we could easily change
    that in the future).
---
 src/lib/elementary/efl_ui_win.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 967064c..ae8cd53 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -4113,13 +4113,20 @@ _elm_win_frame_style_update(Efl_Ui_Win_Data *sd, 
Eina_Bool force_emit, Eina_Bool
 
    if (!sd->frame_obj)
      {
-        if ((sd->type == ELM_WIN_FAKE) ||
-            (sd->type == ELM_WIN_INLINED_IMAGE) ||
-            (sd->type == ELM_WIN_SOCKET_IMAGE)) return;
+        if (sd->type == ELM_WIN_FAKE) return;
         CRI("no frame object!");
         abort(); // FIXME remove this
      }
+
    _elm_win_need_frame_adjust(sd, ecore_evas_engine_name_get(sd->ee));
+   if ((sd->type == ELM_WIN_INLINED_IMAGE) ||
+       (sd->type == ELM_WIN_SOCKET_IMAGE))
+     {
+        sd->csd.need_shadow = EINA_FALSE;
+        sd->csd.need_borderless = EINA_TRUE;
+        sd->csd.need_unresizable = EINA_TRUE;
+        sd->csd.need_menu = EINA_FALSE;
+     }
 
    borderless = sd->csd.need_borderless || (!sd->csd.need) || sd->fullscreen;
    maximized = sd->maximized;
@@ -4304,9 +4311,7 @@ _elm_win_need_frame_adjust(Efl_Ui_Win_Data *sd, const 
char *engine)
    /* this is for debug only - don't keep forever, it's not an api! */
    s = getenv("EFL_WIN_FRAME_MODE");
 
-   if ((sd->type == ELM_WIN_FAKE) ||
-       (sd->type == ELM_WIN_INLINED_IMAGE) ||
-       (sd->type == ELM_WIN_SOCKET_IMAGE))
+   if (sd->type == ELM_WIN_FAKE)
      sd->csd.need = EINA_FALSE;
    else if (eina_streq(s, "on"))
      sd->csd.need = EINA_TRUE;

--