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

fixes #93415

Browse source
This commit is contained in:
SteVen Batten 2020-05-15 15:08:00 -07:00
parent 12b445140d
commit 867f017697
5 changed files with 32 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/base/browser/ui/contextview/contextview.css
View file

@ -4,6 +4,6 @@
*--------------------------------------------------------------------------------------------*/
.context-view {
position: absolute;
position: fixed;
z-index: 2500;
}

7
src/vs/base/browser/ui/contextview/contextview.ts
View file

@ -38,7 +38,7 @@ export interface IDelegate {
}
export interface IContextViewProvider {
showContextView(delegate: IDelegate): void;
showContextView(delegate: IDelegate, container?: HTMLElement): void;
hideContextView(): void;
layout(): void;
}
@ -255,9 +255,8 @@ export class ContextView extends Disposable {
DOM.addClass(this.view, anchorPosition === AnchorPosition.BELOW ? 'bottom' : 'top');
DOM.addClass(this.view, anchorAlignment === AnchorAlignment.LEFT ? 'left' : 'right');
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.top = `${top}px`;
this.view.style.left = `${left}px`;
this.view.style.width = 'initial';
}

6
src/vs/base/browser/ui/selectBox/selectBox.css
View file

@ -6,3 +6,9 @@
.monaco-select-box {
width: 100%;
}
.monaco-select-box-dropdown-container {
font-size: 13px;
font-weight: normal;
text-transform: none;
}

6
src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
View file

@ -89,6 +89,7 @@ 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>;
@ -307,6 +308,7 @@ 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();
@ -442,7 +444,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;
@ -457,7 +459,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;

21
src/vs/platform/contextview/browser/contextViewService.ts
View file

@ -12,13 +12,15 @@ export class ContextViewService extends Disposable implements IContextViewServic
_serviceBrand: undefined;
private contextView: ContextView;
private container: HTMLElement;
constructor(
@ILayoutService readonly layoutService: ILayoutService
) {
super();
this.contextView = this._register(new ContextView(layoutService.container));
this.container = layoutService.container;
this.contextView = this._register(new ContextView(this.container));
this.layout();
this._register(layoutService.onLayout(() => this.layout()));
@ -30,7 +32,20 @@ export class ContextViewService extends Disposable implements IContextViewServic
this.contextView.setContainer(container);
}
showContextView(delegate: IContextViewDelegate): void {
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);
}
}
this.contextView.show(delegate);
}
@ -41,4 +56,4 @@ export class ContextViewService extends Disposable implements IContextViewServic
hideContextView(data?: any): void {
this.contextView.hide(data);
}
}
}