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

(-setSelectedRange:affinity:stillSelecting:): Clamp the selected range to the text storage's length.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@15937 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Alexander Malmberg 2003-02-11 15:40:21 +00:00
parent 413dec23ee
commit 05d3343c45
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Source/NSTextView.m
View file

@ -1560,8 +1560,6 @@ This method is for user changes; see NSTextView_actions.m.
return;
}
/*printf("-insertText: range %i+%i |%@|\n",insertRange.location,insertRange.length,insertString);
printf(" text storage length %i\n",[self textLength]);*/
isAttributed = [insertString isKindOfClass: [NSAttributedString class]];
if (isAttributed)
@ -1607,7 +1605,6 @@ printf(" text storage length %i\n",[self textLength]);*/
[self didChangeText];
/* TODO? move cursor <!> [self selectionRangeForProposedRange: ] */
//printf(" text storage length now %i\n",[self textLength]);
[self setSelectedRange:
NSMakeRange(insertRange.location + [insertString length], 0)];
}
@ -2469,7 +2466,6 @@ afterString in order over charRange.
- (void) setSelectedRange: (NSRange)charRange
{
// printf("-setSelectedRange: %i+%i\n",charRange.location,charRange.length);
[self setSelectedRange: charRange affinity: [self selectionAffinity]
stillSelecting: NO];
}
@ -2549,7 +2545,7 @@ afterString in order over charRange.
}
}
/* NB: Only NSSelectionAffinityDownstream works */
- (void) setSelectedRange: (NSRange)charRange
affinity: (NSSelectionAffinity)affinity
stillSelecting: (BOOL)stillSelectingFlag
@ -2561,9 +2557,22 @@ afterString in order over charRange.
displayed selection could have been a temporary selection,
different from the last official one: */
NSRange oldDisplayedRange;
unsigned int length = [_textStorage length];
oldDisplayedRange = _layoutManager->_selected_range;
if (NSMaxRange(charRange) > length)
{
if (charRange.location > length)
{
charRange = NSMakeRange(length, 0);
}
else
{
charRange.length = length - charRange.location;
}
}
if (stillSelectingFlag == YES)
{
/* Store the original range before the interactive selection
@ -2618,7 +2627,7 @@ afterString in order over charRange.
}
else /* no selection, only insertion point */
{
if (_tf.is_rich_text && [_textStorage length])
if (_tf.is_rich_text && length)
{
NSDictionary *dict;