提交 1145a8c4 编写于 作者: B Benjamin Pasero

💄 context menu

上级 6a19af09
...@@ -265,7 +265,7 @@ export class ActivitybarPart extends Part implements IActivityBarService { ...@@ -265,7 +265,7 @@ export class ActivitybarPart extends Part implements IActivityBarService {
actions.push(this.instantiationService.createInstance(ToggleActivityBarVisibilityAction, ToggleActivityBarVisibilityAction.ID, nls.localize('hideActivitBar', "Hide Activity Bar"))); actions.push(this.instantiationService.createInstance(ToggleActivityBarVisibilityAction, ToggleActivityBarVisibilityAction.ID, nls.localize('hideActivitBar', "Hide Activity Bar")));
this.contextMenuService.showContextMenu({ this.contextMenuService.showContextMenu({
getAnchor: () => { return { x: event.posx + 1, y: event.posy }; }, getAnchor: () => { return { x: event.posx, y: event.posy }; },
getActions: () => TPromise.as(actions), getActions: () => TPromise.as(actions),
onHide: () => dispose(actions) onHide: () => dispose(actions)
}); });
......
...@@ -158,7 +158,7 @@ export class DebugEditorContribution implements IDebugEditorContribution { ...@@ -158,7 +158,7 @@ export class DebugEditorContribution implements IDebugEditorContribution {
return; return;
} }
const anchor = { x: e.event.posx + 1, y: e.event.posy }; const anchor = { x: e.event.posx, y: e.event.posy };
const breakpoints = this.debugService.getModel().getBreakpoints().filter(bp => bp.lineNumber === lineNumber && bp.uri.toString() === uri.toString()); const breakpoints = this.debugService.getModel().getBreakpoints().filter(bp => bp.lineNumber === lineNumber && bp.uri.toString() === uri.toString());
this.contextMenuService.showContextMenu({ this.contextMenuService.showContextMenu({
......
...@@ -220,7 +220,7 @@ export class BaseDebugController extends DefaultController { ...@@ -220,7 +220,7 @@ export class BaseDebugController extends DefaultController {
tree.setFocus(element); tree.setFocus(element);
if (this.actionProvider.hasSecondaryActions(tree, element)) { if (this.actionProvider.hasSecondaryActions(tree, element)) {
const anchor = { x: event.posx + 1, y: event.posy }; const anchor = { x: event.posx, y: event.posy };
this.contextMenuService.showContextMenu({ this.contextMenuService.showContextMenu({
getAnchor: () => anchor, getAnchor: () => anchor,
getActions: () => this.actionProvider.getSecondaryActions(tree, element).then(actions => { getActions: () => this.actionProvider.getSecondaryActions(tree, element).then(actions => {
......
...@@ -507,7 +507,7 @@ export class FileController extends DefaultController { ...@@ -507,7 +507,7 @@ export class FileController extends DefaultController {
return true; return true;
} }
const anchor = { x: event.posx + 1, y: event.posy }; const anchor = { x: event.posx, y: event.posy };
this.contextMenuService.showContextMenu({ this.contextMenuService.showContextMenu({
getAnchor: () => anchor, getAnchor: () => anchor,
getActions: () => { getActions: () => {
......
...@@ -256,7 +256,7 @@ export class Controller extends DefaultController { ...@@ -256,7 +256,7 @@ export class Controller extends DefaultController {
const group = element instanceof EditorGroup ? element : (<OpenEditor>element).editorGroup; const group = element instanceof EditorGroup ? element : (<OpenEditor>element).editorGroup;
const editor = element instanceof OpenEditor ? (<OpenEditor>element).editorInput : undefined; const editor = element instanceof OpenEditor ? (<OpenEditor>element).editorInput : undefined;
let anchor = { x: event.posx + 1, y: event.posy }; let anchor = { x: event.posx, y: event.posy };
this.contextMenuService.showContextMenu({ this.contextMenuService.showContextMenu({
getAnchor: () => anchor, getAnchor: () => anchor,
getActions: () => this.actionProvider.getSecondaryActions(tree, element), getActions: () => this.actionProvider.getSecondaryActions(tree, element),
......
...@@ -51,7 +51,7 @@ export class Controller extends treedefaults.DefaultController { ...@@ -51,7 +51,7 @@ export class Controller extends treedefaults.DefaultController {
if (!actions.length) { if (!actions.length) {
return true; return true;
} }
const anchor = { x: event.posx + 1, y: event.posy }; const anchor = { x: event.posx, y: event.posy };
this.contextMenuService.showContextMenu({ this.contextMenuService.showContextMenu({
getAnchor: () => anchor, getAnchor: () => anchor,
......
...@@ -847,7 +847,7 @@ class EditSettingRenderer extends Disposable { ...@@ -847,7 +847,7 @@ class EditSettingRenderer extends Disposable {
} }
private onEditSettingClicked(editPreferenceWidget: EditPreferenceWidget<ISetting>, e: IEditorMouseEvent): void { private onEditSettingClicked(editPreferenceWidget: EditPreferenceWidget<ISetting>, e: IEditorMouseEvent): void {
const anchor = { x: e.event.posx + 1, y: e.event.posy + 10 }; const anchor = { x: e.event.posx, y: e.event.posy + 10 };
const actions = this.getSettings(editPreferenceWidget.getLine()).length === 1 ? this.getActions(editPreferenceWidget.preferences[0], this.getConfigurationsMap()[editPreferenceWidget.preferences[0].key]) const actions = this.getSettings(editPreferenceWidget.getLine()).length === 1 ? this.getActions(editPreferenceWidget.preferences[0], this.getConfigurationsMap()[editPreferenceWidget.preferences[0].key])
: editPreferenceWidget.preferences.map(setting => new ContextSubMenu(setting.key, this.getActions(setting, this.getConfigurationsMap()[setting.key]))); : editPreferenceWidget.preferences.map(setting => new ContextSubMenu(setting.key, this.getActions(setting, this.getConfigurationsMap()[setting.key])));
this.contextMenuService.showContextMenu({ this.contextMenuService.showContextMenu({
......
...@@ -328,7 +328,7 @@ class TreeController extends DefaultController { ...@@ -328,7 +328,7 @@ class TreeController extends DefaultController {
if (!actions.length) { if (!actions.length) {
return true; return true;
} }
const anchor = { x: event.posx + 1, y: event.posy }; const anchor = { x: event.posx, y: event.posy };
this.contextMenuService.showContextMenu({ this.contextMenuService.showContextMenu({
getAnchor: () => anchor, getAnchor: () => anchor,
......
...@@ -47,7 +47,7 @@ export class ContextMenuService implements IContextMenuService { ...@@ -47,7 +47,7 @@ export class ContextMenuService implements IContextMenuService {
y = elementPosition.top + elementPosition.height; y = elementPosition.top + elementPosition.height;
} else { } else {
const pos = <{ x: number; y: number; }>anchor; const pos = <{ x: number; y: number; }>anchor;
x = pos.x; x = pos.x + 1; /* prevent first item from being selected automatically under mouse */
y = pos.y; y = pos.y;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册