resi
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When moving monitors around, use the geometry of the monitor frame to 

determine collision/intersection for cloning reasons (needed due to
monitor object itself having some padding around the frame which was
causing erroneous intersection calculations).

NB: Calling this one the JackDanielZ fix ;)

Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 82867
This commit is contained in:
Christopher Michael 2013-01-16 08:41:48 +00:00 committed by Christopher Michael
parent 44b62de0b6
commit 4a49bf8b05
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/modules/conf_randr/e_smart_randr.c
View File

@ -805,6 +805,7 @@ _e_smart_randr_monitor_cb_moving(void *data, Evas_Object *obj, void *event EINA_
E_Smart_Data *sd; E_Smart_Data *sd;
Eina_List *l = NULL; Eina_List *l = NULL;
Evas_Object *mon; Evas_Object *mon;
Evas_Coord ox = 0, oy = 0;
Eina_Rectangle o; Eina_Rectangle o;
/* data is the randr object */ /* data is the randr object */
@ -813,22 +814,27 @@ _e_smart_randr_monitor_cb_moving(void *data, Evas_Object *obj, void *event EINA_
/* try to get the RandR objects smart data */ /* try to get the RandR objects smart data */
if (!(sd = evas_object_smart_data_get(o_randr))) return; if (!(sd = evas_object_smart_data_get(o_randr))) return;
/* NB FIXME: Hmmmm, this may need to use the geometry of the actual /* get the current frame geometry of the monitor we were passed in */
* frame object for comparison */ e_smart_monitor_frame_geometry_get(obj, &ox, &oy, NULL, NULL);
/* get the current geometry of the monitor we were passed in */ /* convert frame geometry into virtual space */
e_layout_child_geometry_get(obj, &o.x, &o.y, &o.w, &o.h); e_layout_coord_canvas_to_virtual(sd->o_layout, ox, oy, &o.x, &o.y);
/* loop the list of monitors */ /* loop the list of monitors */
EINA_LIST_FOREACH(sd->monitors, l, mon) EINA_LIST_FOREACH(sd->monitors, l, mon)
{ {
Eina_Rectangle m; Eina_Rectangle m;
Evas_Coord fx = 0, fy = 0, fw = 0, fh = 0;
/* if this monitor is the one we want to skip, than skip it */ /* if this monitor is the one we want to skip, than skip it */
if (mon == obj) continue; if (mon == obj) continue;
/* get the current geometry of this monitor */ /* get the geometry of the monitor frame */
e_layout_child_geometry_get(mon, &m.x, &m.y, &m.w, &m.h); e_smart_monitor_frame_geometry_get(mon, &fx, &fy, &fw, &fh);
/* convert frame geometry into virtual space */
e_layout_coord_canvas_to_virtual(sd->o_layout, fx, fy, &m.x, &m.y);
e_layout_coord_canvas_to_virtual(sd->o_layout, fw, fh, &m.w, &m.h);
/* check if the moved monitor is inside an existing one */ /* check if the moved monitor is inside an existing one */
if (E_INSIDE(o.x, o.y, m.x, m.y, m.w, m.h)) if (E_INSIDE(o.x, o.y, m.x, m.y, m.w, m.h))