mirror of
https://github.com/gnustep/libs-back.git
synced 2025-02-23 20:01:22 +00:00
Fix bug #12578.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@21072 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
e7fe51d887
commit
47ddc6186d
2 changed files with 18 additions and 3 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
2005-04-07 Fred Kiefer <FredKiefer@gmx.de>
|
||||||
|
|
||||||
|
* Source/x11/XGServerWindow.m (-iconSize): Use XFree to free
|
||||||
|
xiconsize. Fixes bug #12578.
|
||||||
|
|
||||||
2005-04-04 Richard Frith-Macdonald <rfm@gnu.org>
|
2005-04-04 Richard Frith-Macdonald <rfm@gnu.org>
|
||||||
|
|
||||||
* Source/winlib/WIN32GState.m: tunr on alpha blending and swap colors
|
* Source/winlib/WIN32GState.m: tunr on alpha blending and swap colors
|
||||||
|
|
|
@ -3028,7 +3028,8 @@ _computeDepth(int class, int bpp)
|
||||||
XIconSize *xiconsize;
|
XIconSize *xiconsize;
|
||||||
int count_return;
|
int count_return;
|
||||||
int status;
|
int status;
|
||||||
|
NSSize iconSize;
|
||||||
|
|
||||||
status = XGetIconSizes(dpy,
|
status = XGetIconSizes(dpy,
|
||||||
DefaultRootWindow(dpy),
|
DefaultRootWindow(dpy),
|
||||||
&xiconsize,
|
&xiconsize,
|
||||||
|
@ -3039,10 +3040,19 @@ _computeDepth(int class, int bpp)
|
||||||
{
|
{
|
||||||
/* must add 4 pixels for the border which windowmaker leaves out
|
/* must add 4 pixels for the border which windowmaker leaves out
|
||||||
but gnustep draws over. */
|
but gnustep draws over. */
|
||||||
return NSMakeSize(xiconsize[0].max_width + 4,
|
iconSize = NSMakeSize(xiconsize[0].max_width + 4,
|
||||||
xiconsize[0].max_height + 4);
|
xiconsize[0].max_height + 4);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
iconSize = NSMakeSize(xiconsize[0].max_width,
|
||||||
|
xiconsize[0].max_height);
|
||||||
|
}
|
||||||
|
|
||||||
|
XFree(xiconsize);
|
||||||
|
return iconSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
return [super iconSize];
|
return [super iconSize];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue