Shift-selection now also selects the items in between

aaronbrethorst · Jul 31, 2011 · e916b59 · e916b59
1 parent 855285d
commit e916b59
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/BCCollectionView+Mouse.m b/BCCollectionView+Mouse.m
@@ -35,8 +35,18 @@ - (void)mouseDown:(NSEvent *)theEvent
 
   if ([self shiftOrCommandKeyPressed] && [self.originalSelectionIndexes containsIndex:index])
     [self deselectItemAtIndex:index];
-  else
-    [self selectItemAtIndex:index];
+  else {
+    if ([NSEvent modifierFlags] & NSCommandKeyMask || [[self originalSelectionIndexes] count] == 0)
+      [self selectItemAtIndex:index];
+    else if ([NSEvent modifierFlags] & NSShiftKeyMask) {
+      NSInteger one = [[self originalSelectionIndexes] lastIndex];
+      NSInteger two = index;
+      if (two > one)
+        [self selectItemsAtIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(MIN(one,two), 1+MAX(one,two)-MIN(one,two))]];
+      else
+        [self selectItemsAtIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(MIN(one,two), MAX(one,two)-MIN(one,two))]];
+    }
+  }
 }
 
 - (void)regularMouseDragged:(NSEvent *)anEvent