Fix breakpoint context menu behaviour

Signed-off-by: thegecko <[email protected]>
eclipse-theia · Nov 1, 2019 · aa36ae6 · aa36ae6
1 parent 05f2e07
commit aa36ae6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/packages/core/src/electron-browser/menu/electron-context-menu-renderer.ts b/packages/core/src/electron-browser/menu/electron-context-menu-renderer.ts
@@ -38,7 +38,7 @@ export class ElectronContextMenuRenderer implements ContextMenuRenderer {
         // native context menu stops the event loop, so there is no keyboard events
         this.context.resetAltPressed();
         if (onHide) {
-            onHide();
+            menu.once('menu-will-close', () => onHide());
         }
     }
 

diff --git a/packages/debug/src/browser/editor/debug-editor-model.ts b/packages/debug/src/browser/editor/debug-editor-model.ts
@@ -285,10 +285,11 @@ export class DebugEditorModel implements Disposable {
     protected handleMouseDown(event: monaco.editor.IEditorMouseEvent): void {
         if (event.target && event.target.type === monaco.editor.MouseTargetType.GUTTER_GLYPH_MARGIN) {
             if (event.event.rightButton) {
-                this._position = event.target.position!;
-                this.contextMenu.render(DebugEditorModel.CONTEXT_MENU, event.event.browserEvent, () =>
-                    setTimeout(() => this._position = undefined)
-                );
+                this.editor.focus();
+                setTimeout(() => {
+                    this._position = event.target.position!;
+                    this.contextMenu.render(DebugEditorModel.CONTEXT_MENU, event.event.browserEvent);
+                });
             } else {
                 this.doToggleBreakpoint(event.target.position!);
             }