mirror of
https://github.com/kennethreitz-archive/gitx.git
synced 2026-06-05 23:40:18 +00:00
Nathan Kinsinger
87f76fd5a1
When the Subject column is not the first column in the git history table the contextual menu for refs and dragging and dropping refs don't work. Offset the mouse click's x value by the x origin of the Subject column. In PBRefController look up the column index of the subject column and check that it's the clicked column (don't assume it's the first one).
84 lines
2.4 KiB
Objective-C
84 lines
2.4 KiB
Objective-C
//
|
|
// PBCommitList.m
|
|
// GitX
|
|
//
|
|
// Created by Pieter de Bie on 9/11/08.
|
|
// Copyright 2008 __MyCompanyName__. All rights reserved.
|
|
//
|
|
|
|
#import "PBCommitList.h"
|
|
#import "PBGitRevisionCell.h"
|
|
#import "PBWebHistoryController.h"
|
|
|
|
@implementation PBCommitList
|
|
|
|
@synthesize mouseDownPoint;
|
|
- (NSDragOperation)draggingSourceOperationMaskForLocal:(BOOL) local
|
|
{
|
|
return NSDragOperationCopy;
|
|
}
|
|
|
|
- (void)keyDown:(NSEvent *)event
|
|
{
|
|
NSString* character = [event charactersIgnoringModifiers];
|
|
|
|
// Pass on command-shift up/down to the responder. We want the splitview to capture this.
|
|
if ([event modifierFlags] & NSShiftKeyMask && [event modifierFlags] & NSCommandKeyMask && ([event keyCode] == 0x7E || [event keyCode] == 0x7D)) {
|
|
[self.nextResponder keyDown:event];
|
|
return;
|
|
}
|
|
|
|
if ([character isEqualToString:@" "])
|
|
{
|
|
if ([event modifierFlags] & NSShiftKeyMask)
|
|
[webView scrollPageUp: self];
|
|
else
|
|
[webView scrollPageDown: self];
|
|
}
|
|
else if ([character rangeOfCharacterFromSet:[NSCharacterSet characterSetWithCharactersInString:@"jkcv"]].location == 0)
|
|
[webController sendKey: character];
|
|
else
|
|
[super keyDown: event];
|
|
}
|
|
|
|
- (void) copy:(id)sender
|
|
{
|
|
[controller copyCommitInfo];
|
|
};
|
|
|
|
- (void)mouseDown:(NSEvent *)theEvent
|
|
{
|
|
mouseDownPoint = [[self window] mouseLocationOutsideOfEventStream];
|
|
[super mouseDown:theEvent];
|
|
}
|
|
|
|
- (NSImage *)dragImageForRowsWithIndexes:(NSIndexSet *)dragRows
|
|
tableColumns:(NSArray *)tableColumns
|
|
event:(NSEvent *)dragEvent
|
|
offset:(NSPointPointer)dragImageOffset
|
|
{
|
|
NSPoint location = [self convertPointFromBase:mouseDownPoint];
|
|
int row = [self rowAtPoint:location];
|
|
int column = [self columnAtPoint:location];
|
|
PBGitRevisionCell *cell = (PBGitRevisionCell *)[self preparedCellAtColumn:column row:row];
|
|
NSRect cellFrame = [self frameOfCellAtColumn:column row:row];
|
|
|
|
int index = [cell indexAtX:(location.x - cellFrame.origin.x)];
|
|
if (index == -1)
|
|
return [super dragImageForRowsWithIndexes:dragRows tableColumns:tableColumns event:dragEvent offset:dragImageOffset];
|
|
|
|
NSRect rect = [cell rectAtIndex:index];
|
|
|
|
NSImage *newImage = [[NSImage alloc] initWithSize:NSMakeSize(rect.size.width + 3, rect.size.height + 3)];
|
|
rect.origin = NSMakePoint(0.5, 0.5);
|
|
|
|
[newImage lockFocus];
|
|
[cell drawLabelAtIndex:index inRect:rect];
|
|
[newImage unlockFocus];
|
|
|
|
*dragImageOffset = NSMakePoint(rect.size.width / 2 + 10, 0);
|
|
return newImage;
|
|
|
|
}
|
|
@end
|