Skip to content

Commit

Permalink
Ctrl + click on quick open does not work ( fixes microsoft#1011)
Browse files Browse the repository at this point in the history
  • Loading branch information
bpasero committed Dec 4, 2015
1 parent 17680ec commit d2c2ac2
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import uuid = require('vs/base/common/uuid');
import {IQuickNavigateConfiguration, IAutoFocus, IContext, IModel, Mode} from 'vs/base/parts/quickopen/browser/quickOpen';
import {Filter, Renderer, DataSource, IModelProvider} from 'vs/base/parts/quickopen/browser/quickOpenViewer';
import {Dimension, Builder, $} from 'vs/base/browser/builder';
import {ISelectionEvent, IFocusEvent, ITree} from 'vs/base/parts/tree/common/tree';
import {ISelectionEvent, IFocusEvent, ITree, ContextMenuEvent} from 'vs/base/parts/tree/common/tree';
import {InputBox} from 'vs/base/browser/ui/inputbox/inputBox';
import {Tree} from 'vs/base/parts/tree/browser/treeImpl';
import {ProgressBar} from 'vs/base/browser/ui/progressbar/progressbar';
Expand Down Expand Up @@ -47,6 +47,17 @@ export interface IQuickOpenUsageLogger {
publicLog(eventName: string, data?: any): void;
}

export class QuickOpenController extends DefaultController {

public onContextMenu(tree:ITree, element: any, event:ContextMenuEvent):boolean {
if (platform.isMacintosh) {
return this.onLeftClick(tree, element, event); // https://github.com/Microsoft/vscode/issues/1011
}

return super.onContextMenu(tree, element, event);
}
}

export class QuickOpenWidget implements IModelProvider {

public static MAX_WIDTH = 600; // Max total width of quick open widget
Expand Down Expand Up @@ -152,7 +163,7 @@ export class QuickOpenWidget implements IModelProvider {
}, (div: Builder) => {
this.tree = new Tree(div.getHTMLElement(), {
dataSource: new DataSource(this),
controller: new DefaultController({ clickBehavior: ClickBehavior.ON_MOUSE_UP }),
controller: new QuickOpenController({ clickBehavior: ClickBehavior.ON_MOUSE_UP }),
renderer: new Renderer(this),
filter: new Filter(this)
}, {
Expand Down

0 comments on commit d2c2ac2

Please sign in to comment.