Revert "fixes microsoft#93415"

sbatten · sbatten · commit b31130c13856 · 2020-05-15T19:26:19.000-07:00
This reverts commit 867f017.
diff --git a/src/vs/base/browser/ui/contextview/contextview.css b/src/vs/base/browser/ui/contextview/contextview.css
@@ -4,6 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 .context-view {
-	position: fixed;
+	position: absolute;
 	z-index: 2500;
 }
diff --git a/src/vs/base/browser/ui/contextview/contextview.ts b/src/vs/base/browser/ui/contextview/contextview.ts
@@ -38,7 +38,7 @@ export interface IDelegate {
 }
 
 export interface IContextViewProvider {
-	showContextView(delegate: IDelegate, container?: HTMLElement): void;
+	showContextView(delegate: IDelegate): void;
 	hideContextView(): void;
 	layout(): void;
 }
@@ -255,8 +255,9 @@ export class ContextView extends Disposable {
 		DOM.addClass(this.view, anchorPosition === AnchorPosition.BELOW ? 'bottom' : 'top');
 		DOM.addClass(this.view, anchorAlignment === AnchorAlignment.LEFT ? 'left' : 'right');
 
-		this.view.style.top = `${top}px`;
-		this.view.style.left = `${left}px`;
+		const containerPosition = DOM.getDomNodePagePosition(this.container!);
+		this.view.style.top = `${top - containerPosition.top}px`;
+		this.view.style.left = `${left - containerPosition.left}px`;
 		this.view.style.width = 'initial';
 	}
 
diff --git a/src/vs/base/browser/ui/selectBox/selectBox.css b/src/vs/base/browser/ui/selectBox/selectBox.css
@@ -6,9 +6,3 @@
 .monaco-select-box {
 	width: 100%;
 }
-
-.monaco-select-box-dropdown-container {
-	font-size: 13px;
-	font-weight: normal;
-	text-transform: none;
-}
diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
@@ -89,7 +89,6 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
 	private _isVisible: boolean;
 	private selectBoxOptions: ISelectBoxOptions;
 	private selectElement: HTMLSelectElement;
-	private container?: HTMLElement;
 	private options: ISelectOptionItem[] = [];
 	private selected: number;
 	private readonly _onDidSelect: Emitter<ISelectData>;
@@ -308,7 +307,6 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
 	}
 
 	public render(container: HTMLElement): void {
-		this.container = container;
 		dom.addClass(container, 'select-container');
 		container.appendChild(this.selectElement);
 		this.applyStyles();
@@ -444,7 +442,7 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
 				dom.toggleClass(this.selectElement, 'synthetic-focus', false);
 			},
 			anchorPosition: this._dropDownPosition
-		}, this.container);
+		});
 
 		// Hide so we can relay out
 		this._isVisible = true;
@@ -459,7 +457,7 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
 				dom.toggleClass(this.selectElement, 'synthetic-focus', false);
 			},
 			anchorPosition: this._dropDownPosition
-		}, this.container);
+		});
 
 		// Track initial selection the case user escape, blur
 		this._currentSelection = this.selected;
diff --git a/src/vs/platform/contextview/browser/contextViewService.ts b/src/vs/platform/contextview/browser/contextViewService.ts
@@ -12,15 +12,13 @@ export class ContextViewService extends Disposable implements IContextViewServic
 	_serviceBrand: undefined;
 
 	private contextView: ContextView;
-	private container: HTMLElement;
 
 	constructor(
 		@ILayoutService readonly layoutService: ILayoutService
 	) {
 		super();
 
-		this.container = layoutService.container;
-		this.contextView = this._register(new ContextView(this.container));
+		this.contextView = this._register(new ContextView(layoutService.container));
 		this.layout();
 
 		this._register(layoutService.onLayout(() => this.layout()));
@@ -32,20 +30,7 @@ export class ContextViewService extends Disposable implements IContextViewServic
 		this.contextView.setContainer(container);
 	}
 
-	showContextView(delegate: IContextViewDelegate, container?: HTMLElement): void {
-
-		if (container) {
-			if (container !== this.container) {
-				this.container = container;
-				this.setContainer(container);
-			}
-		} else {
-			if (this.container !== this.layoutService.container) {
-				this.container = this.layoutService.container;
-				this.setContainer(this.container);
-			}
-		}
-
+	showContextView(delegate: IContextViewDelegate): void {
 		this.contextView.show(delegate);
 	}
 
@@ -56,4 +41,4 @@ export class ContextViewService extends Disposable implements IContextViewServic
 	hideContextView(data?: any): void {
 		this.contextView.hide(data);
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`	`--------------------------------------------------------------------------------------------/`
`5`	`5`
`6`	`6`	`.context-view {`
`7`		`- position: fixed;`
	`7`	`+ position: absolute;`
`8`	`8`	`z-index: 2500;`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ export interface IDelegate {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`export interface IContextViewProvider {`
`41`		`- showContextView(delegate: IDelegate, container?: HTMLElement): void;`
	`41`	`+ showContextView(delegate: IDelegate): void;`
`42`	`42`	`hideContextView(): void;`
`43`	`43`	`layout(): void;`
`44`	`44`	`}`
`@@ -255,8 +255,9 @@ export class ContextView extends Disposable {`
`255`	`255`	`DOM.addClass(this.view, anchorPosition === AnchorPosition.BELOW ? 'bottom' : 'top');`
`256`	`256`	`DOM.addClass(this.view, anchorAlignment === AnchorAlignment.LEFT ? 'left' : 'right');`
`257`	`257`
`258`		- this.view.style.top = `${top}px`;
`259`		- this.view.style.left = `${left}px`;
	`258`	`+ const containerPosition = DOM.getDomNodePagePosition(this.container!);`
	`259`	+ this.view.style.top = `${top - containerPosition.top}px`;
	`260`	+ this.view.style.left = `${left - containerPosition.left}px`;
`260`	`261`	`this.view.style.width = 'initial';`
`261`	`262`	`}`
`262`	`263`