Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
iconify.c pager.c
Log Message:
Make sure pager and iconbox are resized during startup.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iconify.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -3 -r1.86 -r1.87
--- iconify.c 13 Feb 2004 18:36:51 -0000 1.86
+++ iconify.c 16 Feb 2004 22:03:44 -0000 1.87
@@ -547,23 +547,29 @@
if (ewin)
{
Snapshot *sn;
+ int w, h;
ib->ewin = ewin;
ewin->ibox = ib;
IB_Reconfigure(ib);
sn = FindSnapshot(ewin);
ConformEwinToDesktop(ewin);
- ShowEwin(ewin);
+
+ w = ewin->client.w;
+ h = ewin->client.h;
+ ewin->client.w = 1;
+ ewin->client.h = 1;
if (sn)
{
- ResizeEwin(ewin, ewin->client.w, ewin->client.h);
+ ResizeEwin(ewin, w, h);
}
else
{
MakeWindowSticky(ewin);
- MoveResizeEwin(ewin, root.w - 160, root.h - ewin->client.h,
- 160, ewin->client.h);
+ MoveResizeEwin(ewin, root.w - 160, root.h - h, 160, h);
}
+
+ ShowEwin(ewin);
}
queue_up = pq;
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- pager.c 13 Feb 2004 18:36:52 -0000 1.65
+++ pager.c 16 Feb 2004 22:03:44 -0000 1.66
@@ -302,7 +302,7 @@
if (ewin)
{
char s[4096];
- int ax, ay;
+ int ax, ay, w, h;
Snapshot *sn;
double aspect;
@@ -320,20 +320,24 @@
p->ewin = ewin;
p->visible = 1;
sn = FindSnapshot(ewin);
+
/* get the size right damnit! */
+ w = ewin->client.w;
+ h = ewin->client.h;
+ ewin->client.w = 1;
+ ewin->client.h = 1;
if (sn)
{
- ResizeEwin(ewin, ewin->client.w, ewin->client.h);
+ ResizeEwin(ewin, w, h);
}
else
{
/* no snapshots ? first time ? make a row on the bottom left up */
- MoveResizeEwin(ewin, 0,
- root.h - (conf.desks.num -
- p->desktop) * ewin->h, ewin->client.w,
- ewin->client.h);
+ MoveResizeEwin(ewin, 0, root.h - (conf.desks.num -
+ p->desktop) * ewin->h, w, h);
}
PagerRedraw(p, 1);
+
/* show the pager ewin */
ShowEwin(ewin);
if (((sn) && (sn->use_sticky) && (sn->sticky)) || (!sn))
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
