Changeset 442 for trunk

Timestamp:

03/06/08 11:36:32 (17 years ago)

Author:

Nicholas Riley

Message:

Move index-to-range conversion into a class method for launch methods that do not use a trigger

Location:

trunk/ICeCoffEE/ICeCoffEE

Files:

• ICeCoffEETrigger.h (modified) (1 diff)
• ICeCoffEETrigger.m (modified) (2 diffs)

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEETrigger.h

@@ -19 +19 @@
 + (BOOL)cancel;
 
++ (NSRange)rangeForEvent:(NSEvent *)anEvent onTarget:(NSView <NSTextInput> *)aTarget;
+
 - (void)timerFired:(NSTimer *)aTimer; // overridden by subclasses
 

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEETrigger.m

@@ -15 +15 @@
 @implementation ICeCoffEETrigger
 
++ (NSRange)rangeForEvent:(NSEvent *)anEvent onTarget:(NSView<NSTextInput> *)aTarget;
+{
+    unsigned characterIndex = [aTarget characterIndexForPoint:
+                               [[aTarget window] convertBaseToScreen: [anEvent locationInWindow]]];
+    NSRange range = [aTarget selectedRange];
+    ICLog(@"ICeCoffEETrigger characterIndex %u selectedRange %@", characterIndex, NSStringFromRange(range));
+    if (range.location == NSNotFound || range.length == 0 ||
+        !NSLocationInRange(characterIndex, range)) {
+        range.location = characterIndex;
+        range.length = 0;
+    }
+    return range;
+}
+
 - (id)initForEvent:(NSEvent *)anEvent onTarget:(NSView<NSTextInput> *)aTarget;
 {
@@ -20 +34 @@
         target = [aTarget retain];
         event = [anEvent retain];
-        unsigned characterIndex = [aTarget characterIndexForPoint:
-                                   [[aTarget window] convertBaseToScreen: [anEvent locationInWindow]]];
-        range = [aTarget selectedRange];
-        ICLog(@"ICeCoffEETrigger characterIndex %u selectedRange %@", characterIndex, NSStringFromRange(range));
-        if (range.location == NSNotFound || range.length == 0 ||
-            !NSLocationInRange(characterIndex, range)) {
-            range.location = characterIndex;
-            range.length = 0;
-        }
+        range = [[self class] rangeForEvent: anEvent onTarget: aTarget];
         // no typical definition of Command-Option-double-click, so we don't need to delay
         NSTimeInterval interval = ([anEvent modifierFlags] & NSAlternateKeyMask) ? 0 :