forked from enlightenment/efl
win: Avoid calling need_frame_adjust all the time
This function was meant to be called only before finalize. This avoids getenv and string compares.
This commit is contained in:
parent
428136e0f1
commit
f1418dbb20
|
@ -4151,7 +4151,6 @@ _elm_win_frame_style_update(Efl_Ui_Win_Data *sd, Eina_Bool force_emit, Eina_Bool
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
_elm_win_need_frame_adjust(sd, ecore_evas_engine_name_get(sd->ee));
|
|
||||||
if ((sd->type == ELM_WIN_INLINED_IMAGE) ||
|
if ((sd->type == ELM_WIN_INLINED_IMAGE) ||
|
||||||
(sd->type == ELM_WIN_SOCKET_IMAGE))
|
(sd->type == ELM_WIN_SOCKET_IMAGE))
|
||||||
{
|
{
|
||||||
|
@ -4160,6 +4159,10 @@ _elm_win_frame_style_update(Efl_Ui_Win_Data *sd, Eina_Bool force_emit, Eina_Bool
|
||||||
sd->csd.need_unresizable = EINA_TRUE;
|
sd->csd.need_unresizable = EINA_TRUE;
|
||||||
sd->csd.need_menu = EINA_FALSE;
|
sd->csd.need_menu = EINA_FALSE;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sd->csd.need_shadow = sd->csd.need && (!sd->maximized);
|
||||||
|
}
|
||||||
|
|
||||||
alpha = sd->application_alpha || sd->theme_alpha;
|
alpha = sd->application_alpha || sd->theme_alpha;
|
||||||
borderless = sd->csd.need_borderless || (!sd->csd.need) || sd->fullscreen;
|
borderless = sd->csd.need_borderless || (!sd->csd.need) || sd->fullscreen;
|
||||||
|
@ -4354,7 +4357,6 @@ _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! */
|
/* this is for debug only - don't keep forever, it's not an api! */
|
||||||
s = getenv("EFL_WIN_FRAME_MODE");
|
s = getenv("EFL_WIN_FRAME_MODE");
|
||||||
|
|
||||||
sd->csd.wayland = (eina_streq(engine, ELM_WAYLAND_SHM) ||
|
sd->csd.wayland = (eina_streq(engine, ELM_WAYLAND_SHM) ||
|
||||||
eina_streq(engine, ELM_WAYLAND_EGL));
|
eina_streq(engine, ELM_WAYLAND_EGL));
|
||||||
|
|
||||||
|
@ -4366,9 +4368,6 @@ _elm_win_need_frame_adjust(Efl_Ui_Win_Data *sd, const char *engine)
|
||||||
sd->csd.need = EINA_FALSE;
|
sd->csd.need = EINA_FALSE;
|
||||||
else
|
else
|
||||||
sd->csd.need = sd->csd.wayland;
|
sd->csd.need = sd->csd.wayland;
|
||||||
|
|
||||||
/* for now CSD implies shadows as well */
|
|
||||||
sd->csd.need_shadow = sd->csd.need && (!sd->maximized);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eo *
|
static Eo *
|
||||||
|
|
Loading…
Reference in New Issue