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

Fix non-opaque resizing. 

SVN revision: 14995
This commit is contained in:
Kim Woelders 2005-05-28 19:29:15 +00:00
parent 61110ad5e3
commit 10f2f20af5
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/draw.c
View File

@ -620,7 +620,7 @@ DrawEwinShape(EWin * ewin, int md, int x, int y, int w, int h, char firstlast)
{
static GC gc = 0;
XGCValues gcv;
int x1, y1, w1, h1, i, j, pw, ph, dx, dy;
int x1, y1, w1, h1, i, j, dx, dy;
static Pixmap b1 = 0, b2 = 0, b3 = 0;
static Font font = 0;
char str[32];
@ -638,9 +638,6 @@ DrawEwinShape(EWin * ewin, int md, int x, int y, int w, int h, char firstlast)
(Mode.mode == MODE_RESIZE_V) || (ewin->groups && check_move)))
md = 0;
pw = w;
ph = h;
switch (md)
{
case 0:
@ -670,17 +667,10 @@ DrawEwinShape(EWin * ewin, int md, int x, int y, int w, int h, char firstlast)
if ((Mode.mode == MODE_RESIZE) || (Mode.mode == MODE_RESIZE_H)
|| (Mode.mode == MODE_RESIZE_V))
{
w1 = ewin->client.w;
h1 = ewin->client.h;
ewin->client.w = w;
ewin->client.h = h;
ICCCM_MatchSize(ewin);
i = (x - ewin->shape_x) / ewin->client.w_inc;
j = (y - ewin->shape_y) / ewin->client.h_inc;
x = ewin->shape_x + (i * ewin->client.w_inc);
y = ewin->shape_y + (j * ewin->client.h_inc);
ewin->client.w = w1;
ewin->client.h = h1;
}
dx = DeskGetX(EoGetDesk(ewin));
@ -698,15 +688,10 @@ DrawEwinShape(EWin * ewin, int md, int x, int y, int w, int h, char firstlast)
if ((w != ewin->client.w) || (h != ewin->client.h))
{
ewin->client.w = w;
ewin->client.h = h;
ICCCM_MatchSize(ewin);
if (!ewin->shaded)
{
ewin->shape_w = ewin->client.w;
ewin->shape_h = ewin->client.h;
}
ICCCM_SizeMatch(ewin, w, h, &ewin->shape_w, &ewin->shape_h);
}
w = ewin->shape_w;
h = ewin->shape_h;
@ -1048,7 +1033,8 @@ DrawEwinShape(EWin * ewin, int md, int x, int y, int w, int h, char firstlast)
if (ewin->shaded)
MoveEwin(ewin, ewin->shape_x, ewin->shape_y);
else
MoveResizeEwin(ewin, ewin->shape_x, ewin->shape_y, pw, ph);
MoveResizeEwin(ewin, ewin->shape_x, ewin->shape_y,
ewin->shape_w, ewin->shape_h);
}
#endif
EFreeGC(gc);