gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 16:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge from 0.7.0

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@10329 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fedor 2001-07-09 02:49:03 +00:00
parent caedf71059
commit 234c006585
27 changed files with 794 additions and 478 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Source/GSSimpleLayoutManager.m
View file

@ -272,7 +272,7 @@ static NSCharacterSet *invSelectionWordGranularitySet;
{
_GNULineLayoutInfo *currentInfo;
if (![_textStorage length])
if (![_textStorage length] || ![_lineLayoutInformation count])
{
return NSMakeRect(0, 0, 0, 12);
}
@ -294,7 +294,7 @@ static NSCharacterSet *invSelectionWordGranularitySet;
_GNULineLayoutInfo *currentInfo;
NSRect rect;
if (![_textStorage length])
if (![_textStorage length] || ![_lineLayoutInformation count])
{
return NSMakePoint(0, 0);
}
@ -321,7 +321,7 @@ static NSCharacterSet *invSelectionWordGranularitySet;
unsigned i1, i2;
NSRect rect1;
if (![_textStorage length])
if (![_textStorage length] || ![_lineLayoutInformation count])
{
return NSMakeRect(0, 0, width, 12);
}
@ -609,12 +609,18 @@ forStartOfGlyphRange: (NSRange)glyphRange
{
int i;
int min = 0;
int max = MAX(0, [_lineLayoutInformation count] - 1);
int max = MAX(0, (int)[_lineLayoutInformation count] - 1);
unsigned y = anIndex;
unsigned fmin = [[_lineLayoutInformation objectAtIndex: 0] glyphRange].location;
unsigned fmax = NSMaxRange([[_lineLayoutInformation lastObject] glyphRange]);
unsigned fmin;
unsigned fmax;
NSRange range;
if (!max)
return 0;
fmin = [[_lineLayoutInformation objectAtIndex: 0] glyphRange].location;
fmax = NSMaxRange([[_lineLayoutInformation lastObject] glyphRange]);
if (y >= fmax)
return max;
@ -680,7 +686,7 @@ forStartOfGlyphRange: (NSRange)glyphRange
NSRect rect;
float x;
if (![_textStorage length])
if (![_textStorage length] || ![_lineLayoutInformation count])
{
return NSMakeRect(0, 0, width, 12);
}
@ -696,15 +702,15 @@ forStartOfGlyphRange: (NSRange)glyphRange
}
currentInfo = [_lineLayoutInformation
objectAtIndex: [self lineLayoutIndexForGlyphIndex:
index]];
start = currentInfo->glyphRange.location;
rect = currentInfo->lineFragmentRect;
x = rect.origin.x + [self _sizeOfRange: NSMakeRange(start, index-start)].width;
currentInfo = [_lineLayoutInformation
objectAtIndex: [self lineLayoutIndexForGlyphIndex:
index]];
start = currentInfo->glyphRange.location;
rect = currentInfo->lineFragmentRect;
x = rect.origin.x + [self _sizeOfRange: NSMakeRange(start, index-start)].width;
return NSMakeRect(x, rect.origin.y, NSMaxX (rect) - x,
rect.size.height);
return NSMakeRect(x, rect.origin.y, NSMaxX (rect) - x,
rect.size.height);
}
- (void) drawSelectionAsRangeNoCaret: (NSRange)aRange