Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
ewin-ops.c
Log Message:
Don't shade iconified windows, cleanups.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewin-ops.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ewin-ops.c 30 Jan 2005 11:02:42 -0000 1.9
+++ ewin-ops.c 31 Jan 2005 23:52:12 -0000 1.10
@@ -524,45 +524,28 @@
Mode.queue_up = 0;
switch (ewin->border->shadedir)
{
+ default:
case 0:
att.win_gravity = EastGravity;
XChangeWindowAttributes(disp, ewin->client.win, CWWinGravity, &att);
EwinBorderMinShadeSize(ewin, &b, &d);
- ewin->shaded = 2;
EoSetW(ewin, b);
- ExMoveResizeWindow(&ewin->o, EoGetX(ewin), EoGetY(ewin),
- EoGetW(ewin), EoGetH(ewin));
- EMoveResizeWindow(disp, ewin->win_container, -30, -30, 1, 1);
- EwinBorderCalcSizes(ewin);
- ecore_x_sync();
break;
case 1:
att.win_gravity = WestGravity;
XChangeWindowAttributes(disp, ewin->client.win, CWWinGravity, &att);
EwinBorderMinShadeSize(ewin, &b, &d);
d = EoGetX(ewin) + EoGetW(ewin) - b;
- ewin->shaded = 2;
EoSetW(ewin, b);
if (!Mode.wm.startup)
EoSetX(ewin, d);
- ExMoveResizeWindow(&ewin->o, EoGetX(ewin), EoGetY(ewin),
- EoGetW(ewin), EoGetH(ewin));
- EMoveResizeWindow(disp, ewin->win_container, -30, -30, 1, 1);
- EwinBorderCalcSizes(ewin);
- ecore_x_sync();
break;
case 2:
att.win_gravity = SouthGravity;
XChangeWindowAttributes(disp, ewin->client.win, CWWinGravity, &att);
EwinBorderMinShadeSize(ewin, &b, &d);
b = d;
- ewin->shaded = 2;
EoSetH(ewin, b);
- ExMoveResizeWindow(&ewin->o, EoGetX(ewin), EoGetY(ewin),
- EoGetW(ewin), EoGetH(ewin));
- EMoveResizeWindow(disp, ewin->win_container, -30, -30, 1, 1);
- EwinBorderCalcSizes(ewin);
- ecore_x_sync();
break;
case 3:
att.win_gravity = SouthGravity;
@@ -570,19 +553,19 @@
EwinBorderMinShadeSize(ewin, &b, &d);
b = d;
d = EoGetY(ewin) + EoGetH(ewin) - b;
- ewin->shaded = 2;
EoSetH(ewin, b);
if (!Mode.wm.startup)
EoSetY(ewin, d);
- ExMoveResizeWindow(&ewin->o, EoGetX(ewin), EoGetY(ewin),
- EoGetW(ewin), EoGetH(ewin));
- EMoveResizeWindow(disp, ewin->win_container, -30, -30, 1, 1);
- EwinBorderCalcSizes(ewin);
- ecore_x_sync();
- break;
- default:
break;
}
+
+ ewin->shaded = 2;
+ ExMoveResizeWindow(&ewin->o, EoGetX(ewin), EoGetY(ewin),
+ EoGetW(ewin), EoGetH(ewin));
+ EMoveResizeWindow(disp, ewin->win_container, -30, -30, 1, 1);
+ EwinBorderCalcSizes(ewin);
+ ecore_x_sync();
+
EwinPropagateShapes(ewin);
Mode.queue_up = pq;
HintsSetWindowState(ewin);
@@ -605,16 +588,13 @@
switch (ewin->border->shadedir)
{
+ default:
case 0:
att.win_gravity = EastGravity;
XChangeWindowAttributes(disp, ewin->client.win, CWWinGravity, &att);
b = ewin->client.w + ewin->border->border.left +
ewin->border->border.right;
- ewin->shaded = 0;
EoSetW(ewin, b);
- MoveResizeEwin(ewin, EoGetX(ewin), EoGetY(ewin), ewin->client.w,
- ewin->client.h);
- ecore_x_sync();
break;
case 1:
att.win_gravity = WestGravity;
@@ -624,23 +604,15 @@
d = EoGetX(ewin) + EoGetW(ewin) - (ewin->border->border.right +
ewin->client.w +
ewin->border->border.left);
- ewin->shaded = 0;
EoSetW(ewin, b);
EoSetX(ewin, d);
- MoveResizeEwin(ewin, EoGetX(ewin), EoGetY(ewin), ewin->client.w,
- ewin->client.h);
- ecore_x_sync();
break;
case 2:
att.win_gravity = SouthGravity;
XChangeWindowAttributes(disp, ewin->client.win, CWWinGravity, &att);
b = ewin->client.h + ewin->border->border.top +
ewin->border->border.bottom;
- ewin->shaded = 0;
EoSetH(ewin, b);
- MoveResizeEwin(ewin, EoGetX(ewin), EoGetY(ewin), ewin->client.w,
- ewin->client.h);
- ecore_x_sync();
break;
case 3:
att.win_gravity = SouthGravity;
@@ -650,16 +622,16 @@
d = EoGetY(ewin) + EoGetH(ewin) - (ewin->border->border.bottom +
ewin->client.h +
ewin->border->border.top);
- ewin->shaded = 0;
EoSetH(ewin, b);
EoSetY(ewin, d);
- MoveResizeEwin(ewin, EoGetX(ewin), EoGetY(ewin), ewin->client.w,
- ewin->client.h);
- ecore_x_sync();
- break;
- default:
break;
}
+
+ ewin->shaded = 0;
+ MoveResizeEwin(ewin, EoGetX(ewin), EoGetY(ewin), ewin->client.w,
+ ewin->client.h);
+ ecore_x_sync();
+
EwinPropagateShapes(ewin);
Mode.queue_up = pq;
HintsSetWindowState(ewin);
@@ -678,7 +650,7 @@
return;
if (GetZoomEWin() == ewin)
return;
- if (ewin->shaded)
+ if (ewin->shaded || ewin->iconified)
return;
if ((ewin->border) && (!strcmp(ewin->border->name, "BORDERLESS")))
return;
-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
Tool for open source databases. Create drag-&-drop reports. Save time
by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
Download a FREE copy at http://www.intelliview.com/go/osdn_nl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
