Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
borders.c
Log Message:
Don't unshade while iconified (caused un-deiconifiable windows).
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -3 -r1.211 -r1.212
--- borders.c 4 Jul 2004 12:28:56 -0000 1.211
+++ borders.c 4 Jul 2004 21:33:06 -0000 1.212
@@ -2700,12 +2700,16 @@
EDBUG_RETURN_;
if ((ewin->border) && (!strcmp(ewin->border->name, "BORDERLESS")))
EDBUG_RETURN_;
+
pq = Mode.queue_up;
Mode.queue_up = 0;
+
speed = Conf.shadespeed;
spd = 32;
min = 2;
+
GrabX();
+
switch (ewin->border->shadedir)
{
case 0:
@@ -2922,18 +2926,24 @@
default:
break;
}
+
UngrabX();
+
if (ewin->client.shaped)
EShapeCombineShape(disp, ewin->win_container, ShapeBounding, 0, 0,
ewin->client.win, ShapeBounding, ShapeSet);
PropagateShapes(ewin->win);
+
Mode.queue_up = pq;
+
HintsSetWindowState(ewin);
+
if (Mode.mode == MODE_NONE)
{
PagerEwinOutsideAreaUpdate(ewin);
ForceUpdatePagersForDesktop(ewin->desktop);
}
+
EDBUG_RETURN_;
}
@@ -2951,14 +2961,18 @@
EDBUG(4, "EwinUnShade");
if (GetZoomEWin() == ewin)
EDBUG_RETURN_;
- if (!ewin->shaded)
+ if (!ewin->shaded || ewin->iconified)
EDBUG_RETURN_;
+
pq = Mode.queue_up;
Mode.queue_up = 0;
+
speed = Conf.shadespeed;
spd = 32;
min = 2;
+
GrabX();
+
switch (ewin->border->shadedir)
{
case 0:
@@ -3184,18 +3198,24 @@
default:
break;
}
+
UngrabX();
+
if (ewin->client.shaped)
EShapeCombineShape(disp, ewin->win_container, ShapeBounding, 0, 0,
ewin->client.win, ShapeBounding, ShapeSet);
PropagateShapes(ewin->win);
+
Mode.queue_up = pq;
+
HintsSetWindowState(ewin);
+
if (Mode.mode == MODE_NONE)
{
PagerEwinOutsideAreaUpdate(ewin);
ForceUpdatePagersForDesktop(ewin->desktop);
}
+
EDBUG_RETURN_;
}
-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 -
digital self defense, top technical experts, no vendor pitches,
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
