From cb463534b8725f28cb9c013c8cdcd9716b0d408c Mon Sep 17 00:00:00 2001 From: Allan Odgaard Date: Fri, 26 Sep 2014 13:09:21 +0200 Subject: [PATCH] Make window key in actions that show file browser field editor It is possible to bring up menus for inactive windows and e.g. select Rename or Duplicate. --- Frameworks/OakFileBrowser/src/FSOutlineViewDelegate.mm | 1 + Frameworks/OakFileBrowser/src/ui/OFBOutlineView.mm | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Frameworks/OakFileBrowser/src/FSOutlineViewDelegate.mm b/Frameworks/OakFileBrowser/src/FSOutlineViewDelegate.mm index 7456c1c6..272ee0c1 100644 --- a/Frameworks/OakFileBrowser/src/FSOutlineViewDelegate.mm +++ b/Frameworks/OakFileBrowser/src/FSOutlineViewDelegate.mm @@ -248,6 +248,7 @@ static NSSet* VisibleItems (NSOutlineView* outlineView, FSItem* root, NSMutableS if(![pendingEditURL isEqual:[[outlineView itemAtRow:i] url]]) continue; + [[outlineView window] makeKeyWindow]; [outlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:i] byExtendingSelection:NO]; [outlineView editColumn:0 row:i withEvent:nil select:YES]; self.pendingEditURL = nil; diff --git a/Frameworks/OakFileBrowser/src/ui/OFBOutlineView.mm b/Frameworks/OakFileBrowser/src/ui/OFBOutlineView.mm index 9f7f2211..56ddb766 100644 --- a/Frameworks/OakFileBrowser/src/ui/OFBOutlineView.mm +++ b/Frameworks/OakFileBrowser/src/ui/OFBOutlineView.mm @@ -172,7 +172,10 @@ - (void)performEditSelectedRow:(id)sender { if([self numberOfSelectedRows] == 1) + { + [[self window] makeKeyWindow]; [self editColumn:0 row:[self selectedRow] withEvent:nil select:YES]; + } } - (void)keyDown:(NSEvent*)theEvent