Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

support: select two commits for diff #781

Merged
merged 1 commit into from
Mar 23, 2022
Merged

support: select two commits for diff #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions GitUpKit/Interface/GIGraphView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

@property(nonatomic, weak) GINode* selectedNode; // Setting this property directly does not call the delegate
@property(nonatomic, weak) GCHistoryCommit* selectedCommit; // Convenience method that wraps @selectedNode
@property(nonatomic, weak) GINode* lastSelectedNode;

@property(nonatomic, readonly) NSSize minSize;

Expand Down
29 changes: 29 additions & 0 deletions GitUpKit/Interface/GIGraphView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,11 @@ - (void)setSelectedNode:(GINode*)node {
// We need to retain the underlying commit for later as GINode doesn't retain its commit
- (void)_setSelectedNode:(GINode*)node display:(BOOL)display scroll:(BOOL)scroll notify:(BOOL)notify {
XLOG_DEBUG_CHECK(!node.dummy);
if (display && _lastSelectedNode) {
NSPoint point = [self positionForNode:_lastSelectedNode];
[self setNeedsDisplayInRect:SELECTED_NODE_BOUNDS(point.x, point.y)];
}
_lastSelectedNode = nil;
if (node != _selectedNode) {
if (display && _selectedNode) {
NSPoint point = [self positionForNode:_selectedNode];
Expand Down Expand Up @@ -467,7 +472,18 @@ - (void)mouseDown:(NSEvent*)event {
node = nil;
}
}

GINode* selectedNode = _selectedNode;
GINode* lastSelectedNode = _lastSelectedNode;
[self _setSelectedNode:node display:YES scroll:NO notify:YES];
if (event.modifierFlags & NSEventModifierFlagCommand) {
if (lastSelectedNode == nil) {
_lastSelectedNode = selectedNode;
} else {
_lastSelectedNode = lastSelectedNode;
}
}

if (scroll) {
[self scrollToSelection];
}
Expand Down Expand Up @@ -1693,6 +1709,19 @@ - (void)drawRect:(NSRect)dirtyRect {
}
}

// Draw selected node if any
if (_lastSelectedNode) {
CGFloat x = CONVERT_X(_lastSelectedNode.x);
CGFloat y = CONVERT_Y(offset - _lastSelectedNode.layer.y);
if (NSIntersectsRect(SELECTED_NODE_BOUNDS(x, y), dirtyRect)) {
#if __DEBUG_BOXES__
CGContextSetRGBFillColor(context, 1.0, 0.0, 0.0, 0.666);
CGContextFillRect(context, SELECTED_NODE_BOUNDS(x, y));
#endif
_DrawSelectedNode(context, x, y, _lastSelectedNode, selectedAttributes1, selectedAttributes2, _dateFormatter, self.window.keyWindow && (self.window.firstResponder == self));
}
}

// Restore graphics context
CGContextRestoreGState(context);

Expand Down
5 changes: 3 additions & 2 deletions GitUpKit/Views/GIMapViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,8 @@ - (BOOL)validateUserInterfaceItem:(id<NSValidatedUserInterfaceItem>)item {
return (service != kGCHostingService_Unknown);
}
if ((item.action == @selector(diffSelectedCommitWithHEAD:)) || (item.action == @selector(externalDiffWithHEAD:))) {
return ![self.repository.history.HEADCommit isEqualToCommit:commit];
GCHistoryCommit* headCommit = _graphView.lastSelectedNode.commit ?: self.repository.history.HEADCommit;
return ![headCommit isEqualToCommit:commit];
}

if (editingDisabled) {
Expand Down Expand Up @@ -799,7 +800,7 @@ - (IBAction)viewSelectedCommitInHostingService:(id)sender {
}

- (void)_diffSelectedCommitWithHEAD:(void (^)(GCHistoryCommit* commit, GCHistoryCommit* otherCommit))handler {
GCHistoryCommit* headCommit = self.repository.history.HEADCommit;
GCHistoryCommit* headCommit = _graphView.lastSelectedNode.commit ?: self.repository.history.HEADCommit;
GCHistoryCommit* selectedCommit = _graphView.selectedCommit;
switch ([selectedCommit.date compare:headCommit.date]) {
case NSOrderedAscending: // Selected commit is older than HEAD commit
Expand Down