--- compositor.c.old 2006-04-24 14:30:13.000000000 -0400 +++ compositor.c 2006-04-24 14:27:39.000000000 -0400 @@ -893,12 +893,12 @@ WsRectangle rect; interpolate_rectangle (elapsed, &info->current_geometry, &info->target_geometry, &rect); - + /* g_print ("y: %d %d (%f => %d)\n", info->current_geometry.y, info->target_geometry.y, elapsed, rect.y); g_print ("setting: %d %d %d %d\n", rect.x, rect.y, rect.width, rect.height); - + */ meta_screen_info_set_target_rect (info->scr_info, get_xid (info->window), &rect); } @@ -1137,62 +1137,54 @@ MetaAnimationFinishedFunc finished, gpointer data) { - ExplodeInfo *info = g_new0 (ExplodeInfo, 1); - - info->window = window; - info->level = 0.0; - info->timer = g_timer_new (); - info->func = finished; - info->data = data; - info->minfo = meta_screen_info_get_by_xwindow (get_xid (window)); + if (g_getenv ("USE_EXPLOSION")) + { + ExplodeInfo *info = g_new0 (ExplodeInfo, 1); + + info->window = window; + info->level = 0.0; + info->timer = g_timer_new (); + info->func = finished; + info->data = data; + info->minfo = meta_screen_info_get_by_xwindow (get_xid (window)); - g_idle_add (update_explosion, info); -} - -#if 0 -void -meta_compositor_minimize (MetaCompositor *compositor, - MetaWindow *window, - int x, - int y, - int width, - int height, - MetaAnimationFinishedFunc finished, - gpointer data) -{ - MiniInfo *info = g_new (MiniInfo, 1); - WsRectangle start; - MetaScreen *screen = window->screen; - - info->window = window; - info->timer = g_timer_new (); - - info->finished_func = finished; - info->finished_data = data; - - info->phase_1_started = FALSE; - info->phase_2_started = FALSE; - info->phase_3_started = FALSE; - info->phase_4_started = FALSE; - info->phase_5_started = FALSE; - - info->button_x = x; - info->button_y = y; - info->button_width = width; - info->button_height = height; - - info->compositor = compositor; - info->scr_info = screen->compositor_data; - + g_idle_add (update_explosion, info); + } + else + { + MiniInfo *info = g_new (MiniInfo, 1); + WsRectangle start; + MetaScreen *screen = window->screen; + + info->window = window; + info->timer = g_timer_new (); + + info->finished_func = finished; + info->finished_data = data; + + info->phase_1_started = FALSE; + info->phase_2_started = FALSE; + info->phase_3_started = FALSE; + info->phase_4_started = FALSE; + info->phase_5_started = FALSE; + + info->button_x = x; + info->button_y = y; + info->button_width = width; + info->button_height = height; + + info->compositor = compositor; + info->scr_info = screen->compositor_data; + #if 0 cm_drawable_node_set_deformation_func (node, minimize_deformation, info); #endif - info->aspect_ratio = 1.3; + info->aspect_ratio = 1.3; - g_idle_add (run_animation_01, info); + g_idle_add (run_animation_01, info); + } } -#endif #endif