Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h ewin-ops.c
Log Message:
Prepare for iconbox/pager layout handling changes.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.433
retrieving revision 1.434
diff -u -3 -r1.433 -r1.434
--- E.h 21 May 2005 21:49:36 -0000 1.433
+++ E.h 22 May 2005 07:54:51 -0000 1.434
@@ -785,6 +785,8 @@
} ewmh;
int shape_x, shape_y, shape_w, shape_h;
int req_x, req_y;
+ void (*Layout) (EWin * ewin, int *px, int *py, int *pw,
+ int *ph);
void (*MoveResize) (EWin * ewin, int resize);
void (*Close) (EWin * ewin);
};
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewin-ops.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- ewin-ops.c 21 May 2005 21:49:36 -0000 1.39
+++ ewin-ops.c 22 May 2005 07:54:52 -0000 1.40
@@ -354,29 +354,27 @@
if (flags & MRF_RAISE)
raise = 1;
- if (flags & MRF_MOVE)
+ if (!(flags & MRF_MOVE))
{
- dx = x - EoGetX(ewin);
- dy = y - EoGetY(ewin);
- if ((dx != 0) || (dy != 0))
- move = 1;
- ewin->client.x = x + ewin->border->border.left;
- ewin->client.y = y + ewin->border->border.top;
- }
- else
- {
- dx = dy = 0;
x = EoGetX(ewin);
y = EoGetY(ewin);
}
if (flags & MRF_RESIZE)
{
+ if (ewin->Layout)
+ {
+ ewin->Layout(ewin, &x, &y, &w, &h);
+ }
+ else
+ {
+ ICCCM_SizeMatch(ewin, w, h, &w, &h);
+ }
+
if ((w != ewin->client.w) || (h != ewin->client.h))
resize = 2;
ewin->client.w = w;
ewin->client.h = h;
- ICCCM_MatchSize(ewin);
/* Don't touch frame size while shaded */
if (ewin->shaded)
@@ -398,6 +396,13 @@
h = EoGetH(ewin);
}
+ dx = x - EoGetX(ewin);
+ dy = y - EoGetY(ewin);
+ if ((dx != 0) || (dy != 0))
+ move = 1;
+ ewin->client.x = x + ewin->border->border.left;
+ ewin->client.y = y + ewin->border->border.top;
+
#if 0
Eprintf("repa=%d float=%d raise=%d move=%d resz=%d\n",
reparent, floating, raise, move, resize);
-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
