development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-13 13:46:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

outline - use better twistie knowledge

Browse source
This commit is contained in:
Johannes Rieken 2018-06-20 18:15:30 +02:00
parent 5e1ad2b68c
commit 89f9e25fc7
2 changed files with 5 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/vs/editor/contrib/documentSymbols/outlineTree.ts
View file

@ -9,7 +9,6 @@ import 'vs/css!./media/symbol-icons';
import { IMouseEvent } from 'vs/base/browser/mouseEvent';
import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
import { values } from 'vs/base/common/collections';
import { onUnexpectedError } from 'vs/base/common/errors';
import { createMatches } from 'vs/base/common/filters';
import { TPromise } from 'vs/base/common/winjs.base';
import { IDataSource, IFilter, IRenderer, ISorter, ITree } from 'vs/base/parts/tree/browser/tree';
@ -307,35 +306,11 @@ export class OutlineTreeState {
}
export class OutlineController extends WorkbenchTreeController {
protected onLeftClick(tree: ITree, element: any, event: IMouseEvent, origin: string = 'mouse'): boolean {
const payload = { origin: origin, originalEvent: event, didClickElement: false };
if (tree.getInput() === element) {
tree.clearFocus(payload);
tree.clearSelection(payload);
protected shouldToggleExpansion(element: any, event: IMouseEvent, origin: string): boolean {
if (element instanceof OutlineElement) {
return this.isClickOnTwistie(event);
} else {
const isMouseDown = event && event.browserEvent && event.browserEvent.type === 'mousedown';
if (!isMouseDown) {
event.preventDefault(); // we cannot preventDefault onMouseDown because this would break DND otherwise
}
event.stopPropagation();
payload.didClickElement = element instanceof OutlineElement && !this.isClickOnTwistie(event);
tree.domFocus();
tree.setSelection([element], payload);
tree.setFocus(element, payload);
if (!payload.didClickElement) {
if (tree.isExpanded(element)) {
tree.collapse(element).then(null, onUnexpectedError);
} else {
tree.expand(element).then(null, onUnexpectedError);
}
}
return super.shouldToggleExpansion(element, event, origin);
}
return true;
}
}

2
src/vs/workbench/parts/outline/electron-browser/outlinePanel.ts
View file

@ -549,7 +549,7 @@ export class OutlinePanel extends ViewletPanel {
// feature: reveal outline selection in editor
// on change -> reveal/select defining range
this._editorDisposables.push(this._tree.onDidChangeSelection(e => {
if (e.payload === this || e.payload && !e.payload.didClickElement) {
if (e.payload === this || e.payload && e.payload.didClickOnTwistie) {
return;
}
let [first] = e.selection;