diff options
| author | Stefan Schmidt <s.schmidt@samsung.com> | 2013-04-04 13:49:43 +0100 |
|---|---|---|
| committer | Stefan Schmidt <s.schmidt@samsung.com> | 2013-09-12 13:50:39 +0100 |
| commit | 7ef4fb5839875fbb62f74c7d58a3e1b99650ec37 (patch) | |
| tree | 34962834ad81099974d250f70014593d5d458a5c | |
| parent | 964bf73ed93813d83217743ef836638750b19ca1 (diff) | |
| download | enlightenment-7ef4fb5839875fbb62f74c7d58a3e1b99650ec37.tar.gz | |
desklock: Do not show the logo on user set background
While the logo matches from color and style for the default background
it most likely will clash with whatever backgrounbd the user sets as
desklock background.
Hide the logo if the user does not use the theme defined desklock
background.
| -rw-r--r-- | data/themes/edc/desklock.edc | 14 | ||||
| -rw-r--r-- | src/bin/e_desklock.c | 3 |
2 files changed, 17 insertions, 0 deletions
diff --git a/data/themes/edc/desklock.edc b/data/themes/edc/desklock.edc index 45cbbc9aa4..e03b1d44c0 100644 --- a/data/themes/edc/desklock.edc +++ b/data/themes/edc/desklock.edc @@ -39,6 +39,10 @@ group { name: "e/desklock/login_box"; rel2.relative: 0.5 0.5; FIXED_SIZE(100, 127) } + description { state: "invisible" 0.0; + inherit: "default" 0.0; + visible: 0; + } } part { name: "logo_glow"; description { state: "default" 0.0; @@ -51,6 +55,10 @@ group { name: "e/desklock/login_box"; inherit: "default" 0.0; color: 255 255 255 255; } + description { state: "invisible" 0.0; + inherit: "default" 0.0; + visible: 0; + } } part { name: "bg"; type: RECT; description { state: "default" 0.0; @@ -232,6 +240,12 @@ group { name: "e/desklock/login_box"; transition: SINUSOIDAL 2.4; after: "logo_pulse"; } + program { + signal: "e,logo,hide"; source: "e"; + action: STATE_SET "invisible" 0.0; + target: "logo"; + target: "logo_glow"; + } program { name: "cursor_show"; signal: "show"; source: ""; action: STATE_SET "visible" 0.0; diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c index bc77c7976b..ca9a1b2f14 100644 --- a/src/bin/e_desklock.c +++ b/src/bin/e_desklock.c @@ -525,6 +525,9 @@ _e_desklock_login_box_add(E_Desklock_Popup_Data *edp) E_LAYER_SET_ABOVE(edp->login_box, E_COMP_CANVAS_LAYER_DESKLOCK); } + /* FIXME only send this if user wallpaper is set */ + edje_object_signal_emit(edp->login_box, "e,logo,hide", "e"); + evas_object_clip_set(edp->login_box, edp->zone->bg_clip_object); } |