forked from enlightenment/efl
theme: Add bevel around background (window)
This should fix (some) issues with exactness.
This commit is contained in:
parent
8a40c063ce
commit
0dde22488a
|
@ -91,6 +91,23 @@ group { name: "elm/border/base/default";
|
||||||
required; // @since 1.19
|
required; // @since 1.19
|
||||||
clip: "client_clip";
|
clip: "client_clip";
|
||||||
}
|
}
|
||||||
|
image { "background_bevel";
|
||||||
|
desc { "default";
|
||||||
|
image {
|
||||||
|
normal: "bevel_dark_out.png";
|
||||||
|
border: 1 1 1 1;
|
||||||
|
middle: 0;
|
||||||
|
}
|
||||||
|
fill.smooth: 0;
|
||||||
|
rel.to: "elm.spacer.content";
|
||||||
|
visible: 0;
|
||||||
|
}
|
||||||
|
desc { "visible";
|
||||||
|
inherit: "default";
|
||||||
|
visible: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* main menu */
|
/* main menu */
|
||||||
rect { "menu_bg";
|
rect { "menu_bg";
|
||||||
desc { "default";
|
desc { "default";
|
||||||
|
@ -707,6 +724,16 @@ group { name: "elm/border/base/default";
|
||||||
action: STATE_SET "default";
|
action: STATE_SET "default";
|
||||||
target: "elm.rect.background";
|
target: "elm.rect.background";
|
||||||
}
|
}
|
||||||
|
program {
|
||||||
|
signal: "elm,state,background,standard,on"; source: "elm";
|
||||||
|
action: STATE_SET "visible";
|
||||||
|
target: "background_bevel";
|
||||||
|
}
|
||||||
|
program {
|
||||||
|
signal: "elm,state,background,standard,off"; source: "elm";
|
||||||
|
action: STATE_SET "default";
|
||||||
|
target: "background_bevel";
|
||||||
|
}
|
||||||
program {
|
program {
|
||||||
signal: "elm,action,focus"; source: "elm";
|
signal: "elm,action,focus"; source: "elm";
|
||||||
action: STATE_SET "focused";
|
action: STATE_SET "focused";
|
||||||
|
|
|
@ -214,6 +214,7 @@ struct _Efl_Ui_Win_Data
|
||||||
Eina_Bool need_shadow : 1; /**< if true, application draws its csd and shadow */
|
Eina_Bool need_shadow : 1; /**< if true, application draws its csd and shadow */
|
||||||
Eina_Bool need_borderless : 1;
|
Eina_Bool need_borderless : 1;
|
||||||
Eina_Bool need_bg_solid : 1;
|
Eina_Bool need_bg_solid : 1;
|
||||||
|
Eina_Bool need_bg_standard : 1;
|
||||||
Eina_Bool need_menu : 1;
|
Eina_Bool need_menu : 1;
|
||||||
Eina_Bool need_unresizable : 1;
|
Eina_Bool need_unresizable : 1;
|
||||||
Eina_Bool cur_borderless : 1;
|
Eina_Bool cur_borderless : 1;
|
||||||
|
@ -221,6 +222,7 @@ struct _Efl_Ui_Win_Data
|
||||||
Eina_Bool cur_focus : 1;
|
Eina_Bool cur_focus : 1;
|
||||||
Eina_Bool cur_maximized : 1;
|
Eina_Bool cur_maximized : 1;
|
||||||
Eina_Bool cur_bg_solid : 1;
|
Eina_Bool cur_bg_solid : 1;
|
||||||
|
Eina_Bool cur_bg_standard : 1;
|
||||||
Eina_Bool cur_menu : 1;
|
Eina_Bool cur_menu : 1;
|
||||||
Eina_Bool cur_unresizable : 1;
|
Eina_Bool cur_unresizable : 1;
|
||||||
Eina_Bool wayland : 1;
|
Eina_Bool wayland : 1;
|
||||||
|
@ -4156,7 +4158,7 @@ static void
|
||||||
_elm_win_frame_style_update(Efl_Ui_Win_Data *sd, Eina_Bool force_emit, Eina_Bool calc)
|
_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;
|
alpha, bg_standard;
|
||||||
Eina_Bool changed = EINA_FALSE;
|
Eina_Bool changed = EINA_FALSE;
|
||||||
|
|
||||||
if (!sd->frame_obj)
|
if (!sd->frame_obj)
|
||||||
|
@ -4186,6 +4188,7 @@ _elm_win_frame_style_update(Efl_Ui_Win_Data *sd, Eina_Bool force_emit, Eina_Bool
|
||||||
if (alpha && borderless) shadow = 0;
|
if (alpha && borderless) shadow = 0;
|
||||||
focus = ecore_evas_focus_get(sd->ee);
|
focus = ecore_evas_focus_get(sd->ee);
|
||||||
bg_solid = sd->csd.need_bg_solid;
|
bg_solid = sd->csd.need_bg_solid;
|
||||||
|
bg_standard = sd->csd.need_bg_standard;
|
||||||
unresizable = sd->csd.need_unresizable;
|
unresizable = sd->csd.need_unresizable;
|
||||||
menu = sd->csd.need_menu;
|
menu = sd->csd.need_menu;
|
||||||
|
|
||||||
|
@ -4212,6 +4215,7 @@ _elm_win_frame_style_update(Efl_Ui_Win_Data *sd, Eina_Bool force_emit, Eina_Bool
|
||||||
STATE_SET(maximized, "elm,state,maximized", "elm,state,unmaximized");
|
STATE_SET(maximized, "elm,state,maximized", "elm,state,unmaximized");
|
||||||
STATE_SET(focus, "elm,action,focus", "elm,action,unfocus");
|
STATE_SET(focus, "elm,action,focus", "elm,action,unfocus");
|
||||||
STATE_SET(bg_solid, "elm,state,background,solid,on", "elm,state,background,solid,off");
|
STATE_SET(bg_solid, "elm,state,background,solid,on", "elm,state,background,solid,off");
|
||||||
|
STATE_SET(bg_standard, "elm,state,background,standard,on", "elm,state,background,standard,off");
|
||||||
STATE_SET(unresizable, "elm,state,unresizable,on", "elm,state,unresizable,off");
|
STATE_SET(unresizable, "elm,state,unresizable,on", "elm,state,unresizable,off");
|
||||||
STATE_SET(menu, "elm,action,show_menu", "elm,action,hide_menu");
|
STATE_SET(menu, "elm,action,show_menu", "elm,action,hide_menu");
|
||||||
|
|
||||||
|
@ -6296,6 +6300,7 @@ _elm_win_standard_init(Eo *obj)
|
||||||
|
|
||||||
ELM_SAFE_DEL(sd->bg);
|
ELM_SAFE_DEL(sd->bg);
|
||||||
|
|
||||||
|
sd->csd.need_bg_standard = 1;
|
||||||
if (!_elm_win_bg_must_swallow(sd))
|
if (!_elm_win_bg_must_swallow(sd))
|
||||||
{
|
{
|
||||||
sd->csd.need_bg_solid = EINA_TRUE;
|
sd->csd.need_bg_solid = EINA_TRUE;
|
||||||
|
@ -6332,6 +6337,7 @@ _efl_ui_win_content_set(Eo *obj, Efl_Ui_Win_Data *sd, const char *part, Eo *cont
|
||||||
}
|
}
|
||||||
else if (eina_streq(part, "background"))
|
else if (eina_streq(part, "background"))
|
||||||
{
|
{
|
||||||
|
sd->csd.need_bg_standard = 0;
|
||||||
if (sd->bg == content) return EINA_TRUE;
|
if (sd->bg == content) return EINA_TRUE;
|
||||||
if (!_elm_win_bg_set(sd, content))
|
if (!_elm_win_bg_set(sd, content))
|
||||||
goto err;
|
goto err;
|
||||||
|
|
Loading…
Reference in New Issue