kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dnd: Correct drag window positon in drag start 

Summary:
If window is rotated, the drag window position is incorrect.

In drag start, the drag window is placed in incorrect position if main window is rotated.
Fix: Update drag window according to window rotation.

@fix

Reviewers: JackDanielZ, raster

Reviewed By: raster

CC: woohyun, seoz

Differential Revision: https://phab.enlightenment.org/D746
This commit is contained in:
Thiep Ha 2014-04-21 17:27:46 +09:00 committed by Carsten Haitzler (Rasterman)
parent e1ea913a22
commit 7869c00600
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
legacy/elementary/src/lib/elm_cnp.c
View File

@ -2170,8 +2170,10 @@ _x11_elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data,
int x, y, x2 = 0, y2 = 0, x3, y3;
Evas_Object *icon = NULL;
int w = 0, h = 0;
int ex, ey, ew, eh;
Ecore_X_Atom actx;
int i;
int xr, yr, rot;
_x11_elm_cnp_init();
@ -2268,21 +2270,41 @@ _x11_elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data,
/* Position subwindow appropriately */
ee = ecore_evas_ecore_evas_get(evas_object_evas_get(obj));
ecore_evas_geometry_get(ee, &x, &y, NULL, NULL);
x += x2;
y += y2;
dragwin_x_start = dragwin_x_end = x;
dragwin_y_start = dragwin_y_end = y;
ecore_evas_geometry_get(ee, &ex, &ey, &ew, &eh);
evas_object_resize(dragwin, w, h);
evas_object_show(icon);
evas_object_show(dragwin);
evas_object_move(dragwin, x, y);
evas_pointer_canvas_xy_get(evas_object_evas_get(obj), &x3, &y3);
_dragx = x3 - x2;
_dragy = y3 - y2;
rot = ecore_evas_rotation_get(ee);
switch (rot)
{
case 90:
xr = y3;
yr = ew - x3;
break;
case 180:
xr = ew - x3;
yr = eh - y3;
break;
case 270:
xr = eh - y3;
yr = x3;
break;
default:
xr = x3;
yr = y3;
break;
}
x = ex + xr - _dragx;
y = ey + yr - _dragy;
evas_object_move(dragwin, x, y);
dragwin_x_start = dragwin_x_end = x;
dragwin_y_start = dragwin_y_end = y;
return EINA_TRUE;
}