Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h borders.c ewins.c
Log Message:
Fix pseudotrans border update on desk switch.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -3 -r1.351 -r1.352
--- E.h 29 Jan 2005 07:41:49 -0000 1.351
+++ E.h 29 Jan 2005 15:00:00 -0000 1.352
@@ -1249,7 +1249,8 @@
void EwinBorderSelect(EWin * ewin);
void EwinBorderDetach(EWin * ewin);
void EwinBorderSetTo(EWin * ewin, const Border * b);
-void EwinBorderDraw(EWin * ewin, int do_shape, int queue_off);
+void EwinBorderDraw(EWin * ewin, int do_shape, int do_paint,
+ int queue_off);
void EwinBorderCalcSizes(EWin * ewin);
void EwinBorderMinShadeSize(EWin * ewin, int *mw, int *mh);
void EwinBorderUpdateInfo(EWin * ewin);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -3 -r1.245 -r1.246
--- borders.c 29 Jan 2005 07:41:49 -0000 1.245
+++ borders.c 29 Jan 2005 15:00:00 -0000 1.246
@@ -53,7 +53,7 @@
void
EwinBorderUpdateState(EWin * ewin)
{
- EwinBorderDraw(ewin, 0, 0);
+ EwinBorderDraw(ewin, 0, 0, 0);
}
static void
@@ -87,6 +87,11 @@
if (ewb->win == None)
return;
+#if 0 /* Debug */
+ Eprintf("BorderWinpartITclassApply: %#lx %#lx %2d %d %s\n",
+ EwinGetClientWin(ewin), EoGetWin(ewin), i, force, EwinGetName(ewin));
+#endif
+
is = ImageclassGetImageState(ewin->border->part[i].iclass, ewb->state,
ewin->active, EoIsSticky(ewin));
@@ -169,7 +174,7 @@
}
void
-EwinBorderDraw(EWin * ewin, int do_shape, int queue_off)
+EwinBorderDraw(EWin * ewin, int do_shape, int do_paint, int queue_off)
{
int i, pq;
@@ -181,7 +186,7 @@
Mode.queue_up = 0;
for (i = 0; i < ewin->border->num_winparts; i++)
- BorderWinpartITclassApply(ewin, i, do_shape);
+ BorderWinpartITclassApply(ewin, i, do_shape || do_paint);
if (do_shape || !ewin->shapedone || ewin->border->changes_shape)
EwinPropagateShapes(ewin);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewins.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ewins.c 23 Jan 2005 18:23:04 -0000 1.11
+++ ewins.c 29 Jan 2005 15:00:00 -0000 1.12
@@ -812,7 +812,9 @@
/* if the window asked to be iconified at the start */
if (ewin->client.start_iconified)
{
- EwinBorderDraw(ewin, 1, 0);
+#if 0 /* FIXME - Remove? */
+ EwinBorderDraw(ewin, 1, 1, 0);
+#endif
MoveEwinToDesktopAt(ewin, desk, x, y);
ecore_x_ungrab();
ewin->state = EWIN_STATE_MAPPED;
@@ -840,7 +842,9 @@
ewin->client.already_placed = 1;
x = Mode.x + 1;
y = Mode.y + 1;
- EwinBorderDraw(ewin, 1, 0);
+#if 0 /* FIXME - Remove? */
+ EwinBorderDraw(ewin, 1, 1, 0);
+#endif
MoveEwinToDesktop(ewin, desk);
RaiseEwin(ewin);
MoveEwin(ewin, x, y);
@@ -878,7 +882,9 @@
fx = VRoot.w;
fy = (rand() % (VRoot.h)) - EoGetH(ewin);
}
- EwinBorderDraw(ewin, 1, 0);
+#if 0 /* FIXME - Remove? */
+ EwinBorderDraw(ewin, 1, 1, 0);
+#endif
MoveEwinToDesktop(ewin, desk);
RaiseEwin(ewin);
MoveEwin(ewin, fx, fy);
@@ -888,7 +894,9 @@
}
else
{
- EwinBorderDraw(ewin, 1, 0);
+#if 0 /* FIXME - Remove? */
+ EwinBorderDraw(ewin, 1, 1, 0);
+#endif
MoveEwinToDesktopAt(ewin, desk, x, y);
RaiseEwin(ewin);
ShowEwin(ewin);
@@ -924,7 +932,9 @@
if (init)
init(ewin, ptr); /* Type specific initialisation */
- EwinBorderDraw(ewin, 1, 1);
+#if 0 /* FIXME - Remove? */
+ EwinBorderDraw(ewin, 1, 1, 1);
+#endif
EwinDetermineArea(ewin);
@@ -1326,7 +1336,7 @@
return;
if (TransparencyEnabled())
- EwinBorderDraw(ewin, 0, 0); /* Update the border */
+ EwinBorderDraw(ewin, 0, 1, 0); /* Update the border */
if (ewin->Refresh)
ewin->Refresh(ewin);
@@ -1341,7 +1351,7 @@
EwinDetermineArea(ewin);
if (TransparencyEnabled())
- EwinBorderDraw(ewin, 1, 0); /* Update the border */
+ EwinBorderDraw(ewin, resize, 1, 0); /* Update the border */
if (ewin->MoveResize)
ewin->MoveResize(ewin, resize);
-------------------------------------------------------
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
