* Source/NSStringDrawing.m(is_size_match): Disable matches

where one has size information, but the other hasn't.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@35935 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2013-01-06 21:49:59 +00:00
parent 30da16dafc
commit 29157408d9
2 changed files with 7 additions and 2 deletions

View file

@ -1,3 +1,8 @@
2013-01-06 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSStringDrawing.m(is_size_match): Disable matches
where one has size information, but the other hasn't.
2012-12-31 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSView.m (-_rebuildCoordinates): Check if the flipped

View file

@ -167,9 +167,9 @@ static inline BOOL is_size_match(cache_t *c, int hasSize, NSSize size)
{
if ((!c->hasSize && !hasSize) ||
(c->hasSize && hasSize && c->givenSize.width == size.width
&& c->givenSize.height == size.height) ||
&& c->givenSize.height == size.height) /* ||
(!c->hasSize && hasSize && size.width >= NSMaxX(c->usedRect)
&& size.height >= NSMaxY(c->usedRect)))
&& size.height >= NSMaxY(c->usedRect))*/)
{
return YES;
}