Revision: 3999
http://skim-app.svn.sourceforge.net/skim-app/?rev=3999&view=rev
Author: hofman
Date: 2008-06-10 17:48:07 -0700 (Tue, 10 Jun 2008)
Log Message:
-----------
reorganize keydown code for typeselect support
Modified Paths:
--------------
trunk/SKOutlineView.m
trunk/SKTableView.m
Modified: trunk/SKOutlineView.m
===================================================================
--- trunk/SKOutlineView.m 2008-06-11 00:23:36 UTC (rev 3998)
+++ trunk/SKOutlineView.m 2008-06-11 00:48:07 UTC (rev 3999)
@@ -91,14 +91,13 @@
unichar eventChar = [characters length] > 0 ? [characters
characterAtIndex:0] : 0;
unsigned modifierFlags = [theEvent modifierFlags] &
NSDeviceIndependentModifierFlagsMask;
- if ([typeSelectHelper processKeyDownEvent:theEvent]) {
- } else if (eventChar == NSHomeFunctionKey && (modifierFlags &
~NSFunctionKeyMask) == 0) {
+ if (eventChar == NSHomeFunctionKey && (modifierFlags & ~NSFunctionKeyMask)
== 0) {
[self scrollToBeginningOfDocument:nil];
} else if (eventChar == NSEndFunctionKey && (modifierFlags &
~NSFunctionKeyMask) == 0) {
[self scrollToEndOfDocument:nil];
} else if ((eventChar == NSDeleteCharacter || eventChar ==
NSDeleteFunctionKey) && modifierFlags == 0 && [self canDelete]) {
[self delete:self];
- } else {
+ } else if ([typeSelectHelper processKeyDownEvent:theEvent] == NO) {
[super keyDown:theEvent];
}
}
Modified: trunk/SKTableView.m
===================================================================
--- trunk/SKTableView.m 2008-06-11 00:23:36 UTC (rev 3998)
+++ trunk/SKTableView.m 2008-06-11 00:48:07 UTC (rev 3999)
@@ -69,16 +69,13 @@
unichar eventChar = [characters length] > 0 ? [characters
characterAtIndex:0] : 0;
unsigned modifierFlags = [theEvent modifierFlags] &
NSDeviceIndependentModifierFlagsMask;
- if ([typeSelectHelper processKeyDownEvent:theEvent]) {
- } else if ([typeSelectHelper isRepeatEvent:theEvent]) {
- [typeSelectHelper repeatSearch];
- } else if ((eventChar == NSDeleteCharacter || eventChar ==
NSDeleteFunctionKey) && modifierFlags == 0 && [self canDelete]) {
+ if ((eventChar == NSDeleteCharacter || eventChar ==
NSDeleteFunctionKey) && modifierFlags == 0 && [self canDelete]) {
[self delete:self];
} else if (eventChar == NSHomeFunctionKey && (modifierFlags &
~NSFunctionKeyMask) == 0) {
[self scrollToBeginningOfDocument:nil];
} else if (eventChar == NSEndFunctionKey && (modifierFlags &
~NSFunctionKeyMask) == 0) {
[self scrollToEndOfDocument:nil];
- } else {
+ } else if ([typeSelectHelper processKeyDownEvent:theEvent] == NO) {
[super keyDown:theEvent];
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
