hugok
/
e16
forked from e16/e16
1
0
Fork 0
Code Pull Requests Activity

Fix iconbox resizing. 

SVN revision: 14998
This commit is contained in:
Kim Woelders 2005-05-28 20:23:25 +00:00
parent 10f2f20af5
commit 841a7047d0
4 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dialog.c
View File

@ -521,7 +521,7 @@ DialogEwinMoveResize(EWin * ewin, int resize __UNUSED__)
{
Dialog *d = ewin->data;
if (!d)
if (!d || Mode.mode != MODE_NONE)
return;
if (TransparencyEnabled() || ImageclassIsTransparent(d->iclass))

6
src/ewin-ops.c
View File

@ -456,14 +456,14 @@ doMoveResizeEwin(EWin * ewin, int desk, int x, int y, int w, int h, int flags)
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 */

38
src/iconify.c
View File

@ -341,8 +341,6 @@ IconboxCreate(const char *name)
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 @@ IconboxEwinLayout(EWin * ewin, int *px, int *py, int *pw, int *ph)
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 @@ static void
IconboxShow(Iconbox * ib)
{
EWin *ewin;
int w, h;
if (ib->type == IB_TYPE_ICONBOX)
{
@ -562,34 +563,23 @@ IconboxShow(Iconbox * ib)
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 @@ IconboxLayout(Iconbox * ib, int *px, int *py, int *pw, int *ph)
*px = x;
*py = y;
*pw = ib->w = w;
*ph = ib->h = h;
*pw = w;
*ph = h;
}
static void

2
src/menus.c
View File

@ -180,7 +180,7 @@ MenuEwinMoveResize(EWin * ewin, int resize __UNUSED__)
{
Menu *m = ewin->data;
if (!m)
if (!m || Mode.mode != MODE_NONE)
return;
if (TransparencyEnabled())