ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 8c426f9f3b6b18935cc6c2ec8aa6d45ccd88021e

Browse Source
This commit is contained in:
ADS Merger
2020-07-23 02:21:09 +00:00
parent efc8182954
commit ede827ee82
83 changed files with 1736 additions and 829 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/vs/editor/contrib/codeAction/codeActionMenu.ts
View File

@@ -90,6 +90,7 @@ export class CodeActionMenu extends Disposable {
const resolver = this._keybindingResolver.getResolver();
this._contextMenuService.showContextMenu({
domForShadowRoot: this._editor.getDomNode()!,
getAnchor: () => anchor,
getActions: () => menuActions,
onHide: () => {

2
src/vs/editor/contrib/contextmenu/contextmenu.ts
View File

@@ -205,6 +205,8 @@ export class ContextMenuController implements IEditorContribution {
// Show menu
this._contextMenuIsBeingShownCount++;
this._contextMenuService.showContextMenu({
domForShadowRoot: this._editor.getDomNode(),
getAnchor: () => anchor!,
getActions: () => actions,

1
src/vs/editor/contrib/dnd/dnd.ts
View File

@@ -54,6 +54,7 @@ export class DragAndDropController extends Disposable implements IEditorContribu
this._register(this._editor.onKeyDown((e: IKeyboardEvent) => this.onEditorKeyDown(e)));
this._register(this._editor.onKeyUp((e: IKeyboardEvent) => this.onEditorKeyUp(e)));
this._register(this._editor.onDidBlurEditorWidget(() => this.onEditorBlur()));
this._register(this._editor.onDidBlurEditorText(() => this.onEditorBlur()));
this._dndDecorationIds = [];
this._mouseDown = false;
this._modifierPressed = false;

2
src/vs/editor/contrib/find/findWidget.css
View File

@@ -6,7 +6,7 @@
/* Find widget */
.monaco-editor .find-widget {
position: absolute;
z-index: 10;
z-index: 20;
height: 33px;
overflow: hidden;
line-height: 19px;