Skip to content

Commit 9b9e5fe

Browse files
committed
Align commit context actions with their clicked row
gitx/gitx#406
1 parent 767dbf7 commit 9b9e5fe

2 files changed

Lines changed: 27 additions & 1 deletion

File tree

‎Classes/PBCommitList.swift‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,18 @@ import Cocoa
159159

160160
// MARK: - Context Menu
161161

162+
@objc(shouldReplaceSelectionForContextClickAtRow:selectedRows:)
163+
static func shouldReplaceSelectionForContextClick(at clickedRow: Int, selectedRows: IndexSet) -> Bool {
164+
clickedRow >= 0 && !selectedRows.contains(clickedRow)
165+
}
166+
162167
override func menu(for event: NSEvent) -> NSMenu? {
163168
super.menu(for: event)
164169
let index = clickedRow
165170

166171
let column = self.column(withIdentifier: NSUserInterfaceItemIdentifier("SubjectColumn"))
167-
guard column != -1,
172+
guard index >= 0,
173+
column != -1,
168174
let cell = view(atColumn: column, row: index, makeIfNecessary: false) as? PBGitRevisionCell
169175
else {
170176
return nil
@@ -176,6 +182,11 @@ import Cocoa
176182
return nil
177183
}
178184

185+
if Self.shouldReplaceSelectionForContextClick(at: index, selectedRows: selectedRowIndexes) {
186+
NSLog("[GitX] Context-click selected commit row %ld", index)
187+
selectRowIndexes(IndexSet(integer: index), byExtendingSelection: false)
188+
}
189+
179190
let point = window?.contentView?.convert(event.locationInWindow, to: cell) ?? .zero
180191
let i = Int(cell.indexAt(x: point.x))
181192
let clickedRef: PBGitRef? = (i >= 0 && i < commit.refs.count) ? commit.refs[i] as? PBGitRef : nil

‎GitXTests/GitXFeatureTests.m‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#import <XCTest/XCTest.h>
22
#import <dlfcn.h>
3+
#import <objc/message.h>
34
#import <objc/runtime.h>
45

56
#import "PBGitDefaults.h"
@@ -185,6 +186,20 @@ - (void)testHistoryControllerPinsWorkingStateAboveSortedCommits
185186
XCTAssertEqualObjects(arranged[1][@"subject"], @"A");
186187
}
187188

189+
- (void)testContextClickSelectsOnlyAnUnselectedCommit
190+
{
191+
Class commitListClass = NSClassFromString(@"GitX.PBCommitList");
192+
XCTAssertNotNil(commitListClass);
193+
SEL selector = NSSelectorFromString(@"shouldReplaceSelectionForContextClickAtRow:selectedRows:");
194+
XCTAssertTrue([commitListClass respondsToSelector:selector]);
195+
BOOL (*shouldReplaceSelection)(id, SEL, NSInteger, NSIndexSet *) = (void *)objc_msgSend;
196+
NSMutableIndexSet *selected = [NSMutableIndexSet indexSetWithIndex:1];
197+
[selected addIndex:2];
198+
XCTAssertTrue(shouldReplaceSelection(commitListClass, selector, 4, selected));
199+
XCTAssertFalse(shouldReplaceSelection(commitListClass, selector, 2, selected));
200+
XCTAssertFalse(shouldReplaceSelection(commitListClass, selector, -1, selected));
201+
}
202+
188203
- (void)testDisablingHistorySortingClearsNewDescriptors
189204
{
190205
PBHistoryArrayController *controller = [[PBHistoryArrayController alloc] initWithContent:@[]];

0 commit comments

Comments
 (0)