Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
ewin-ops.c ewins.h
Log Message:
Fix unmaximizing after shade/unshade (noted by Sven Faerber and Bradley Reed).
===================================================================
RCS file: /cvs/e/e16/e/src/ewin-ops.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -3 -r1.114 -r1.115
--- ewin-ops.c 16 Mar 2007 02:54:47 -0000 1.114
+++ ewin-ops.c 16 Mar 2007 03:56:11 -0000 1.115
@@ -491,7 +491,7 @@
EwinBorderCalcSizes(ewin, 0);
/* Clear maximized state on resize */
- if (!ewin->state.maximizing)
+ if (!ewin->state.maximizing && !ewin->state.shading)
{
if (ewin->state.maximized_horz || ewin->state.maximized_vert)
{
@@ -994,6 +994,8 @@
w = EoGetW(ewin);
h = EoGetH(ewin);
+ ewin->state.shading = 1;
+
#if 0
Eprintf("EwinShade-B %d\n", ewin->border->shadedir);
EGrabServer();
@@ -1145,6 +1147,8 @@
Eprintf("EwinShade-E\n");
#endif
+ ewin->state.shading = 0;
+
EwinStateUpdate(ewin);
HintsSetWindowState(ewin);
}
@@ -1170,6 +1174,8 @@
w = EoGetW(ewin);
h = EoGetH(ewin);
+ ewin->state.shading = 1;
+
#if 0
Eprintf("EwinUnShade-B %d\n", ewin->border->shadedir);
EGrabServer();
@@ -1351,6 +1357,8 @@
EUngrabServer();
Eprintf("EwinUnShade-E\n");
#endif
+
+ ewin->state.shading = 0;
EwinStateUpdate(ewin);
HintsSetWindowState(ewin);
===================================================================
RCS file: /cvs/e/e16/e/src/ewins.h,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- ewins.h 6 Mar 2007 03:33:31 -0000 1.67
+++ ewins.h 16 Mar 2007 03:56:11 -0000 1.68
@@ -111,6 +111,7 @@
unsigned resizing:1;
unsigned show_coords:1;
unsigned maximizing:1;
+ unsigned shading:1;
/* Derived state flags. Change only in EwinStateUpdate() */
unsigned no_border:1;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
