aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/elementary/efl_ui_win.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-11-22 14:23:46 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-11-23 13:04:13 +0900
commitfc4c07e735efdfaaba07127a9fa3bee51b4ac15b (patch)
treeb5ea5fe73948f0c3be9975c205a8c4d819e5517f /src/lib/elementary/efl_ui_win.c
parentelm: Add Efl.Ui.Box.Stack for stack boxes (EO only) (diff)
downloadefl-fc4c07e735efdfaaba07127a9fa3bee51b4ac15b.tar.gz
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).
Diffstat (limited to 'src/lib/elementary/efl_ui_win.c')
-rw-r--r--src/lib/elementary/efl_ui_win.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 967064c007..ae8cd53507 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;