old
/
entrance
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Updated the theme." 

This reverts commit aa05a94193.
This commit is contained in:
Michael Bouchaud 2014-02-24 21:23:21 +00:00
parent aa05a94193
commit 2f7cc2897e
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
data/themes/default/default.edc
View File

@ -310,10 +310,9 @@ collections {
repeat_events: 0; repeat_events: 0;
description { description {
rel1.relative: 0.5 1.0; rel1.relative: 0.5 1.0;
rel1.to: "entrance.password"; rel1.to_x: "entrance.password";
rel2.relative: 1.0 2.0; rel1.to_y: "entrance.password";
rel2.to: "entrance.password"; visible: 1;
fixed: 1 1;
params { params {
string: "label" "Login"; string: "label" "Login";
} }
@ -323,12 +322,10 @@ collections {
part { name: "entrance.xsessions"; part { name: "entrance.xsessions";
type: SWALLOW; type: SWALLOW;
description { state: "default" 0.0; description { state: "default" 0.0;
rel1.to: "entrance.password"; rel1.to_y: "entrance.password";
rel1.relative: 0.0 1.0; rel1.relative: 0.0 1.0;
rel2.to: "entrance.password"; rel2.relative: 0.5 1.0;
rel2.relative: 0.5 2.0; //visible: 0;
fixed: 1 1;
//visible: 0;
} }
description { state: "enabled" 0.0; description { state: "enabled" 0.0;
inherit: "default" 0.0; inherit: "default" 0.0;
@ -465,6 +462,17 @@ collections {
visible: 1; visible: 1;
} }
} }
part { name: "hover";
type: RECT;
mouse_events: 1;
repeat_events: 0;
description { state: "default" 0.0;
color: 0 0 0 196;
}
description { state: "hidden" 0.0;
visible: 0;
}
}
part { name: "entrance.login"; part { name: "entrance.login";
type: SWALLOW; type: SWALLOW;
description { state: "default" 0.0; description { state: "default" 0.0;
@ -480,6 +488,7 @@ collections {
signal: "entrance,conf_user,enabled"; signal: "entrance,conf_user,enabled";
source: ""; source: "";
action: STATE_SET "hidden" 0.0; action: STATE_SET "hidden" 0.0;
target: "hover";
target: "entrance.login"; target: "entrance.login";
} }
} }

2
src/bin/entrance_conf.c
View File

@ -541,6 +541,7 @@ _entrance_conf_user_auth(void *data, const char *user, Eina_Bool granted)
} }
} }
static Evas_Object * static Evas_Object *
_entrance_conf_user_build(Evas_Object *obj) _entrance_conf_user_build(Evas_Object *obj)
{ {
@ -553,7 +554,6 @@ _entrance_conf_user_build(Evas_Object *obj)
o = entrance_login_add(ly, _entrance_conf_user_auth, ly); o = entrance_login_add(ly, _entrance_conf_user_auth, ly);
elm_object_part_content_set(ly, "entrance.login", o); elm_object_part_content_set(ly, "entrance.login", o);
evas_object_show(o); evas_object_show(o);
t = elm_table_add(obj); t = elm_table_add(obj);
elm_object_part_content_set(ly, "entrance.conf", t); elm_object_part_content_set(ly, "entrance.conf", t);
evas_object_size_hint_weight_set(t, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_weight_set(t, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);