summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViktor Kojouharov <vkojouharov@gmail.com>2011-10-16 14:53:27 +0000
committerViktor Kojouharov <vkojouharov@gmail.com>2011-10-16 14:53:27 +0000
commit96ff415a026aafdf0f9dea466ffb577f361a0346 (patch)
tree270556134738c814aeab7d65e1223ec009e5e7be
parent436918fe7a4124a01030e13d539f8737abbc2701 (diff)
fully remove the BG panning.
add a float_set message directed towards the bg object on desk show SVN revision: 64102
-rw-r--r--src/bin/e_bg.c176
-rw-r--r--src/bin/e_bg.h1
-rw-r--r--src/bin/e_config.c12
-rw-r--r--src/bin/e_config.h3
-rw-r--r--src/bin/e_desk.c21
-rw-r--r--src/bin/e_zone.c13
-rw-r--r--src/bin/e_zone.h1
-rw-r--r--src/modules/conf_display/e_int_config_desks.c38
8 files changed, 13 insertions, 252 deletions
diff --git a/src/bin/e_bg.c b/src/bin/e_bg.c
index 0bef1e1..55e7c72 100644
--- a/src/bin/e_bg.c
+++ b/src/bin/e_bg.c
@@ -3,7 +3,6 @@
3/* local subsystem functions */ 3/* local subsystem functions */
4static void _e_bg_signal(void *data, Evas_Object *obj, const char *emission, const char *source); 4static void _e_bg_signal(void *data, Evas_Object *obj, const char *emission, const char *source);
5static void _e_bg_event_bg_update_free(void *data, void *event); 5static void _e_bg_event_bg_update_free(void *data, void *event);
6static Eina_Bool _e_bg_slide_animator(void *data);
7 6
8static void _e_bg_image_import_dialog_done(void *data, const char *path, Eina_Bool ok, Eina_Bool external, int quality, E_Image_Import_Mode mode); 7static void _e_bg_image_import_dialog_done(void *data, const char *path, Eina_Bool ok, Eina_Bool external, int quality, E_Image_Import_Mode mode);
9static void _e_bg_image_import_done(void *data, Eina_Bool ok, const char *image_path, const char *edje_path); 8static void _e_bg_image_import_done(void *data, Eina_Bool ok, const char *image_path, const char *edje_path);
@@ -13,21 +12,6 @@ static void _e_bg_handler_image_imported(void *data, const char *image_path);
13EAPI int E_EVENT_BG_UPDATE = 0; 12EAPI int E_EVENT_BG_UPDATE = 0;
14static E_Fm2_Mime_Handler *bg_hdl = NULL; 13static E_Fm2_Mime_Handler *bg_hdl = NULL;
15 14
16typedef struct _E_Bg_Anim_Params E_Bg_Anim_Params;
17struct _E_Bg_Anim_Params
18{
19 E_Zone *zone;
20 double start_time;
21 int start_x;
22 int start_y;
23 int end_x;
24 int end_y;
25
26 struct {
27 Eina_Bool x, y;
28 } freedom;
29};
30
31struct _E_Bg_Image_Import_Handle 15struct _E_Bg_Image_Import_Handle
32{ 16{
33 struct { 17 struct {
@@ -244,7 +228,6 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
244 else if (transition == E_BG_TRANSITION_DESK) trans = e_config->transition_desk; 228 else if (transition == E_BG_TRANSITION_DESK) trans = e_config->transition_desk;
245 else if (transition == E_BG_TRANSITION_CHANGE) trans = e_config->transition_change; 229 else if (transition == E_BG_TRANSITION_CHANGE) trans = e_config->transition_change;
246 if ((!trans) || (!trans[0])) transition = E_BG_TRANSITION_NONE; 230 if ((!trans) || (!trans[0])) transition = E_BG_TRANSITION_NONE;
247 if (e_config->desk_flip_pan_bg) transition = E_BG_TRANSITION_NONE;
248 231
249 desk = e_desk_current_get(zone); 232 desk = e_desk_current_get(zone);
250 if (desk) 233 if (desk)
@@ -257,7 +240,7 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
257 const char *pfile = ""; 240 const char *pfile = "";
258 241
259 edje_object_file_get(zone->bg_object, &pfile, NULL); 242 edje_object_file_get(zone->bg_object, &pfile, NULL);
260 if ((!e_util_strcmp(pfile, bgfile)) && !e_config->desk_flip_pan_bg) return; 243 if (!e_util_strcmp(pfile, bgfile)) return;
261 } 244 }
262 245
263 if (transition == E_BG_TRANSITION_NONE) 246 if (transition == E_BG_TRANSITION_NONE)
@@ -317,30 +300,6 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
317 } 300 }
318 evas_object_clip_set(o, zone->bg_clip_object); 301 evas_object_clip_set(o, zone->bg_clip_object);
319 evas_object_show(o); 302 evas_object_show(o);
320 if (e_config->desk_flip_pan_bg)
321 {
322 int x = 0, y = 0;
323
324 o = zone->bg_scrollframe;
325 if (!o)
326 {
327 o = e_scrollframe_add(zone->container->bg_evas);
328 zone->bg_scrollframe = o;
329 e_scrollframe_custom_theme_set(o, "base/theme/background",
330 "e/desktop/background/scrollframe");
331 e_scrollframe_policy_set(o, E_SCROLLFRAME_POLICY_OFF, E_SCROLLFRAME_POLICY_OFF);
332 e_scrollframe_child_pos_set(o, 0, 0);
333 evas_object_show(o);
334 }
335 e_scrollframe_child_set(o, zone->bg_object);
336 if (desk)
337 {
338 x = desk->x;
339 y = desk->y;
340 }
341 e_bg_zone_slide(zone, x, y);
342 return;
343 }
344 303
345 if (transition != E_BG_TRANSITION_NONE) 304 if (transition != E_BG_TRANSITION_NONE)
346 { 305 {
@@ -357,71 +316,6 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
357} 316}
358 317
359EAPI void 318EAPI void
360e_bg_zone_slide(E_Zone *zone, int prev_x, int prev_y)
361{
362 Evas_Object *o;
363 E_Desk *desk;
364 Evas_Coord w, h, maxw, maxh, step_w, step_h;
365 Ecore_Animator *anim;
366 E_Bg_Anim_Params *params;
367 Evas_Coord vw, vh, px, py;
368 int fx, fy;
369 const void *data;
370
371 desk = e_desk_current_get(zone);
372 edje_object_size_max_get(zone->bg_object, &w, &h);
373 maxw = zone->w * zone->desk_x_count;
374 maxh = zone->h * zone->desk_y_count;
375 if (!w) w = maxw;
376 if (!h) h = maxh;
377 evas_object_resize(zone->bg_object, w, h);
378 if (zone->desk_x_count > 1)
379 step_w = ((double) (w - zone->w)) / (zone->desk_x_count - 1);
380 else step_w = 0;
381 if (zone->desk_y_count > 1)
382 step_h = ((double) (h - zone->h)) / (zone->desk_y_count - 1);
383 else step_h = 0;
384
385 o = zone->bg_scrollframe;
386 evas_object_move(o, zone->x, zone->y);
387 evas_object_resize(o, zone->w, zone->h);
388 evas_object_layer_set(o, -1);
389 evas_object_clip_set(o, zone->bg_clip_object);
390
391 data = edje_object_data_get(zone->bg_object, "directional_freedom");
392 e_scrollframe_child_viewport_size_get(o, &vw, &vh);
393 e_scrollframe_child_pos_get(o, &px, &py);
394 params = evas_object_data_get(zone->bg_object, "switch_animator_params");
395 if (!params)
396 params = E_NEW(E_Bg_Anim_Params, 1);
397 params->zone = zone;
398 params->start_x = px;
399 params->start_y = py;
400 params->end_x = desk->x * step_w * e_config->desk_flip_pan_x_axis_factor;
401 params->end_y = desk->y * step_h * e_config->desk_flip_pan_y_axis_factor;
402 params->start_time = 0.0;
403 if ((data) && (sscanf(data, "%d %d", &fx, &fy) == 2))
404 {
405 if (fx)
406 {
407 params->freedom.x = EINA_TRUE;
408 params->start_x = prev_x * step_w * e_config->desk_flip_pan_x_axis_factor;
409 }
410 if (fy)
411 {
412 params->freedom.y = EINA_TRUE;
413 params->start_y = prev_y * step_h * e_config->desk_flip_pan_y_axis_factor;
414 }
415 }
416
417 anim = evas_object_data_get(zone->bg_object, "switch_animator");
418 if (anim) ecore_animator_del(anim);
419 anim = ecore_animator_add(_e_bg_slide_animator, params);
420 evas_object_data_set(zone->bg_object, "switch_animator", anim);
421 evas_object_data_set(zone->bg_object, "switch_animator_params", params);
422}
423
424EAPI void
425e_bg_default_set(const char *file) 319e_bg_default_set(const char *file)
426{ 320{
427 E_Event_Bg_Update *ev; 321 E_Event_Bg_Update *ev;
@@ -763,74 +657,6 @@ _e_bg_event_bg_update_free(void *data __UNUSED__, void *event)
763 free(event); 657 free(event);
764} 658}
765 659
766static Eina_Bool
767_e_bg_slide_animator(void *data)
768{
769 E_Bg_Anim_Params *params;
770 E_Zone *zone;
771 Evas_Object *o;
772 double st;
773 double t, dt, spd;
774 Evas_Coord px, py, rx, ry, bw, bh, panw, panh;
775 Edje_Message_Int_Set *msg;
776
777 params = data;
778 zone = params->zone;
779 t = ecore_loop_time_get();
780 spd = e_config->desk_flip_animate_time;
781
782 o = zone->bg_scrollframe;
783 if (!params->start_time)
784 st = params->start_time = t;
785 else
786 st = params->start_time;
787
788 dt = (t - st) / spd;
789 if (dt > 1.0) dt = 1.0;
790 dt = 1.0 - dt;
791 dt *= dt; /* decelerate - could be a better hack */
792
793 if (params->end_x > params->start_x)
794 rx = params->start_x + (params->end_x - params->start_x) * (1.0 - dt);
795 else
796 rx = params->end_x + (params->start_x - params->end_x) * dt;
797 if (params->freedom.x) px = zone->x;
798 else px = rx;
799
800 if (params->end_y > params->start_y)
801 ry = params->start_y + (params->end_y - params->start_y) * (1.0 - dt);
802 else
803 ry = params->end_y + (params->start_y - params->end_y) * dt;
804 if (params->freedom.y) py = zone->y;
805 else py = ry;
806
807 e_scrollframe_child_pos_set(o, px, py);
808
809 evas_object_geometry_get(zone->bg_object, NULL, NULL, &bw, &bh);
810 panw = bw - zone->w;
811 if (panw < 0) panw = 0;
812 panh = bh - zone->h;
813 if (panh < 0) panh = 0;
814 msg = alloca(sizeof(Edje_Message_Int_Set) + (5 * sizeof(int)));
815 msg->count = 6;
816 msg->val[0] = rx;
817 msg->val[1] = ry;
818 msg->val[2] = panw;
819 msg->val[3] = panh;
820 msg->val[4] = bw;
821 msg->val[5] = bh;
822 edje_object_message_send(zone->bg_object, EDJE_MESSAGE_INT_SET, 0, msg);
823
824 if (dt <= 0.0)
825 {
826 evas_object_data_del(zone->bg_object, "switch_animator");
827 evas_object_data_del(zone->bg_object, "switch_animator_params");
828 E_FREE(params);
829 return ECORE_CALLBACK_CANCEL;
830 }
831 return ECORE_CALLBACK_RENEW;
832}
833
834static void 660static void
835_e_bg_image_import_dialog_done(void *data, const char *path, Eina_Bool ok, Eina_Bool external, int quality, E_Image_Import_Mode mode) 661_e_bg_image_import_dialog_done(void *data, const char *path, Eina_Bool ok, Eina_Bool external, int quality, E_Image_Import_Mode mode)
836{ 662{
diff --git a/src/bin/e_bg.h b/src/bin/e_bg.h
index 54e48cb..39df349 100644
--- a/src/bin/e_bg.h
+++ b/src/bin/e_bg.h
@@ -31,7 +31,6 @@ EINTERN int e_bg_shutdown(void);
31EAPI const E_Config_Desktop_Background *e_bg_config_get(int container_num, int zone_num, int desk_x, int desk_y); 31EAPI const E_Config_Desktop_Background *e_bg_config_get(int container_num, int zone_num, int desk_x, int desk_y);
32EAPI const char *e_bg_file_get(int container_num, int zone_num, int desk_x, int desk_y); 32EAPI const char *e_bg_file_get(int container_num, int zone_num, int desk_x, int desk_y);
33EAPI void e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition); 33EAPI void e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition);
34EAPI void e_bg_zone_slide(E_Zone *zone, int prev_x, int prev_y);
35EAPI void e_bg_add(int container, int zone, int desk_x, int desk_y, const char *file); 34EAPI void e_bg_add(int container, int zone, int desk_x, int desk_y, const char *file);
36EAPI void e_bg_del(int container, int zone, int desk_x, int desk_y); 35EAPI void e_bg_del(int container, int zone, int desk_x, int desk_y);
37EAPI void e_bg_default_set(const char *file); 36EAPI void e_bg_default_set(const char *file);
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 4014c2f..3592bf8 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -834,9 +834,6 @@ e_config_init(void)
834 E_CONFIG_VAL(D, T, desk_flip_animate_mode, INT); 834 E_CONFIG_VAL(D, T, desk_flip_animate_mode, INT);
835 E_CONFIG_VAL(D, T, desk_flip_animate_interpolation, INT); 835 E_CONFIG_VAL(D, T, desk_flip_animate_interpolation, INT);
836 E_CONFIG_VAL(D, T, desk_flip_animate_time, DOUBLE); 836 E_CONFIG_VAL(D, T, desk_flip_animate_time, DOUBLE);
837 E_CONFIG_VAL(D, T, desk_flip_pan_bg, UCHAR);
838 E_CONFIG_VAL(D, T, desk_flip_pan_x_axis_factor, DOUBLE);
839 E_CONFIG_VAL(D, T, desk_flip_pan_y_axis_factor, DOUBLE);
840 837
841 E_CONFIG_VAL(D, T, wallpaper_import_last_dev, STR); 838 E_CONFIG_VAL(D, T, wallpaper_import_last_dev, STR);
842 E_CONFIG_VAL(D, T, wallpaper_import_last_path, STR); 839 E_CONFIG_VAL(D, T, wallpaper_import_last_path, STR);
@@ -1164,12 +1161,6 @@ e_config_load(void)
1164 COPYVAL(screensaver_ask_presentation_timeout); 1161 COPYVAL(screensaver_ask_presentation_timeout);
1165 IFCFGEND; 1162 IFCFGEND;
1166 1163
1167 IFCFG(0x0133);
1168 COPYVAL(desk_flip_pan_bg);
1169 COPYVAL(desk_flip_pan_x_axis_factor);
1170 COPYVAL(desk_flip_pan_y_axis_factor);
1171 IFCFGEND;
1172
1173 IFCFG(0x0134); 1164 IFCFG(0x0134);
1174 COPYVAL(exec.expire_timeout); 1165 COPYVAL(exec.expire_timeout);
1175 COPYVAL(exec.show_run_dialog); 1166 COPYVAL(exec.show_run_dialog);
@@ -1300,9 +1291,6 @@ e_config_load(void)
1300 E_CONFIG_LIMIT(e_config->desk_flip_wrap, 0, 1); 1291 E_CONFIG_LIMIT(e_config->desk_flip_wrap, 0, 1);
1301 E_CONFIG_LIMIT(e_config->fullscreen_flip, 0, 1); 1292 E_CONFIG_LIMIT(e_config->fullscreen_flip, 0, 1);
1302 E_CONFIG_LIMIT(e_config->icon_theme_overrides, 0, 1); 1293 E_CONFIG_LIMIT(e_config->icon_theme_overrides, 0, 1);
1303 E_CONFIG_LIMIT(e_config->desk_flip_pan_bg, 0, 1);
1304 E_CONFIG_LIMIT(e_config->desk_flip_pan_x_axis_factor, 0.0, 1.0);
1305 E_CONFIG_LIMIT(e_config->desk_flip_pan_y_axis_factor, 0.0, 1.0);
1306 E_CONFIG_LIMIT(e_config->remember_internal_windows, 0, 3); 1294 E_CONFIG_LIMIT(e_config->remember_internal_windows, 0, 3);
1307 E_CONFIG_LIMIT(e_config->desk_auto_switch, 0, 1); 1295 E_CONFIG_LIMIT(e_config->desk_auto_switch, 0, 1);
1308 1296
diff --git a/src/bin/e_config.h b/src/bin/e_config.h
index 74379e1..123843b 100644
--- a/src/bin/e_config.h
+++ b/src/bin/e_config.h
@@ -263,9 +263,6 @@ struct _E_Config
263 int desk_flip_animate_mode; // GUI 263 int desk_flip_animate_mode; // GUI
264 int desk_flip_animate_interpolation; // GUI 264 int desk_flip_animate_interpolation; // GUI
265 double desk_flip_animate_time; // GUI 265 double desk_flip_animate_time; // GUI
266 unsigned char desk_flip_pan_bg;
267 double desk_flip_pan_x_axis_factor;
268 double desk_flip_pan_y_axis_factor;
269 266
270 const char *wallpaper_import_last_dev; // INTERNAL 267 const char *wallpaper_import_last_dev; // INTERNAL
271 const char *wallpaper_import_last_path; // INTERNAL 268 const char *wallpaper_import_last_path; // INTERNAL
diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index ed6c87b..b140187 100644
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -197,9 +197,10 @@ e_desk_show(E_Desk *desk)
197 E_Event_Desk_Show *ev; 197 E_Event_Desk_Show *ev;
198 E_Event_Desk_Before_Show *eev; 198 E_Event_Desk_Before_Show *eev;
199 E_Event_Desk_After_Show *eeev; 199 E_Event_Desk_After_Show *eeev;
200 Edje_Message_Float_Set *msg;
200 Eina_List *l; 201 Eina_List *l;
201 E_Shelf *es; 202 E_Shelf *es;
202 int was_zone = 0, x, y, dx = 0, dy = 0, prev_x = 0, prev_y = 0; 203 int was_zone = 0, x, y, dx = 0, dy = 0;
203 204
204 E_OBJECT_CHECK(desk); 205 E_OBJECT_CHECK(desk);
205 E_OBJECT_TYPE_CHECK(desk, E_DESK_TYPE); 206 E_OBJECT_TYPE_CHECK(desk, E_DESK_TYPE);
@@ -222,8 +223,6 @@ e_desk_show(E_Desk *desk)
222 if (desk2->visible) 223 if (desk2->visible)
223 { 224 {
224 desk2->visible = 0; 225 desk2->visible = 0;
225 prev_x = desk2->x;
226 prev_y = desk2->y;
227 dx = desk->x - desk2->x; 226 dx = desk->x - desk2->x;
228 dy = desk->y - desk2->y; 227 dy = desk->y - desk2->y;
229 if (e_config->desk_flip_animate_mode > 0) 228 if (e_config->desk_flip_animate_mode > 0)
@@ -238,6 +237,15 @@ e_desk_show(E_Desk *desk)
238 desk->zone->desk_y_current = desk->y; 237 desk->zone->desk_y_current = desk->y;
239 desk->visible = 1; 238 desk->visible = 1;
240 239
240 msg = alloca(sizeof(Edje_Message_Float_Set) + sizeof(double));
241 msg->count = 1;
242 msg->val[0] = e_config->desk_flip_animate_time;
243 msg->val[1] = (double) desk->x;
244 msg->val[2] = (double) desk->zone->desk_x_count;
245 msg->val[3] = (double) desk->y;
246 msg->val[4] = (double) desk->zone->desk_y_count;
247 edje_object_message_send(desk->zone->bg_object, EDJE_MESSAGE_FLOAT_SET, 0, msg);
248
241 if (desk->zone->bg_object) was_zone = 1; 249 if (desk->zone->bg_object) was_zone = 1;
242 if (e_config->desk_flip_animate_mode == 0) 250 if (e_config->desk_flip_animate_mode == 0)
243 { 251 {
@@ -266,12 +274,7 @@ e_desk_show(E_Desk *desk)
266 } 274 }
267 275
268 if (was_zone) 276 if (was_zone)
269 { 277 e_bg_zone_update(desk->zone, E_BG_TRANSITION_DESK);
270 if (e_config->desk_flip_pan_bg)
271 e_bg_zone_slide(desk->zone, prev_x, prev_y);
272 else
273 e_bg_zone_update(desk->zone, E_BG_TRANSITION_DESK);
274 }
275 else 278 else
276 e_bg_zone_update(desk->zone, E_BG_TRANSITION_START); 279 e_bg_zone_update(desk->zone, E_BG_TRANSITION_START);
277 280
diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index c9b21e8..7f89521 100644
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -282,8 +282,6 @@ e_zone_move(E_Zone *zone,
282 zone->x = x; 282 zone->x = x;
283 zone->y = y; 283 zone->y = y;
284 evas_object_move(zone->bg_object, x, y); 284 evas_object_move(zone->bg_object, x, y);
285 if (zone->bg_scrollframe)
286 evas_object_move(zone->bg_scrollframe, x, y);
287 evas_object_move(zone->bg_event_object, x, y); 285 evas_object_move(zone->bg_event_object, x, y);
288 evas_object_move(zone->bg_clip_object, x, y); 286 evas_object_move(zone->bg_clip_object, x, y);
289 287
@@ -315,8 +313,6 @@ e_zone_resize(E_Zone *zone,
315 zone->w = w; 313 zone->w = w;
316 zone->h = h; 314 zone->h = h;
317 evas_object_resize(zone->bg_object, w, h); 315 evas_object_resize(zone->bg_object, w, h);
318 if (zone->bg_scrollframe)
319 evas_object_resize(zone->bg_scrollframe, w, h);
320 evas_object_resize(zone->bg_event_object, w, h); 316 evas_object_resize(zone->bg_event_object, w, h);
321 evas_object_resize(zone->bg_clip_object, w, h); 317 evas_object_resize(zone->bg_clip_object, w, h);
322 318
@@ -356,13 +352,9 @@ e_zone_move_resize(E_Zone *zone,
356 zone->h = h; 352 zone->h = h;
357 353
358 evas_object_move(zone->bg_object, x, y); 354 evas_object_move(zone->bg_object, x, y);
359 if (zone->bg_scrollframe)
360 evas_object_move(zone->bg_scrollframe, x, y);
361 evas_object_move(zone->bg_event_object, x, y); 355 evas_object_move(zone->bg_event_object, x, y);
362 evas_object_move(zone->bg_clip_object, x, y); 356 evas_object_move(zone->bg_clip_object, x, y);
363 evas_object_resize(zone->bg_object, w, h); 357 evas_object_resize(zone->bg_object, w, h);
364 if (zone->bg_scrollframe)
365 evas_object_resize(zone->bg_scrollframe, w, h);
366 evas_object_resize(zone->bg_event_object, w, h); 358 evas_object_resize(zone->bg_event_object, w, h);
367 evas_object_resize(zone->bg_clip_object, w, h); 359 evas_object_resize(zone->bg_clip_object, w, h);
368 360
@@ -1480,14 +1472,9 @@ _e_zone_free(E_Zone *zone)
1480 con = zone->container; 1472 con = zone->container;
1481 if (zone->name) eina_stringshare_del(zone->name); 1473 if (zone->name) eina_stringshare_del(zone->name);
1482 con->zones = eina_list_remove(con->zones, zone); 1474 con->zones = eina_list_remove(con->zones, zone);
1483 anim = evas_object_data_get(zone->bg_object, "switch_animator");
1484 if (anim) ecore_animator_del(anim);
1485 data = evas_object_data_get(zone->bg_object, "switch_animator_params");
1486 if (data) E_FREE(data);
1487 evas_object_del(zone->bg_event_object); 1475 evas_object_del(zone->bg_event_object);
1488 evas_object_del(zone->bg_clip_object); 1476 evas_object_del(zone->bg_clip_object);
1489 evas_object_del(zone->bg_object); 1477 evas_object_del(zone->bg_object);
1490 evas_object_del(zone->bg_scrollframe);
1491 if (zone->prev_bg_object) evas_object_del(zone->prev_bg_object); 1478 if (zone->prev_bg_object) evas_object_del(zone->prev_bg_object);
1492 if (zone->transition_object) evas_object_del(zone->transition_object); 1479 if (zone->transition_object) evas_object_del(zone->transition_object);
1493 1480
diff --git a/src/bin/e_zone.h b/src/bin/e_zone.h
index f0c5d70..be902c6 100644
--- a/src/bin/e_zone.h
+++ b/src/bin/e_zone.h
@@ -45,7 +45,6 @@ struct _E_Zone
45 Evas_Object *bg_event_object; 45 Evas_Object *bg_event_object;
46 Evas_Object *bg_clip_object; 46 Evas_Object *bg_clip_object;
47 Evas_Object *prev_bg_object; 47 Evas_Object *prev_bg_object;
48 Evas_Object *bg_scrollframe;
49 Evas_Object *transition_object; 48 Evas_Object *transition_object;
50 49
51 int desk_x_count, desk_y_count; 50 int desk_x_count, desk_y_count;
diff --git a/src/modules/conf_display/e_int_config_desks.c b/src/modules/conf_display/e_int_config_desks.c
index 2bd3e9e..1aa6833 100644
--- a/src/modules/conf_display/e_int_config_desks.c
+++ b/src/modules/conf_display/e_int_config_desks.c
@@ -19,10 +19,7 @@ struct _E_Config_Dialog_Data
19 int flip_wrap; 19 int flip_wrap;
20 int flip_mode; 20 int flip_mode;
21 int flip_interp; 21 int flip_interp;
22 int flip_pan_bg;
23 double flip_speed; 22 double flip_speed;
24 double x_axis_pan;
25 double y_axis_pan;
26 23
27 /*- GUI -*/ 24 /*- GUI -*/
28 Evas_Object *preview; 25 Evas_Object *preview;
@@ -65,10 +62,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
65 cfdata->flip_wrap = e_config->desk_flip_wrap; 62 cfdata->flip_wrap = e_config->desk_flip_wrap;
66 cfdata->flip_mode = e_config->desk_flip_animate_mode; 63 cfdata->flip_mode = e_config->desk_flip_animate_mode;
67 cfdata->flip_interp = e_config->desk_flip_animate_interpolation; 64 cfdata->flip_interp = e_config->desk_flip_animate_interpolation;
68 cfdata->flip_pan_bg = e_config->desk_flip_pan_bg;
69 cfdata->flip_speed = e_config->desk_flip_animate_time; 65 cfdata->flip_speed = e_config->desk_flip_animate_time;
70 cfdata->x_axis_pan = e_config->desk_flip_pan_x_axis_factor;
71 cfdata->y_axis_pan = e_config->desk_flip_pan_y_axis_factor;
72} 66}
73 67
74static void * 68static void *
@@ -106,10 +100,7 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
106 100
107 e_config->desk_flip_animate_mode = cfdata->flip_mode; 101 e_config->desk_flip_animate_mode = cfdata->flip_mode;
108 e_config->desk_flip_animate_interpolation = cfdata->flip_interp; 102 e_config->desk_flip_animate_interpolation = cfdata->flip_interp;
109 e_config->desk_flip_pan_bg = cfdata->flip_pan_bg;
110 e_config->desk_flip_animate_time = cfdata->flip_speed; 103 e_config->desk_flip_animate_time = cfdata->flip_speed;
111 e_config->desk_flip_pan_x_axis_factor = cfdata->x_axis_pan;
112 e_config->desk_flip_pan_y_axis_factor = cfdata->y_axis_pan;
113 104
114 e_config->edge_flip_dragging = cfdata->edge_flip_dragging; 105 e_config->edge_flip_dragging = cfdata->edge_flip_dragging;
115 e_config->desk_flip_wrap = cfdata->flip_wrap; 106 e_config->desk_flip_wrap = cfdata->flip_wrap;
@@ -139,10 +130,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
139 130
140 return ((e_config->desk_flip_animate_mode != cfdata->flip_mode) || 131 return ((e_config->desk_flip_animate_mode != cfdata->flip_mode) ||
141 (e_config->desk_flip_animate_interpolation != cfdata->flip_interp) || 132 (e_config->desk_flip_animate_interpolation != cfdata->flip_interp) ||
142 (e_config->desk_flip_pan_bg != cfdata->flip_pan_bg) ||
143 (e_config->desk_flip_animate_time != cfdata->flip_speed) || 133 (e_config->desk_flip_animate_time != cfdata->flip_speed) ||
144 (e_config->desk_flip_pan_x_axis_factor != cfdata->x_axis_pan) ||
145 (e_config->desk_flip_pan_y_axis_factor != cfdata->y_axis_pan) ||
146 (e_config->edge_flip_dragging != cfdata->edge_flip_dragging) || 134 (e_config->edge_flip_dragging != cfdata->edge_flip_dragging) ||
147 (e_config->desk_flip_wrap != cfdata->flip_wrap)); 135 (e_config->desk_flip_wrap != cfdata->flip_wrap));
148} 136}
@@ -203,13 +191,6 @@ _basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dial
203 e_widget_on_change_hook_set(ob, _cb_disable_flip_anim, cfdata); 191 e_widget_on_change_hook_set(ob, _cb_disable_flip_anim, cfdata);
204 e_widget_list_object_append(o, ob, 1, 0, 0.5); 192 e_widget_list_object_append(o, ob, 1, 0, 0.5);
205 193
206/* this is broken in e so disable in config dialog.
207 ob = e_widget_check_add(evas, _("Background panning"),
208 &(cfdata->flip_pan_bg));
209 e_widget_disabled_set(ob, !cfdata->flip_mode);
210 cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob);
211 e_widget_list_object_append(o, ob, 1, 0, 0.5);
212 */
213 ob = e_widget_label_add(evas, _("Animation speed")); 194 ob = e_widget_label_add(evas, _("Animation speed"));
214 cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob); 195 cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob);
215 e_widget_list_object_append(o, ob, 1, 0, 0.5); 196 e_widget_list_object_append(o, ob, 1, 0, 0.5);
@@ -218,25 +199,6 @@ _basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dial
218 e_widget_disabled_set(ob, !cfdata->flip_mode); 199 e_widget_disabled_set(ob, !cfdata->flip_mode);
219 cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob); 200 cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob);
220 e_widget_list_object_append(o, ob, 1, 0, 0.5); 201 e_widget_list_object_append(o, ob, 1, 0, 0.5);
221/*
222 ob = e_widget_label_add(evas, _("X-Axis pan factor"));
223 cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob);
224 e_widget_list_object_append(o, ob, 1, 0, 0.5);
225 ob = e_widget_slider_add(evas, 1, 0, _("%.2f"), 0, 1, 0.01, 0,
226 &(cfdata->x_axis_pan), NULL, 150);
227 e_widget_disabled_set(ob, !cfdata->flip_mode);
228 e_widget_list_object_append(o, ob, 1, 0, 0.5);
229 cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob);
230
231 ob = e_widget_label_add(evas, _("Y-Axis pan factor"));
232 cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob);
233 e_widget_list_object_append(o, ob, 1, 0, 0.5);
234 ob = e_widget_slider_add(evas, 1, 0, _("%.2f"), 0, 1, 0.01, 0,
235 &(cfdata->y_axis_pan), NULL, 150);
236 e_widget_disabled_set(ob, !cfdata->flip_mode);
237 e_widget_list_object_append(o, ob, 1, 0, 0.5);
238 cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob);
239 */
240 e_widget_toolbook_page_append(otb, NULL, _("Flip Animation"), o, 202 e_widget_toolbook_page_append(otb, NULL, _("Flip Animation"), o,
241 1, 0, 1, 0, 0.5, 0.0); 203 1, 0, 1, 0, 0.5, 0.0);
242 204