summaryrefslogtreecommitdiff
path: root/src/bin/e_bg.c
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2007-10-31 04:18:20 +0000
committerCarsten Haitzler <raster@rasterman.com>2007-10-31 04:18:20 +0000
commit67d9f11185522ac0c24089c5610b15b5517a6b30 (patch)
tree0247e7ff402790163db7cb0efeccff254cb0a3d2 /src/bin/e_bg.c
parent288e110240753351d5cbf467694d50fdba248e36 (diff)
fix transitions.
SVN revision: 32225
Diffstat (limited to 'src/bin/e_bg.c')
-rw-r--r--src/bin/e_bg.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/bin/e_bg.c b/src/bin/e_bg.c
index 4e8b905..b0d3ae0 100644
--- a/src/bin/e_bg.c
+++ b/src/bin/e_bg.c
@@ -209,6 +209,7 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
209 } 209 }
210 o = edje_object_add(zone->container->bg_evas); 210 o = edje_object_add(zone->container->bg_evas);
211 zone->transition_object = o; 211 zone->transition_object = o;
212 /* FIXME: segv if zone is deleted while up??? */
212 evas_object_data_set(o, "e_zone", zone); 213 evas_object_data_set(o, "e_zone", zone);
213 snprintf(buf, sizeof(buf), "e/transitions/%s", trans); 214 snprintf(buf, sizeof(buf), "e/transitions/%s", trans);
214 e_theme_edje_object_set(o, "base/theme/transitions", buf); 215 e_theme_edje_object_set(o, "base/theme/transitions", buf);
@@ -222,17 +223,24 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
222 o = edje_object_add(zone->container->bg_evas); 223 o = edje_object_add(zone->container->bg_evas);
223 zone->bg_object = o; 224 zone->bg_object = o;
224 evas_object_data_set(o, "e_zone", zone); 225 evas_object_data_set(o, "e_zone", zone);
225 evas_object_move(o, zone->x, zone->y);
226 evas_object_resize(o, zone->w, zone->h);
227 edje_object_file_set(o, bgfile, "e/desktop/background"); 226 edje_object_file_set(o, bgfile, "e/desktop/background");
228 evas_object_layer_set(o, -1); 227 if (transition == E_BG_TRANSITION_NONE)
228 {
229 evas_object_move(o, zone->x, zone->y);
230 evas_object_resize(o, zone->w, zone->h);
231 evas_object_layer_set(o, -1);
232 }
229 evas_object_clip_set(o, zone->bg_clip_object); 233 evas_object_clip_set(o, zone->bg_clip_object);
230 evas_object_show(o); 234 evas_object_show(o);
231 235
232 if (transition != E_BG_TRANSITION_NONE) 236 if (transition != E_BG_TRANSITION_NONE)
233 { 237 {
238 edje_extern_object_max_size_set(zone->prev_bg_object, 65536, 65536);
239 edje_extern_object_min_size_set(zone->prev_bg_object, 0, 0);
234 edje_object_part_swallow(zone->transition_object, "e.swallow.bg.old", 240 edje_object_part_swallow(zone->transition_object, "e.swallow.bg.old",
235 zone->prev_bg_object); 241 zone->prev_bg_object);
242 edje_extern_object_max_size_set(zone->bg_object, 65536, 65536);
243 edje_extern_object_min_size_set(zone->bg_object, 0, 0);
236 edje_object_part_swallow(zone->transition_object, "e.swallow.bg.new", 244 edje_object_part_swallow(zone->transition_object, "e.swallow.bg.new",
237 zone->bg_object); 245 zone->bg_object);
238 edje_object_signal_emit(zone->transition_object, "e,action,start", "e"); 246 edje_object_signal_emit(zone->transition_object, "e,action,start", "e");