Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
actions.c borders.c edge.c moveresize.c
Log Message:
Another partial floating window movement fix.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/actions.c,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -3 -r1.159 -r1.160
--- actions.c 16 May 2004 08:31:47 -0000 1.159
+++ actions.c 16 May 2004 15:52:35 -0000 1.160
@@ -430,12 +430,6 @@
key = type = button = modifiers = mouse = 0;
-#if 0 /* FIXME - Do we use this? */
- if ((Conf.movemode == 0) && (ewin) &&
- ((Mode.mode == MODE_MOVE) || (Mode.mode == MODE_MOVE_PENDING)))
- DetermineEwinFloat(ewin, 0, 0);
-#endif
-
mask =
(ShiftMask | ControlMask | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask |
Mod5Mask) & (~(numlock_mask | scrollock_mask | LockMask));
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -3 -r1.176 -r1.177
--- borders.c 15 May 2004 22:42:21 -0000 1.176
+++ borders.c 16 May 2004 15:52:44 -0000 1.177
@@ -599,6 +599,7 @@
Mode.place = 1;
ICCCM_Configure(ewin);
UngrabX();
+ ewin->floating = 1; /* Causes reparenting to root */
ActionsCall(ACTION_MOVE, ewin, NULL);
EDBUG_RETURN_;
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/edge.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edge.c 15 May 2004 22:42:21 -0000 1.3
+++ edge.c 16 May 2004 15:52:44 -0000 1.4
@@ -71,16 +71,20 @@
default:
break;
}
- Mode.flipp = 1;
- MoveCurrentAreaBy(dax, day);
- Mode.flipp = 0;
if (aw == 1)
dx = 0;
if (ah == 1)
dy = 0;
+ Mode.px = Mode.x;
+ Mode.py = Mode.y;
+ Mode.x += dx;
+ Mode.y += dy;
XWarpPointer(disp, None, None, 0, 0, 0, 0, dx, dy);
- Mode.px = Mode.x += dx;
- Mode.py = Mode.y += dy;
+ Mode.flipp = 1;
+ MoveCurrentAreaBy(dax, day);
+ Mode.flipp = 0;
+ Mode.px = Mode.x;
+ Mode.py = Mode.y;
data = NULL;
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/moveresize.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- moveresize.c 15 May 2004 22:42:21 -0000 1.12
+++ moveresize.c 16 May 2004 15:52:44 -0000 1.13
@@ -254,8 +254,6 @@
}
GetCurrentArea(&ax, &ay);
- dx = (ax - area_x) * VRoot.w;
- dy = (ay - area_y) * VRoot.h;
/* Redraw any windows that were in "move mode" */
lst = ListWinGroupMembersForEwin(ewin, ACTION_MOVE, Mode.nogroup, &num);
@@ -270,14 +268,23 @@
y = ewin->y;
if (Mode.flipp)
{
+ dx = Mode.x - Mode.px;
+ dy = Mode.y - Mode.py;
if (Conf.movemode == 0)
{
- x -= dx;
- y -= dy;
+ x += dx;
+ y += dy;
+ }
+ else
+ {
+ x += dx + (ax - area_x) * VRoot.w;
+ y += dy + (ay - area_y) * VRoot.h;
}
}
else
{
+ dx = (ax - area_x) * VRoot.w;
+ dy = (ay - area_y) * VRoot.h;
if (Conf.movemode != 0)
{
x += dx;
-------------------------------------------------------
This SF.Net email is sponsored by: SourceForge.net Broadband
Sign-up now for SourceForge Broadband and get the fastest
6.0/768 connection for only $19.95/mo for the first 3 months!
http://ads.osdn.com/?ad_id=2562&alloc_id=6184&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
