maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix/84231 (#84872)

Browse source 
* account for padding on macOS
fixes #84231

* move to native context menu service
and account for zoom
This commit is contained in:
SteVen Batten 2019-11-14 14:59:31 -08:00 committed by GitHub
parent 524441ffc2
commit 230baa7372
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/vs/workbench/services/contextmenu/electron-browser/contextmenuService.ts
View file

@ -91,18 +91,25 @@ class NativeContextMenuService extends Disposable implements IContextMenuService
const anchor = delegate.getAnchor();
let x: number, y: number;
let zoom = webFrame.getZoomFactor();
if (dom.isHTMLElement(anchor)) {
let elementPosition = dom.getDomNodePagePosition(anchor);
x = elementPosition.left;
y = elementPosition.top + elementPosition.height;
// Shift macOS menus by a few pixels below elements
// to account for extra padding on top of native menu
// https://github.com/microsoft/vscode/issues/84231
if (isMacintosh) {
y += 4 / zoom;
}
} else {
const pos: { x: number; y: number; } = anchor;
x = pos.x + 1; /* prevent first item from being selected automatically under mouse */
y = pos.y;
}
let zoom = webFrame.getZoomFactor();
x *= zoom;
y *= zoom;