Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
dialog.c ewin-ops.c iconify.c menus.c
Log Message:
Fix iconbox resizing.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/dialog.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -3 -r1.115 -r1.116
--- dialog.c 22 May 2005 15:02:19 -0000 1.115
+++ dialog.c 28 May 2005 20:23:25 -0000 1.116
@@ -521,7 +521,7 @@
{
Dialog *d = ewin->data;
- if (!d)
+ if (!d || Mode.mode != MODE_NONE)
return;
if (TransparencyEnabled() || ImageclassIsTransparent(d->iclass))
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewin-ops.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- ewin-ops.c 22 May 2005 13:45:10 -0000 1.41
+++ ewin-ops.c 28 May 2005 20:23:25 -0000 1.42
@@ -456,14 +456,14 @@
EwinDetermineArea(ewin);
+ if (ewin->MoveResize)
+ ewin->MoveResize(ewin, resize);
+
if (Mode.mode == MODE_NONE)
{
if (TransparencyEnabled())
EwinBorderDraw(ewin, resize, 1); /* Update the border */
- if (ewin->MoveResize)
- ewin->MoveResize(ewin, resize);
-
SnapshotEwinUpdate(ewin, SNAP_USE_POS | SNAP_USE_SIZE);
if (call_depth == 1) /* FIXME - Remove */
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iconify.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -3 -r1.153 -r1.154
--- iconify.c 26 May 2005 22:38:28 -0000 1.153
+++ iconify.c 28 May 2005 20:23:25 -0000 1.154
@@ -341,8 +341,6 @@
ib->scrollbar_clicked = 0;
ib->scrollbox_clicked = 0;
- ib->do_update = 1;
-
ib->win = ECreateWindow(VRoot.win, 0, 0, 128, 32, 0);
ib->icon_win = ECreateWindow(ib->win, 0, 0, 128, 26, 0);
EventCallbackRegister(ib->icon_win, 0, IboxEventIconWin, ib);
@@ -493,17 +491,21 @@
Iconbox *ib = ewin->data;
IconboxLayout(ib, px, py, pw, ph);
+
+ if (*pw != ewin->client.w || *ph != ewin->client.h)
+ ib->do_update = 1;
}
static void
-IconboxEwinMoveResize(EWin * ewin, int resize __UNUSED__)
+IconboxEwinMoveResize(EWin * ewin, int resize)
{
Iconbox *ib = ewin->data;
if (!resize && !ib->do_update && !TransparencyEnabled())
return;
- if (ib->w <= 0 || ib->h <= 0)
- return;
+
+ ib->w = ewin->client.w;
+ ib->h = ewin->client.h;
IconboxDraw(ib);
ib->do_update = 0;
@@ -540,7 +542,6 @@
IconboxShow(Iconbox * ib)
{
EWin *ewin;
- int w, h;
if (ib->type == IB_TYPE_ICONBOX)
{
@@ -562,34 +563,23 @@
IconboxReconfigure(ib);
- w = ewin->client.w;
- h = ewin->client.h;
- ewin->client.w = 1;
- ewin->client.h = 1;
if (ewin->client.already_placed)
{
- MoveResizeEwin(ewin, EoGetX(ewin), EoGetY(ewin), w, h);
+ MoveEwinToDesktop(ewin, EoGetDesk(ewin));
+ MoveResizeEwin(ewin, EoGetX(ewin), EoGetY(ewin), ewin->client.w,
+ ewin->client.h);
}
else
{
EwinStick(ewin);
- ResizeEwin(ewin, w, h);
+ MoveEwinToDesktop(ewin, EoGetDesk(ewin));
+ ResizeEwin(ewin, ewin->client.w, ewin->client.h);
MoveEwin(ewin, VRoot.w - EoGetW(ewin), VRoot.h - EoGetH(ewin));
}
- MoveEwinToDesktop(ewin, EoGetDesk(ewin));
ShowEwin(ewin);
}
-#if 0
-static void
-IconboxHide(Iconbox * ib)
-{
- if (ib->ewin)
- HideEwin(ib->ewin);
-}
-#endif
-
/*
* Return index, -1 if not found.
*/
@@ -1535,8 +1525,8 @@
*px = x;
*py = y;
- *pw = ib->w = w;
- *ph = ib->h = h;
+ *pw = w;
+ *ph = h;
}
static void
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -3 -r1.196 -r1.197
--- menus.c 22 May 2005 15:02:19 -0000 1.196
+++ menus.c 28 May 2005 20:23:25 -0000 1.197
@@ -180,7 +180,7 @@
{
Menu *m = ewin->data;
- if (!m)
+ if (!m || Mode.mode != MODE_NONE)
return;
if (TransparencyEnabled())
-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
