gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-22 18:11:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added delete to end of line to text view.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@23049 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2006-06-11 18:26:49 +00:00
parent 88e2fc3400
commit cad6a29fde
3 changed files with 66 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2006-06-11 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSTextView_actions.m (-deleteToEndOfLine:): New method
based on patch by Andreas Höschler <ahoesch@smartsoft.de>.
* KeyBindings/DefaultKeyBindings.dict: Enable Control-k.
2006-06-09 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSView.m (-discardCursorRects)

2
KeyBindings/DefaultKeyBindings.dict
View file

@ -49,7 +49,7 @@
"Control-f" = "moveRight:";
"Control-h" = "deleteBackward:";
/* "Control-l" = "centerSelectionInVisibleArea:"; */
/* "Control-k" = "deleteToEndOfLine:"; */
"Control-k" = "deleteToEndOfLine:";
"Control-n" = "moveDown:";
"Control-p" = "moveUp:";
"Control-t" = "transpose:";

63
Source/NSTextView_actions.m
View file

@ -12,7 +12,7 @@
Author: Felipe A. Rodriguez <far@ix.netcom.com>
Date: July 1998
Author: Daniel Bðhringer <boehring@biomed.ruhr-uni-bochum.de>
Author: Daniel Böhringer <boehring@biomed.ruhr-uni-bochum.de>
Date: August 1998
Author: Fred Kiefer <FredKiefer@gmx.de>
@ -111,7 +111,6 @@ send -shouldChangeTextInRange:replacementString: or -didChangeText.
*/
/** First some helpers **/
@interface NSTextView (user_action_helpers)
@ -120,7 +119,7 @@ send -shouldChangeTextInRange:replacementString: or -didChangeText.
-(void) _changeAttribute: (NSString *)name
inRange: (NSRange)r
using: (id (*)(id))func;
using: (NSNumber*(*)(NSNumber*))func;
@end
@ -164,7 +163,7 @@ send -shouldChangeTextInRange:replacementString: or -didChangeText.
- (void) _changeAttribute: (NSString *)name
inRange: (NSRange)r
using: (id (*)(id))func
using: (NSNumber*(*)(NSNumber*))func
{
unsigned int i;
NSRange e, r2;
@ -624,6 +623,62 @@ static NSNumber *float_plus_one(NSNumber *cur)
[self didChangeText];
}
- (void) deleteToEndOfLine: (id)sender
{
NSRange range = [self rangeForUserTextChange];
NSRange linerange;
unsigned maxRange;
unsigned endCorrection = 0;
if (range.location == NSNotFound)
{
return;
}
linerange = [[_textStorage string] lineRangeForRange:
NSMakeRange(range.location, 0)];
maxRange = NSMaxRange (linerange);
if (maxRange == range.location)
{
return;
}
// Only delete the linebreak, if the line is empty.
if (linerange.length > 1)
{
// Treat the last line special, as it does not have to end in a leine break.
if (maxRange == [_textStorage length])
{
unichar u = [[_textStorage string] characterAtIndex: (maxRange - 1)];
if (u == '\n' || u == '\r')
{
endCorrection = 1;
}
else
{
endCorrection = 0;
}
}
else
{
endCorrection = 1;
}
}
range = NSMakeRange(range.location, maxRange - range.location - endCorrection);
if (![self shouldChangeTextInRange: range replacementString: @""])
{
return;
}
[_textStorage beginEditing];
[_textStorage deleteCharactersInRange: range];
[_textStorage endEditing];
[self didChangeText];
}
/*
TODO: find out what affinity is supposed to mean