gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 07:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't try to get the advancement for GSAttachmentGlyph.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@40272 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2016-12-18 11:58:31 +00:00
parent ca8abf4c27
commit 2b401268fc
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2016-12-18 Fred Kiefer <FredKiefer@gmx.de>
* Source/GSLayoutManager.m: Don't try to get the advancement for
GSAttachmentGlyph.
* Source/NSTableView.m: Protect against rowHeigh being zero.
2016-12-17 Fred Kiefer <FredKiefer@gmx.de>
* Headers/Additions/GNUstepGUI/GSToolbarView.h

2
Source/GSLayoutManager.m
View file

@ -3231,7 +3231,7 @@ forStartingGlyphAtIndex: (NSUInteger)glyph
for (i=0; i<length; i++)
{
if (glyph_list[i] != NSControlGlyph)
if ((glyph_list[i] != NSControlGlyph) && (glyph_list[i] != GSAttachmentGlyph))
{
advances[i] = [run->font advancementForGlyph: glyph_list[i]];
}

4
Source/NSTableView.m
View file

@ -4425,6 +4425,10 @@ This method is deprecated, use -columnIndexesInRect:. */
{
return -1;
}
else if (_rowHeight == 0.0)
{
return -1;
}
else
{
NSInteger return_value;