From 2f7cc2897e88ee5240a380977008a9711535ab29 Mon Sep 17 00:00:00 2001 From: Michael Bouchaud Date: Mon, 24 Feb 2014 21:23:21 +0000 Subject: [PATCH] Revert "Updated the theme." This reverts commit aa05a94193a2e86fcbd69528a58fd2135539ace8. --- data/themes/default/default.edc | 27 ++++++++++++++++++--------- src/bin/entrance_conf.c | 2 +- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/data/themes/default/default.edc b/data/themes/default/default.edc index dc28dc3..f321e18 100644 --- a/data/themes/default/default.edc +++ b/data/themes/default/default.edc @@ -310,10 +310,9 @@ collections { repeat_events: 0; description { rel1.relative: 0.5 1.0; - rel1.to: "entrance.password"; - rel2.relative: 1.0 2.0; - rel2.to: "entrance.password"; - fixed: 1 1; + rel1.to_x: "entrance.password"; + rel1.to_y: "entrance.password"; + visible: 1; params { string: "label" "Login"; } @@ -323,12 +322,10 @@ collections { part { name: "entrance.xsessions"; type: SWALLOW; description { state: "default" 0.0; - rel1.to: "entrance.password"; + rel1.to_y: "entrance.password"; rel1.relative: 0.0 1.0; - rel2.to: "entrance.password"; - rel2.relative: 0.5 2.0; - fixed: 1 1; - //visible: 0; + rel2.relative: 0.5 1.0; + //visible: 0; } description { state: "enabled" 0.0; inherit: "default" 0.0; @@ -465,6 +462,17 @@ 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; @@ -480,6 +488,7 @@ 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 de67eca..f7fbcd5 100644 --- a/src/bin/entrance_conf.c +++ b/src/bin/entrance_conf.c @@ -541,6 +541,7 @@ _entrance_conf_user_auth(void *data, const char *user, Eina_Bool granted) } } + static Evas_Object * _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); 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);