From 15c27135fd915337be0cdf774f9998fa40fbbcc4 Mon Sep 17 00:00:00 2001 From: Allan Odgaard Date: Sat, 16 Mar 2013 17:49:49 +0100 Subject: [PATCH] Change folder pop-up to pull-down MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The menu contains two (non-selectable) “actions”. If we use a pop-up, we have to change the selection after the user select one of these actions, which isn’t the case with a pull-down menu. --- Frameworks/OakFileBrowser/src/OakFileBrowser.mm | 3 --- Frameworks/OakFileBrowser/src/ui/OFBHeaderView.mm | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Frameworks/OakFileBrowser/src/OakFileBrowser.mm b/Frameworks/OakFileBrowser/src/OakFileBrowser.mm index d83d8946..8f2ee377 100644 --- a/Frameworks/OakFileBrowser/src/OakFileBrowser.mm +++ b/Frameworks/OakFileBrowser/src/OakFileBrowser.mm @@ -1136,9 +1136,6 @@ static NSMutableSet* SymmetricDifference (NSMutableSet* aSet, NSMutableSet* anot - (IBAction)orderFrontGoToFolder:(id)sender { - if(_headerView.folderPopUpButton.selectedItem.action == _cmd) - [_headerView.folderPopUpButton selectItemAtIndex:0]; - NSOpenPanel* panel = [NSOpenPanel openPanel]; [panel setCanChooseFiles:NO]; [panel setCanChooseDirectories:YES]; diff --git a/Frameworks/OakFileBrowser/src/ui/OFBHeaderView.mm b/Frameworks/OakFileBrowser/src/ui/OFBHeaderView.mm index 6ab3b809..8f13483d 100644 --- a/Frameworks/OakFileBrowser/src/ui/OFBHeaderView.mm +++ b/Frameworks/OakFileBrowser/src/ui/OFBHeaderView.mm @@ -20,7 +20,7 @@ static NSButton* OakCreateImageButton (NSString* imageName) static NSPopUpButton* OakCreatePopUpButton () { - NSPopUpButton* res = [NSPopUpButton new]; + NSPopUpButton* res = [[NSPopUpButton alloc] initWithFrame:NSZeroRect pullsDown:YES]; [[res cell] setBackgroundStyle:NSBackgroundStyleLight]; [res setContentCompressionResistancePriority:NSLayoutPriorityDefaultLow forOrientation:NSLayoutConstraintOrientationHorizontal]; [res setBordered:NO];