bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/misc/entrance.git/commit/?id=aa05a94193a2e86fcbd69528a58fd2135539ace8
commit aa05a94193a2e86fcbd69528a58fd2135539ace8 Author: Marcel Hollerbach <[email protected]> Date: Fri Feb 21 17:18:14 2014 +0100 Updated the theme. --- data/themes/default/default.edc | 27 +++++++++------------------ src/bin/entrance_conf.c | 2 +- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/data/themes/default/default.edc b/data/themes/default/default.edc index f321e18..dc28dc3 100644 --- a/data/themes/default/default.edc +++ b/data/themes/default/default.edc @@ -310,9 +310,10 @@ collections { repeat_events: 0; description { rel1.relative: 0.5 1.0; - rel1.to_x: "entrance.password"; - rel1.to_y: "entrance.password"; - visible: 1; + rel1.to: "entrance.password"; + rel2.relative: 1.0 2.0; + rel2.to: "entrance.password"; + fixed: 1 1; params { string: "label" "Login"; } @@ -322,10 +323,12 @@ collections { part { name: "entrance.xsessions"; type: SWALLOW; description { state: "default" 0.0; - rel1.to_y: "entrance.password"; + rel1.to: "entrance.password"; rel1.relative: 0.0 1.0; - rel2.relative: 0.5 1.0; - //visible: 0; + rel2.to: "entrance.password"; + rel2.relative: 0.5 2.0; + fixed: 1 1; + //visible: 0; } description { state: "enabled" 0.0; inherit: "default" 0.0; @@ -462,17 +465,6 @@ collections { 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"; type: SWALLOW; description { state: "default" 0.0; @@ -488,7 +480,6 @@ collections { signal: "entrance,conf_user,enabled"; source: ""; action: STATE_SET "hidden" 0.0; - target: "hover"; target: "entrance.login"; } } diff --git a/src/bin/entrance_conf.c b/src/bin/entrance_conf.c index f7fbcd5..de67eca 100644 --- a/src/bin/entrance_conf.c +++ b/src/bin/entrance_conf.c @@ -541,7 +541,6 @@ _entrance_conf_user_auth(void *data, const char *user, Eina_Bool granted) } } - static Evas_Object * _entrance_conf_user_build(Evas_Object *obj) { @@ -554,6 +553,7 @@ _entrance_conf_user_build(Evas_Object *obj) o = entrance_login_add(ly, _entrance_conf_user_auth, ly); elm_object_part_content_set(ly, "entrance.login", o); evas_object_show(o); + t = elm_table_add(obj); elm_object_part_content_set(ly, "entrance.conf", t); evas_object_size_hint_weight_set(t, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); --
