enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

fix up randr smart monitor code so livethumb is swallowed RIGHT so map 

applies. :)



SVN revision: 77180
This commit is contained in:
Carsten Haitzler 2012-09-28 07:44:44 +00:00
parent e67f42cd0a
commit 0a766a74ea
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/modules/conf_randr/e_smart_monitor.c
View File

@ -319,8 +319,7 @@ _e_smart_add(Evas_Object *obj)
/* create bg preview */
sd->o_thumb = e_livethumb_add(evas);
edje_object_part_swallow(sd->o_frame, "e.swallow.preview", sd->o_thumb);
evas_object_smart_member_add(sd->o_thumb, obj);
evas_object_stack_below(sd->o_thumb, sd->o_frame);
evas_object_show(sd->o_thumb);
/* create monitor stand */
sd->o_stand = edje_object_add(evas);
@ -467,7 +466,6 @@ _e_smart_clip_set(Evas_Object *obj, Evas_Object *clip)
if (!(sd = evas_object_smart_data_get(obj)))
return;
evas_object_clip_set(sd->o_thumb, clip);
evas_object_clip_set(sd->o_stand, clip);
evas_object_clip_set(sd->o_frame, clip);
evas_object_clip_set(sd->o_base, clip);
@ -481,7 +479,6 @@ _e_smart_clip_unset(Evas_Object *obj)
if (!(sd = evas_object_smart_data_get(obj)))
return;
evas_object_clip_unset(sd->o_thumb);
evas_object_clip_unset(sd->o_stand);
evas_object_clip_unset(sd->o_frame);
evas_object_clip_unset(sd->o_base);
@ -633,14 +630,6 @@ _e_smart_cb_rotate_start(void *data, Evas_Object *obj __UNUSED__, const char *em
evas_map_util_points_populate_from_object(sd->map[0], sd->o_frame);
evas_object_map_set(sd->o_frame, sd->map[0]);
evas_object_map_enable_set(sd->o_frame, EINA_TRUE);
/* create livethumb 'map' for rotation */
sd->map[1] = evas_map_new(4);
evas_map_smooth_set(sd->map[1], EINA_TRUE);
evas_map_alpha_set(sd->map[1], EINA_TRUE);
evas_map_util_points_populate_from_object(sd->map[1], sd->o_thumb);
evas_object_map_set(sd->o_thumb, sd->map[1]);
evas_object_map_enable_set(sd->o_thumb, EINA_TRUE);
}
static void
@ -718,14 +707,6 @@ _e_smart_monitor_rotate(E_Smart_Data *sd, void *event)
evas_map_util_rotate(m2, mx, x + (w / 2), y + (h / 2));
evas_object_map_set(sd->o_frame, m2);
evas_map_free(m2);
/* update map for thumb object to reflect this rotation */
evas_object_geometry_get(sd->o_thumb, &x, &y, &w, &h);
m = evas_object_map_get(sd->o_thumb);
m2 = evas_map_dup(m);
evas_map_util_rotate(m2, mx, x + (w / 2), y + (h / 2));
evas_object_map_set(sd->o_thumb, m2);
evas_map_free(m2);
}
static void